Merge remote-tracking branch 'origin/20201109_pc_vue_new_branch' into 20201109_pc_vue_new_branch

src/xt_pages/DepositManagement/Template/RechargeDetails.vue

@@ -99,6 +99,7 @@
         </el-table-column>
         <el-table-column label="操作" align="center" width="350px">
           <template slot-scope="scope">
+            <span v-if="scope.row.trial_status != 1">
             <el-button
               size="small"
               type="primary"
@@ -106,6 +107,8 @@
             >
               审核
             </el-button>
+            </span>
+           
             <span v-if="scope.row.trial_status == 1">
             <el-button
               size="small"

src/xt_pages/DepositManagement/print/printindex.vue

@@ -36,7 +36,7 @@
                 >￥{{money}}</div>
               </div>
               <div style="display: flex; padding: 0 30px">
-                <div>收款是由：</div>
+                <div>收款事由：</div>
                 <div style="width: 86%; border-bottom: 1px solid #000"><span>预交押金</span></div>
               </div>
             </div>

src/xt_pages/data/components/addDrugs.vue

@@ -404,7 +404,7 @@
                 </div>
             </el-tab-pane>
             <el-tab-pane label="扩展数据" name="second">
-                <el-form :model="form" label-width="120px"
+                <el-form :model="form" label-width="130px"
                          style="display: flex;flex-wrap: wrap;justify-content: space-between;">
 
                     <el-form-item label="标签:" prop="label">
@@ -470,6 +470,16 @@
                             </el-option>
                         </el-select>
                     </el-form-item>
+                    <el-form-item label="是否通过药房发药:" prop="">
+                        <el-select v-model="form.is_charge_use" style="width:160px;" placeholder="请选择">
+                            <el-option
+                                    v-for="item,index in options"
+                                    :key="index"
+                                    :label="item.label"
+                                    :value="item.value">
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
                     <el-form-item label="" style="visibility: hidden;">
                         <el-input style="width:160px;" placeholder="" maxlength="30"></el-input>
                     </el-form-item>

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

@@ -1663,7 +1663,7 @@
         this.isVisibility = true
       },
       handleAdviceCommit() {
-        //
+       
           let results = []
           for (let i = 0; i < this.targetAdvices.length; i++) {
             for (let a = 0; a < this.checkedCities.length; a++) {
@@ -1680,9 +1680,8 @@
 
           var date = new Date()
           var hour = date.getHours() < 10 ? '0' + date.getHours() : date.getHours()
-          var minute =
-            date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes()
-
+          var minute = date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes()
+         
           if (results.length > 0) {
             if(!this.isLoading){
               if (this.is_pre == 1) {
@@ -1693,14 +1692,17 @@
                 }
 
                 var arr = this.dialysisPrescription
-                // console.log('arr', arr)
+               
 
                 const ParamsQuery = arr
-                // console.log('医嘱推送2', ParamsQuery)
+                
 
                 ParamsQuery['patient'] = this.patient.id
                 ParamsQuery['record_date'] = this.record_date
-                 ParamsQuery['patient_id'] = this.$route.query.patient_id
+                ParamsQuery['patient_id'] = this.$route.query.patient_id
+                if(this.$route.query.patient_id ==undefined){
+                  ParamsQuery['patient_id'] = this.patient.id
+                }
                 if (this.prescription.creater <= 0) {
                   ParamsQuery['mode'] = '1'
                 } else {
@@ -1713,6 +1715,8 @@
                   }
                 }
                 this.isLoading = true
+                console.log("ParamsQuery233232322323322332232323",ParamsQuery)
+
                 postPrescription(ParamsQuery).then(response => {
                   if (response.data.state == 0) {
                     this.$message.error(response.data.msg)
@@ -1726,9 +1730,7 @@
                       duration: 2000
                     })
                     var date = new Date()
-
-                    // console.log(this.start_time)
-
+                    
                     const params = {
                       advices: results,
                       advice_date: this.start_time.split(' ')[0],
@@ -1738,7 +1740,14 @@
                       start_time: this.start_time,
                       remark: ''
                     }
-                    CreateGroupAdvice(this.$route.query.patient_id, 0, params).then(
+                    var patient_id = 0
+                    if(this.$route.query.patient_id == undefined){
+                       patient_id = this.patient.id
+                    }else{
+                      patient_id = this.$route.query.patient_id
+                    }
+                  
+                    CreateGroupAdvice(patient_id, 0, params).then(
                       rs => {
                         var resp = rs.data
                         if (resp.state == 1) {
@@ -1767,11 +1776,9 @@
                   return
                 }
                 var arr = this.dialysisPrescription
-                // console.log('arr', arr)
-
+                
                 const ParamsQuery = arr
-                // console.log('医嘱推送3', ParamsQuery)
-
+              
                 ParamsQuery['patient'] = this.patient.id
                 ParamsQuery['record_date'] = this.record_date
                 ParamsQuery['mode'] = 1
@@ -1806,7 +1813,13 @@
                       start_time: this.start_time,
                       remark: ''
                     }
-                    CreateGroupAdvice(this.$route.query.patient_id, 0, params).then(
+                    var patient_id = 0
+                    if(this.$route.query.patient_id == undefined){
+                       patient_id = this.patient.id
+                    }else{
+                      patient_id = this.$route.query.patient_id
+                    }
+                    CreateGroupAdvice(patient_id, 0, params).then(
                       rs => {
                         var resp = rs.data
                         if (resp.state == 1) {

src/xt_pages/outpatientTool/components/detailStatistics.vue

@@ -121,11 +121,11 @@
       </el-table-column>
      
     </el-table>
-    <div style="display:flex;justify-content: space-around;">
+    <div style="display:flex;justify-content: space-around;margin-top: 25px;">
       <div>总费用:{{getAllPice()}}</div>
      <div>个人支付:
-        <span v-if="his_patient.balance_accounts_type == 2"></span> {{getAllPice()}}
-        <span v-if="his_patient.balance_accounts_type != 2"></span> {{getActPay()}}
+        <span v-if="his_record_patient.balance_accounts_type == 2">{{getAllPice()}}</span>
+        <span v-if="his_record_patient.balance_accounts_type != 2">{{getActPay()}}</span>
     </div>
      <div>基金支付记账:{{getFundPaySumamt()}}</div>
      <div>补充医疗支付记账:{{getHifesPay()}}</div>
@@ -179,6 +179,8 @@ export default {
       id:0,
       start_time:"",
       end_time:"",
+      his_record_patient:{},
+      orderList:[],
     }
   },
   methods: {
@@ -220,6 +222,11 @@ export default {
        if(response.data.state == 1){
           var list =  response.data.data.list
           this.his_patient = response.data.data.his_patient
+          this.his_record_patient = response.data.data.his_record_patient
+          console.log("his_record_patient",this.his_record_patient)
+
+          this.orderList = response.data.data.orderList
+          console.log("orderlist2332322333232323232",this.orderList)
           this.list = list
           this.tableData = []
           for(let i=0;i<list.length;i++){
@@ -297,11 +304,10 @@ export default {
                 }
               } 
             }
-            // console.log("项目new_arr",new_arr)
+           
             this.tableData = []
             obj.total_price = this.getPrice(new_arr)
-            // console.log("ar3233223232",new_arr)
-            // new_arr.push(obj)
+           
             this.tableData = new_arr
             }
 
@@ -322,7 +328,7 @@ export default {
             this.tableData = new_arr
           }      
           
-          // console.log("hh233223233232323232322332",this.tableData)
+         
        }
      })
     },
@@ -335,10 +341,8 @@ export default {
     },
     getActPay(){
       var act_pay = 0
-      for(let i=0;i<this.list.length;i++){
-        for(let j=0;j<this.list[i].orders.length;j++){
-           act_pay +=this.list[i].orders[j].acct_pay
-        }
+      for(let i=0;i<this.orderList.length;i++){
+         act_pay += this.orderList[i].psn_part_amt
       }
       return act_pay
     },

src/xt_pages/outpatientTool/components/gatherStatistics.vue

@@ -125,7 +125,7 @@
       </el-table-column>
 
     </el-table>
-     <div>
+     <div style="margin-top: 25px;">
       <div class="listInfo">
             <div>西药：{{getWesternMedicineCostTotal()}}</div>
             <div>中成药：{{getChineseTraditionalMedicineCostTotal()}}</div>
@@ -214,6 +214,7 @@ export default {
       start_time:"",
       end_time:"",
       his_record_patient:{},
+      orderList:[],
     }
   },
   methods: {
@@ -269,8 +270,8 @@ export default {
           this.drugTypeList =response.data.data.drugTypeList
           this.costClassifyList = response.data.data.costClassifyList 
           var list = response.data.data.list
-          console.log("listw3232323223",list)
-
+          
+          
           var new_arr = []
 
           for(let i=0;i<list.length;i++){
@@ -278,7 +279,7 @@ export default {
                new_arr.push(list[i].orders[j])
             }
           }
-          console.log("new_arr2332323232",new_arr)
+         
 
           var order_info = []
           for(let i=0;i<new_arr.length;i++){
@@ -301,7 +302,7 @@ export default {
             }
           }
 
-          console.log("order_info222222222222",order_info)
+        
           
           //合并，相同的合并在一起
 
@@ -331,7 +332,7 @@ export default {
             dataInfo[item_id].child.push(item)
           })
           let arr = Object.values(dataInfo) 
-          console.log("中欧地区3323323223322332322323323232",arr)
+         
           for(let i=0;i<arr.length;i++){
             for(let j=0;j<arr[i].child.length;j++){
                if(arr[i].advice_id >0){
@@ -366,7 +367,7 @@ export default {
                arr[i].count_number +=arr[i].child[j].cnt
             }
           }
-          console.log("arr2323233232322332",arr)
+       
           for(let i=0;i<arr.length;i++){
             if(arr[i].advice_id >0){
                arr[i].cost_type = this.getDrugType(arr[i].cost_type)
@@ -377,15 +378,15 @@ export default {
             arr[i].total_all = (arr[i].count_number * arr[i].pric).toFixed(2)
           }
           this.tableList = arr
-          console.log("tabl233232323232323232323232",this.tableList)
+    
           this.patient = response.data.data.patient
-          console.log("patient_2323322332",this.patient)
+          
           this.his_patient = response.data.data.his_patient
           this.hisDepatment =  response.data.data.hisDepatment
           this.order =  response.data.data.order
           this.his_record_patient = response.data.data.his_record_patient
           this.medicalInsuranceLevelList = response.data.data.medicalInsuranceLevelList  
-          
+         
           if(this.id == 1){
              var new_arr = []
              for(let i=0;i<this.tableList.length;i++){
@@ -758,8 +759,7 @@ export default {
         let new_drug_ids = this.unique(drug_ids)
         let new_project_ids = this.unique(project_ids)
         let list = []
-         
-         console.log("new_drug_ids232323323232332332233223",new_drug_ids)
+     
         if (new_drug_ids.length > 0 && new_project_ids.length == 0) {
           for (let i = 0; i < new_drug_ids.length; i++) {
             let obj = {}
@@ -782,7 +782,7 @@ export default {
             list.push(obj)
 
           }
-          console.log("list23323232233232",list)
+        
 
         }
         if (new_drug_ids.length == 0 && new_project_ids.length > 0) {
@@ -1101,7 +1101,7 @@ export default {
         obj['count'] = count
         this.tableList.push(obj)
       }
-     console.log("表格 2323323232323323323232323232323",this.tableList)
+    
            
       var objOne = {index:"合计",is_total:1,total:0}
       objOne.total = this.getTotalPrice(this.tableList)
@@ -1300,7 +1300,7 @@ export default {
       return total_price.toFixed(2)
     },
     getDrugType(id){
-      console.log("id2332323232233232232323",id)
+
       var name = ""
       for(let i=0;i<this.drugTypeList.length;i++){
          if(id == this.drugTypeList[i].value){

src/xt_pages/outpatientTool/detailPrint.vue

@@ -33,8 +33,8 @@
       <div class="listInfo">
         <div>总费用：{{ getAllPice() }}</div>
         <div>个人支付：
-          <span v-if="this.$route.query.balance_accounts_type == 2 && his_patient.id >0">{{ getAllPice() }}</span>
-          <span v-if="this.$route.query.balance_accounts_type != 2 && his_patient.id >0">{{ getActPay() }}</span>
+          <!-- <span v-if="this.$route.query.balance_accounts_type == 2 && his_patient.id >0">{{ getAllPice() }}</span>
+          <span v-if="this.$route.query.balance_accounts_type != 2 && his_patient.id >0">{{ getActPay() }}</span> -->
           
           <span v-if="his_record_patient.balance_accounts_type == 2">{{ getAllPice() }}</span>
           <span v-if="his_record_patient.balance_accounts_type != 2">{{ getActPay() }}</span>
@@ -142,6 +142,7 @@ export default {
       ],
       order:{},
       his_record_patient:{},
+      orderList:[],
     };
   },
   methods: {
@@ -197,8 +198,9 @@ export default {
          
          this.his_record_patient = response.data.data.his_record_patient
 
-          this.hisDepatment = response.data.data.hisDepatment;
-
+         this.hisDepatment = response.data.data.hisDepatment;
+          
+         this.orderList = response.data.data.orderList
           this.order = response.data.data.order
           this.tableData = [];
           for (let i = 0; i < list.length; i++) {
@@ -225,7 +227,7 @@ export default {
           this.tableData.push(obj);
 
 
-          console.log("表哥233232323232233232322323",this.tableData)
+         
           if (this.$route.query.keyword != "") {
             var new_arr = []
             for (let i = 0; i < this.tableData.length; i++) {
@@ -268,7 +270,7 @@ export default {
             objs.total_price = this.getPrice(new_arr)
             new_arr.push(objs)
             this.tableData = new_arr;
-            console.log("表哥2333333333333333333333333333",this.tableData)
+           
           }
 
           if(this.$route.query.id == 1){
@@ -301,10 +303,10 @@ export default {
                 }
               }
             }
-            console.log("项目new_arr",new_arr)
+         
             this.tableData = []
             obj.total_price = this.getPrice(new_arr)
-            console.log("ar3233223232",new_arr)
+           
             for(let i=0;i<new_arr.length;i++){
               new_arr[i].is_total = 1
             }
@@ -330,7 +332,7 @@ export default {
               new_arr[i].is_total = 1
             }
             new_arr.push(obj)
-            console.log("new_arr2332323232",new_arr)
+           
             this.tableData = new_arr
           }
 
@@ -346,15 +348,12 @@ export default {
       }
       return total_price;
     },
-    getActPay() {
-      console.log("hh23h323223323", this.list);
-      var act_pay = 0;
-      for (let i = 0; i < this.list.length; i++) {
-        for (let j = 0; j < this.list[i].orders.length; j++) {
-          act_pay += this.list[i].orders[j].acct_pay;
-        }
+    getActPay(){
+      var act_pay = 0
+      for(let i=0;i<this.orderList.length;i++){
+         act_pay += this.orderList[i].psn_part_amt
       }
-      return act_pay;
+      return act_pay
     },
     getFundPaySumamt() {
       var fund_pay_sumamt = 0;

src/xt_pages/outpatientTool/gatherPrint.vue

@@ -189,7 +189,7 @@
           this.drugTypeList =response.data.data.drugTypeList
           this.costClassifyList = response.data.data.costClassifyList 
           var list = response.data.data.list
-          console.log("listw3232323223",list)
+          
 
           var new_arr = []
 
@@ -198,7 +198,7 @@
                new_arr.push(list[i].orders[j])
             }
           }
-          console.log("new_arr2332323232",new_arr)
+          
 
           var order_info = []
           for(let i=0;i<new_arr.length;i++){
@@ -220,7 +220,7 @@
               }
             }
           }
-          console.log("order_info222222222222",order_info)
+          
           
           //合并，相同的合并在一起
 
@@ -285,7 +285,7 @@
                arr[i].count_number +=arr[i].child[j].cnt
             }
           }
-          console.log("arr2323233232322332",arr)
+          
           var obj = {is_total:1,total:0}
           obj.total = this.getAllPiceTwo(arr)
           for(let i=0;i<arr.length;i++){
@@ -299,9 +299,9 @@
           arr.push(obj)
 
           this.tableList = arr
-          console.log("打印",this.tableList)
+         
           this.patient = response.data.data.patient
-          console.log("patinet",this.patient)
+         
           this.his_patient = response.data.data.his_patient
           this.hisDepatment =  response.data.data.hisDepatment
           this.order =  response.data.data.order
@@ -310,8 +310,7 @@
           this.schedule = response.data.data.schedule
           this.bedNumber = response.data.data.bedNumber
           if(this.$route.query.keyword !=""){
-            console.log("金拉风3322323232323",this.$route.query.keyword)
-            console.log("Ar23233232323223",this.tableList)
+           
             var new_arr = []
             for(let i=0;i<this.tableList.length;i++){
               if(this.tableList[i].is_total!=1){
@@ -525,7 +524,7 @@
           
           }
          }
-         console.log("list232332322323332233223232323",list)
+       
         return list
       }, 
     
@@ -1034,7 +1033,7 @@
       return total_price.toFixed(2)
     },
     getDrugType(id){
-      console.log("id2332323232233232232323",id)
+    
       var name = ""
       for(let i=0;i<this.drugTypeList.length;i++){
          if(id == this.drugTypeList[i].value){

src/xt_pages/outpatientTool/statistics.vue

@@ -1,34 +1,47 @@
 <template>
   <div class="main-contain new-main-contain">
     <div class="position">
-<!--      <bread-crumb :crumbs='crumbs'></bread-crumb>-->
-      <bread-crumb :crumbs='crumbs'></bread-crumb>
+      <!--      <bread-crumb :crumbs='crumbs'></bread-crumb>-->
+      <bread-crumb :crumbs="crumbs"></bread-crumb>
     </div>
-    <div class="app-container" style="display:flex;flex: 1;padding: 10px 20px 0px 20px;">
+    <div
+      class="app-container"
+      style="display: flex; flex: 1; padding: 10px 20px 0px 20px"
+    >
       <div class="mainLeft">
         <div>
-         <el-input
-          size="small"
-          style="width: 130px"
-          v-model="keywords"
-          class="filter-item"
-          placeholder="请输入患者名称"
-        />
-        <el-button
-          size="small"
-          class="filter-item"
-          type="primary"
-          @click="searchAction"
-        >搜索
-        </el-button>
-          <el-table  :data="patientTableData" :height="tableHeight" border style="width: 100%;"
-                     :row-style="{ color: '#303133' }"
-                     :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
-                     highlight-current-row
-                     ref="singleTable"
-                     @current-change="handleCurrentChange"
-                   >
-            <el-table-column align="center" prop="name" label="姓名" wdith='89'>
+          <div style="margin:10px 0;display: flex;justify-content: space-between;">
+            <el-input
+              size="small"
+              style="width: 130px"
+              v-model="keywords"
+              class="filter-item"
+              placeholder="请输入患者名称"
+            />
+            <el-button
+              size="small"
+              class="filter-item"
+              type="primary"
+              @click="searchAction"
+              >搜索
+            </el-button>
+          </div>
+
+          <el-table
+            :data="patientTableData"
+            :height="tableHeight"
+            border
+            style="width: 100%"
+            :row-style="{ color: '#303133' }"
+            :header-cell-style="{
+              backgroundColor: 'rgb(245, 247, 250)',
+              color: '#606266',
+            }"
+            highlight-current-row
+            ref="singleTable"
+            @current-change="handleCurrentChange"
+          >
+            <el-table-column align="center" prop="name" label="姓名" wdith="89">
               <template slot-scope="scope">{{ scope.row.name }}</template>
             </el-table-column>
           </el-table>
@@ -39,21 +52,27 @@
           <el-tab-pane label="明细" name="明细"></el-tab-pane>
           <el-tab-pane label="汇总" name="汇总"></el-tab-pane>
         </el-tabs>
-        <detail-statistics v-if="titleType == '明细'" :patient_id="patient_id" ref="child"></detail-statistics>
-        <gather-statistics v-if="titleType == '汇总'" :patient_id="patient_id" ref="childOne"></gather-statistics>
+        <detail-statistics
+          v-if="titleType == '明细'"
+          :patient_id="patient_id"
+          ref="child"
+        ></detail-statistics>
+        <gather-statistics
+          v-if="titleType == '汇总'"
+          :patient_id="patient_id"
+          ref="childOne"
+        ></gather-statistics>
       </div>
     </div>
   </div>
 </template>
 
 <script>
-import {
-  GetDetailPatients,
-} from '@/api/his/his_tools'
-import BreadCrumb from '@/xt_pages/components/bread-crumb'
+import { GetDetailPatients } from "@/api/his/his_tools";
+import BreadCrumb from "@/xt_pages/components/bread-crumb";
 
-import DetailStatistics from './components/detailStatistics'
-import GatherStatistics from './components/gatherStatistics'
+import DetailStatistics from "./components/detailStatistics";
+import GatherStatistics from "./components/gatherStatistics";
 export default {
   components: {
     GatherStatistics,
@@ -61,58 +80,79 @@ export default {
     BreadCrumb,
   },
   data() {
-
     return {
-      patientTableData:[],
+      patientTableData: [],
       tableHeight: 400,
       crumbs: [
-        { path: false, name: 'His工具' },
-        { path: false, name: '明细汇总统计' }
+        { path: false, name: "His工具" },
+        { path: false, name: "明细汇总统计" },
       ],
-      titleType: '明细',
-      patient_id:0,
-      keywords:"",
+      titleType: "明细",
+      patient_id: 0,
+      keywords: "",
+    };
+  },
+  //判断列表页是否刷新
+  beforeRouteEnter(to, from, next) {
+    console.log(from, "beforeRouteEnter");
+    if (from.path == "/hisTool/detailPrint") {
+      next((vm) => {
+        vm.patient_id = vm.$store.getters.pagedata.list.patient_id;
+        // setTimeout(() => {
+        //   vm.getHisOrderList();
+        // },300)
+        
+      });
+    } else {
+      next((vm) => {
+        vm.getPatientList()
+        // setTimeout(() => {
+        //   vm.getHisOrderList();
+        // },300)
+        
+      });
     }
   },
+
   methods: {
-    getPatientList(){
-       var params = {
-         keyword:this.keywords,
-       }
-      GetDetailPatients(params).then(response => {
+    getPatientList() {
+      var params = {
+        keyword: this.keywords,
+      };
+      GetDetailPatients(params).then((response) => {
         if (response.data.state == 0) {
-          this.$message.error(response.data.msg)
-          return false
+          this.$message.error(response.data.msg);
+          return false;
         } else {
-          this.patientTableData = response.data.data.patient
-          this.patient_id =  this.patientTableData[0].id
-          this.$refs.singleTable.setCurrentRow(this.patientTableData[0])
+          this.patientTableData = response.data.data.patient;
+          this.patient_id = this.patientTableData[0].id;
+
+          this.$refs.singleTable.setCurrentRow(this.patientTableData[0]);
         }
-      })
+      });
     },
-    searchAction(){
-      this.getPatientList()
+    searchAction() {
+      this.getPatientList();
     },
-    handleCurrentChange(row){
-      this.patient_id = 0
-      this.patient_id = row.id
+    handleCurrentChange(row,index) {
+      this.patient_id = row.id;
       // this.$refs.child.getHisSummaryDetailList()
       // this.$refs.childOne.getGatherDetailList()
+      // this.$store.commit("SET_PAGEDATA",{
+      //   patient_id: row.id,
+      // })
+      console.log(index,'po')
     },
-
   },
   created() {
-    const tableHeight = document.body.clientHeight - 290
-    this.tableHeight = tableHeight
-    this.getPatientList()
-
+    const tableHeight = document.body.clientHeight - 290;
+    this.tableHeight = tableHeight;
+    this.getPatientList();
   },
 
-  mounted() {
-
-  },
-  watch: {}
-}
+  mounted() {},
+  watch: {},
+};
 </script>
 
 <style lang="scss" scoped>
@@ -138,10 +178,9 @@ export default {
   display: flex;
   flex-direction: column;
 
-.el-radio {
-  margin-right: 5px;
-}
-
+  .el-radio {
+    margin-right: 5px;
+  }
 }
 .mainRight {
   margin-left: 10px;
@@ -151,12 +190,11 @@ export default {
   flex-direction: column;
   overflow-y: auto;
 
-.cellSpan {
-  min-width: 80px;
-  display: inline-block;
-  margin-right: 10px;
-}
-
+  .cellSpan {
+    min-width: 80px;
+    display: inline-block;
+    margin-right: 10px;
+  }
 }
 .mainCenter {
   display: flex;
@@ -169,16 +207,15 @@ export default {
   flex-direction: column;
   position: relative;
 
-.el-form-item {
-  width: 32%;
-  margin-right: 1%;
-  float: left;
-}
-
-.el-form-item__label {
-  text-align: left;
-}
+  .el-form-item {
+    width: 32%;
+    margin-right: 1%;
+    float: left;
+  }
 
+  .el-form-item__label {
+    text-align: left;
+  }
 }
 .backColor {
   background: #f6f8f9;
@@ -192,21 +229,19 @@ export default {
   overflow-y: auto;
   margin-bottom: 60px;
 
-.el-tabs__item {
-  padding: 0 10px;
-}
-
+  .el-tabs__item {
+    padding: 0 10px;
+  }
 }
 .preTabs {
   height: 100%;
   display: flex;
   flex-direction: column;
 
-.el-tabs__content {
-  flex: 1;
-  overflow-y: auto;
-}
-
+  .el-tabs__content {
+    flex: 1;
+    overflow-y: auto;
+  }
 }
 
 .costBox {
@@ -240,25 +275,24 @@ export default {
   border: 1px solid #d2d2d2;
   box-sizing: border-box;
 
-p {
-  width: 50%;
-  height: 40px;
-  line-height: 40px;
-  text-align: center;
-  background: #eee;
-  float: left;
-}
-
-> p:last-child {
-  border-left: 1px solid #d2d2d2;
-  float: right;
-}
-
-.activeP {
-  background: #409EFF;
-  color: #fff;
-}
-
+  p {
+    width: 50%;
+    height: 40px;
+    line-height: 40px;
+    text-align: center;
+    background: #eee;
+    float: left;
+  }
+
+  > p:last-child {
+    border-left: 1px solid #d2d2d2;
+    float: right;
+  }
+
+  .activeP {
+    background: #409eff;
+    color: #fff;
+  }
 }
 .comfirmBox {
   width: 100%;
@@ -298,68 +332,83 @@ p {
 
 <style lang="scss">
 .centerLeft {
-
-.el-form-item__label {
-  text-align: left;
-}
-
+  .el-form-item__label {
+    text-align: left;
+  }
 }
 .tabsBox {
-
-.el-tabs__item {
-  padding: 0 10px;
-}
-
-.el-tabs--bottom .el-tabs--left > .el-tabs__header .el-tabs__item:nth-child(2), .el-tabs--bottom .el-tabs--right > .el-tabs__header .el-tabs__item:nth-child(2), .el-tabs--bottom.el-tabs--border-card > .el-tabs__header .el-tabs__item:nth-child(2), .el-tabs--bottom.el-tabs--card > .el-tabs__header .el-tabs__item:nth-child(2), .el-tabs--top .el-tabs--left > .el-tabs__header .el-tabs__item:nth-child(2), .el-tabs--top .el-tabs--right > .el-tabs__header .el-tabs__item:nth-child(2), .el-tabs--top.el-tabs--border-card > .el-tabs__header .el-tabs__item:nth-child(2), .el-tabs--top.el-tabs--card > .el-tabs__header .el-tabs__item:nth-child(2) {
-  padding: 0 10px;
-}
-
-.el-tabs--bottom .el-tabs--left > .el-tabs__header .el-tabs__item:last-child, .el-tabs--bottom .el-tabs--right > .el-tabs__header .el-tabs__item:last-child, .el-tabs--bottom.el-tabs--border-card > .el-tabs__header .el-tabs__item:last-child, .el-tabs--bottom.el-tabs--card > .el-tabs__header .el-tabs__item:last-child, .el-tabs--top .el-tabs--left > .el-tabs__header .el-tabs__item:last-child, .el-tabs--top .el-tabs--right > .el-tabs__header .el-tabs__item:last-child, .el-tabs--top.el-tabs--border-card > .el-tabs__header .el-tabs__item:last-child, .el-tabs--top.el-tabs--card > .el-tabs__header .el-tabs__item:last-child {
-  padding: 0 10px;
-}
-
-.el-tabs--card > .el-tabs__header .el-tabs__item.is-active.is-closable {
-  padding: 0 10px;
-}
-
+  .el-tabs__item {
+    padding: 0 10px;
+  }
+
+  .el-tabs--bottom
+    .el-tabs--left
+    > .el-tabs__header
+    .el-tabs__item:nth-child(2),
+  .el-tabs--bottom
+    .el-tabs--right
+    > .el-tabs__header
+    .el-tabs__item:nth-child(2),
+  .el-tabs--bottom.el-tabs--border-card
+    > .el-tabs__header
+    .el-tabs__item:nth-child(2),
+  .el-tabs--bottom.el-tabs--card > .el-tabs__header .el-tabs__item:nth-child(2),
+  .el-tabs--top .el-tabs--left > .el-tabs__header .el-tabs__item:nth-child(2),
+  .el-tabs--top .el-tabs--right > .el-tabs__header .el-tabs__item:nth-child(2),
+  .el-tabs--top.el-tabs--border-card
+    > .el-tabs__header
+    .el-tabs__item:nth-child(2),
+  .el-tabs--top.el-tabs--card > .el-tabs__header .el-tabs__item:nth-child(2) {
+    padding: 0 10px;
+  }
+
+  .el-tabs--bottom .el-tabs--left > .el-tabs__header .el-tabs__item:last-child,
+  .el-tabs--bottom .el-tabs--right > .el-tabs__header .el-tabs__item:last-child,
+  .el-tabs--bottom.el-tabs--border-card
+    > .el-tabs__header
+    .el-tabs__item:last-child,
+  .el-tabs--bottom.el-tabs--card > .el-tabs__header .el-tabs__item:last-child,
+  .el-tabs--top .el-tabs--left > .el-tabs__header .el-tabs__item:last-child,
+  .el-tabs--top .el-tabs--right > .el-tabs__header .el-tabs__item:last-child,
+  .el-tabs--top.el-tabs--border-card
+    > .el-tabs__header
+    .el-tabs__item:last-child,
+  .el-tabs--top.el-tabs--card > .el-tabs__header .el-tabs__item:last-child {
+    padding: 0 10px;
+  }
+
+  .el-tabs--card > .el-tabs__header .el-tabs__item.is-active.is-closable {
+    padding: 0 10px;
+  }
 }
 .centerRight {
+  .el-tabs__nav-scroll {
+    display: flex;
+  }
 
-.el-tabs__nav-scroll {
-  display: flex;
-}
-
-.el-tabs__nav {
-  margin: 0 auto;
-}
-
-.el-table th .cell, .el-table td .cell {
-  padding: 0 2px;
-}
+  .el-tabs__nav {
+    margin: 0 auto;
+  }
 
+  .el-table th .cell,
+  .el-table td .cell {
+    padding: 0 2px;
+  }
 }
 .preTabs {
-
-.el-tabs__content {
-
-}
-
+  .el-tabs__content {
+  }
 }
 .rightTabs {
   height: 100%;
 
-
-.el-tabs__content {
-
-}
-
+  .el-tabs__content {
+  }
 }
 .centerDialog {
-
-.el-dialog__body {
-  max-height: calc(100vh - 100px) !important;
-  padding: 0 20px;
-}
-
+  .el-dialog__body {
+    max-height: calc(100vh - 100px) !important;
+    padding: 0 20px;
+  }
 }
 </style>

src/xt_pages/stock/drugs/drugStockInOrderAdd.vue

@@ -761,7 +761,7 @@
             const params = {
               'stockIn': this.recordInfo.recordData
             }
-           
+            
             postDrugWarehouse(params, this.warehousing_time, this.form.manufacturer, this.form.dealer, this.type,this.storehouse_id).then(response => {
               if (response.data.state == 0) {
                 this.loading = false

src/xt_pages/stock/drugs/drugStockOutOrderAdd.vue

@@ -595,7 +595,8 @@ export default {
             stockOut: this.recordInfo.recordData
           };
        
-         
+          console.log("parasm2233223233232233232",params)
+        
           const loading = this.$loading({
             lock: true,
             text: 'Loading',