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

src/api/drug/drug_stock.js

@@ -1,6 +1,11 @@
 import request from '@/utils/request'
 
 export function postDrugWarehouse(params, warehousing_time, manufacturer_id, dealer_id, type) {
+  console.log("params----",params)
+  console.log("warehousintg",warehousing_time)
+  console.log("manufactureer_id",manufacturer_id)
+  console.log("dealer_id",dealer_id)
+  console.log("type",type)
   return request({
     url: '/api/drugwarehouse/create?warehousing_time=' + warehousing_time + '&manufacturer_id=' + manufacturer_id + '&dealer_id=' + dealer_id + '&type=' + type,
     method: 'post',

src/api/stock.js

@@ -386,6 +386,12 @@ export function DeleteWarehouseInfoItem(params) {
 }
 
 export function EditWarehouse(params, warehousing_time, id, type, manufacturer_id, dealer_id) {
+  console.log("params",params)
+  console.log("warehousing",warehousing_time)
+  console.log("id",id)
+  console.log("type",type)
+  console.log("manufacturer_id",manufacturer_id)
+  console.log("dealer_id",dealer_id)
   return request({
     url: '/api/warehouse/edit?warehousing_time=' + warehousing_time + '&id=' + id + '&type=' + type + '&manufacturer_id=' + manufacturer_id + '&dealer_id=' + dealer_id,
     method: 'post',
@@ -560,3 +566,12 @@ export function getWarehouseOutUser(params) {
   })
 }
 
+
+export function PostSearchStock(keyword,params){
+  
+  return request({
+    url:'/api/warehouseout/postsearchstock?keyword='+keyword,
+    method:"get",
+    params:params
+  })
+}

src/xt_pages/data/components/addConsumable.vue

@@ -9,7 +9,7 @@
             <el-tab-pane label="基础数据" name="first">
                 <div>
                     <el-form :model="form" :rules="rules" ref="form" label-width="100px" style="display: flex;flex-wrap: wrap;justify-content: space-between;">
-                        <el-form-item label="耗材名称 : " prop="name" style="width:100%">
+                        <el-form-item label="耗材名称22 : " prop="name" style="width:100%">
                             <el-input v-model="form.good_name" placeholder="" maxlength="30"></el-input>
                         </el-form-item>
                         <el-form-item label="拼音 : " prop="name" style="width:50%">

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

@@ -143,6 +143,7 @@
             v-if="
               isShow('超滤量') &&
                 (template_id == 6 ||
+                  template_id == 9 ||
                   template_id == 10 ||
                   template_id == 11 ||
                   template_id == 12 ||
@@ -178,6 +179,7 @@
             v-if="
               isShow('超滤量') &&
                 template_id != 6 &&
+                template_id !=9 &&
                 template_id != 10 &&
                 template_id != 11 &&
                 template_id != 12 &&
@@ -509,7 +511,7 @@
 
           <el-col
             :span="8"
-            v-if=" isShow('超滤量') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 27 || template_id == 29 || template_id == 30 || org_id == 9555) " >
+            v-if=" isShow('超滤量') && (template_id == 6 || template_id == 9 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 27 || template_id == 29 || template_id == 30 || org_id == 9555) " >
             <el-form-item label="超滤量(ml)：">
               <el-input v-model="form.ultrafiltration_volume"></el-input>
             </el-form-item>
@@ -517,7 +519,7 @@
 
           <el-col
             :span="8"
-            v-if=" isShow('超滤量') && template_id != 6 && template_id != 10 && template_id != 11 && template_id != 12 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22 && template_id != 23 && template_id != 24 && template_id != 26 && template_id!=27 && template_id!=29 && template_id!=30 && org_id !=9555" >
+            v-if=" isShow('超滤量') && template_id != 6 && template_id !=9 && template_id != 10 && template_id != 11 && template_id != 12 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22 && template_id != 23 && template_id != 24 && template_id != 26 && template_id!=27 && template_id!=29 && template_id!=30 && org_id !=9555" >
             <el-form-item label="超滤量(L)：">
               <el-input v-model="form.ultrafiltration_volume"></el-input>
             </el-form-item>

src/xt_pages/dialysis/details/dialysisMonitoring.vue

@@ -14,8 +14,8 @@
           <th width="76px">静脉压/动脉压({{monitores[0]&&monitores[0]['venous_pressure_type'] == 2 ? 'kpa' : 'mmHg'}})</th>
           <th v-if="isShow('血流量')" width="92px">血流量(ml/min)</th>
           <th v-if="isShow('跨膜压')" width="76px">跨膜压({{monitores[0]&&monitores[0]['transmembrane_pressure_type'] == 2 ? 'kpa' : 'mmHg'}})</th>
-          <th v-if=" isShow('超滤量') &&(template_id == 6 || template_id == 10 || template_id == 11 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 27 || template_id == 28 || template_id == 29 || template_id == 30 || this.$store.getters.xt_user.template_info.org_id == 9555)" width="76px" > 超滤量(ml)</th>
-          <th v-if=" isShow('超滤量') && template_id != 6 && template_id != 10 && template_id != 11 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22 && template_id != 23 && template_id != 24 && template_id != 26 && template_id !=27 && template_id!=28 && template_id!=29 && template_id!=30 && this.$store.getters.xt_user.template_info.org_id != 9555"  width="76px"> 超滤量(L) </th>
+          <th v-if=" isShow('超滤量') &&(template_id == 6 || template_id == 9 || template_id == 10 || template_id == 11 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 27 || template_id == 28 || template_id == 29 || template_id == 30 || this.$store.getters.xt_user.template_info.org_id == 9555)" width="76px" > 超滤量(ml)</th>
+          <th v-if=" isShow('超滤量') && template_id != 6 && template_id != 9 && template_id != 10 && template_id != 11 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22 && template_id != 23 && template_id != 24 && template_id != 26 && template_id !=27 && template_id!=28 && template_id!=29 && template_id!=30 && this.$store.getters.xt_user.template_info.org_id != 9555"  width="76px"> 超滤量(L) </th>
           <th v-if="isShow('超滤率') && (template_id ==6 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 29 || template_id == 30)" width="50px"> 超滤率 <br />(ml/h) </th>
           <th v-if="isShow('超滤率') && template_id !=6 && template_id !=10 && template_id !=11 && template_id !=12 && template_id !=13 && template_id !=17 && template_id !=18 && template_id !=19 && template_id !=20 && template_id !=21 && template_id !=22 && template_id !=23 && template_id !=24 && template_id !=26 && template_id !=29 && template_id !=30" width="50px"> 超滤率 <br />(L/h) </th>
           <th v-if="isShow('钠浓度')" width="92px">钠浓度(mmol/L)</th>

src/xt_pages/dialysis/template/DialysisPrintOrderNine.vue

@@ -349,6 +349,7 @@
               </tr>
               </tbody>
             </table>
+           
           </td>
         </tr>
         </tbody>
@@ -789,6 +790,8 @@
           <td width="80" style="line-height:20px">TMP<br />{{monitors[0] && monitors[0]['transmembrane_pressure_type'] == 2 ? 'kpa' : 'mmHg'}}</td>
           <td width="60" style="line-height:20px">血流量<br />ml/min</td>
           <td width="60" style="line-height:20px">电导度<br />mS/cm</td>
+          <td width="60" v-if="org_id  == 10032" style="line-height:20px">超滤量<br />ml</td>
+          <td width="60" v-if="org_id  == 10032" style="line-height:20px">透析液温度<br />℃</td>
           <!-- <td width="60">钠浓度<br/>mmol/L</td>
         <td width="80">透析液温度<br/>℃</td>
         <td width="60">置换率<br/>ml/min</td> -->
@@ -836,6 +839,12 @@
           </td>
           <td>
             &nbsp;{{ monitor.conductivity ? monitor.conductivity : "" }}
+          </td>
+           <td v-if="org_id  == 10032">
+            &nbsp;{{ monitor.ultrafiltration_volume ? monitor.ultrafiltration_volume : "" }}
+          </td>
+           <td v-if="org_id  == 10032">
+            &nbsp;{{ monitor.dialysate_temperature ? monitor.dialysate_temperature : "" }}
           </td>
           <!-- <td>&nbsp;{{monitor.sodium_concentration}}</td>
         <td>&nbsp;{{monitor.dialysate_temperature}}</td>
@@ -843,6 +852,7 @@
           <td>
             &nbsp;{{ monitor.symptom }} &nbsp;{{ monitor.dispose }} &nbsp;{{ monitor.result }}
           </td>
+         
         </tr>
         </tbody>
       </table>
@@ -1221,6 +1231,21 @@
                 </tbody>
               </table>
 
+              <table class="table-box" v-if="org_id == 10032">
+                <tbody>
+                  <tr>
+                   <td width="100">特殊病情处理:</td>
+                   <td width= "480">
+                     <div class="under-line">
+                      &nbsp;
+                      <span>{{ predialysis.remark }}</span>
+                     </div>
+                   </td>
+                    <td></td>
+                  </tr>
+                </tbody>
+              </table>
+
               <!-- <table class="table-box">
                 <tbody>
                   <tr>
@@ -1740,7 +1765,8 @@ export default {
         doctorForm: {
           doctor: '',
           url: ''
-        }
+        },
+        org_id:0,
       }
   },
     methods: {
@@ -2296,6 +2322,7 @@ export default {
     created() {
       var xtuser = this.$store.getters.xt_user
       this.orgname = xtuser.org.org_name
+      this.org_id = xtuser.org.id
       // this.orgname = "遂溪方济医院";
       this.modeOptions = this.$store.getters.treatment_mode
       this.replacementWays = this.$store.getters.replacement_ways

src/xt_pages/dialysis/template/DialysisPrintOrderOne.vue

@@ -554,6 +554,7 @@
             <td width="60">置换量<br />L</td>
             <td width="60">静脉压<br />mmHg</td>
             <td width="60">跨膜压<br />mmHg</td>
+            <td width="60" v-if="org_id == 9987">ktv</td>
             <!-- <td width="60">钠浓度<br/>mmol/L</td>
           <td width="80">透析液温度<br/>℃</td>
           <td width="60">置换率<br/>ml/min</td> -->
@@ -609,6 +610,9 @@
             <td>
               &nbsp;{{ monitor.symptom }} &nbsp;{{ monitor.dispose }} &nbsp;{{ monitor.result }}
             </td>
+            <td v-if="org_id == 9987">
+               &nbsp;{{monitor.ktv}}
+            </td>
           </tr>
         </tbody>
       </table>
@@ -1113,7 +1117,8 @@ export default {
         zongliang_unit: 'mg',
         gaimingcheng_unit: '',
         gaijiliang_unit: ''
-      }
+      },
+      org_id:0,
     }
   },
   methods: {
@@ -1603,7 +1608,7 @@ export default {
     this.precaution_arr = getDataConfig('hemodialysis', 'precaution')
     this.intake_arr = getDataConfig('hemodialysis', 'intake')
     this.nutrition_arr = getDataConfig('hemodialysis', 'nutrition')
-
+    this.org_id = this.org_template_info.org_id
     // this.bloodAccessParOpera = getDataConfig('hemodialysis', 'vascular_access_desc')
 
     var bloodAccessParOpera = getDataConfig(

src/xt_pages/dialysis/template/DialysisPrintOrderThirty.vue

@@ -65,7 +65,7 @@
             <td width="10"></td>
             <td width="70">有/无特殊:</td>
             <td width="200">
-                <div class="under-line" style="text-align:left">&nbsp;</div>
+                <div class="under-line" style="text-align:left">&nbsp;{{ prescription.remark ? prescription.remark : '' }}</div>
             </td>
           </tr>
         </tbody>
@@ -311,31 +311,29 @@
                 <table class="table-box">
                     <tbody>
                     <tr>
-                        <td wdith='70'>下机情况:</td>
-                        <td wdith='30'>凝血:</td>
-                        <td width="240">
-                            <label-box :isChecked="afterdialysis.cruor?(afterdialysis.cruor.indexOf('无') > -1 ? true : false):false" showValue="无"></label-box>&nbsp;
-                            <label-box :isChecked="afterdialysis.cruor?(afterdialysis.cruor.indexOf('有') > -1 ? true : false):false" showValue="有"></label-box>&nbsp;
-                            <label-box :isChecked="afterdialysis.cruor?(afterdialysis.cruor.indexOf('透析器-Ⅰ度') > -1 ? true : false):false" showValue="Ⅰ"></label-box>&nbsp;
-                            <label-box :isChecked="afterdialysis.cruor?(afterdialysis.cruor.indexOf('透析器-Ⅱ度') > -1 ? true : false):false" showValue="Ⅱ"></label-box>&nbsp;
-                            <label-box :isChecked="afterdialysis.cruor?(afterdialysis.cruor.indexOf('透析器-Ⅲ度') > -1 ? true : false):false" showValue="Ⅲ"></label-box>&nbsp;
-                            <label-box :isChecked="afterdialysis.cruor?(afterdialysis.cruor.indexOf('透析器-Ⅳ度') > -1 ? true : false):false" showValue="Ⅳ"></label-box>&nbsp;
-                        </td>
-                        <td width="70">静脉管道:</td>
-                        <td width="200">
-                            <label-box :isChecked="afterdialysis.intravenous_tube == 1 ? true : false" showValue="无"></label-box>&nbsp;
-                            <label-box :isChecked="afterdialysis.intravenous_tube == 2 ? true : false" showValue="+"></label-box>&nbsp;
-                            <label-box :isChecked="afterdialysis.intravenous_tube == 3 ? true : false" showValue="+ +"></label-box>&nbsp;
-                            <label-box :isChecked="afterdialysis.intravenous_tube == 4 ? true : false" showValue="+ + +"></label-box>&nbsp;
-                        </td>
-                        <td width="70">动脉管道:</td>
-                        <td width="200">
-                            <label-box :isChecked="afterdialysis.arterial_tube == 1 ? true : false" showValue="无"></label-box>&nbsp;
-                            <label-box :isChecked="afterdialysis.arterial_tube == 2 ? true : false" showValue="+"></label-box>&nbsp;
-                            <label-box :isChecked="afterdialysis.arterial_tube == 3 ? true : false" showValue="+ +"></label-box>&nbsp;
-                            <label-box :isChecked="afterdialysis.arterial_tube == 4 ? true : false" showValue="+ + +"></label-box>&nbsp;
-                        </td>
-                        <td></td>
+                      <td wdith='70'>下机情况:</td>
+                      <td wdith='30'>凝血:</td>
+                      <td width="240">
+                          <label-box :isChecked="afterdialysis.cruor?(afterdialysis.cruor.indexOf('无凝血') > -1 ? true : false):false" showValue="无"></label-box>&nbsp;
+                          <label-box :isChecked="afterdialysis.cruor?(afterdialysis.cruor.indexOf('有凝血') > -1 ? true : false):false" showValue="有"></label-box>&nbsp;
+                          <label-box :isChecked="afterdialysis.cruor?(afterdialysis.cruor.indexOf('透析器-Ⅰ度') > -1 ? true : false):false" showValue="Ⅰ"></label-box>&nbsp;
+                          <label-box :isChecked="afterdialysis.cruor?(afterdialysis.cruor.indexOf('透析器-Ⅱ度') > -1 ? true : false):false" showValue="Ⅱ"></label-box>&nbsp;
+                          <label-box :isChecked="afterdialysis.cruor?(afterdialysis.cruor.indexOf('透析器-Ⅲ度') > -1 ? true : false):false" showValue="Ⅲ"></label-box>&nbsp;
+                          <label-box :isChecked="afterdialysis.cruor?(afterdialysis.cruor.indexOf('透析器-Ⅳ度') > -1 ? true : false):false" showValue="Ⅳ"></label-box>&nbsp;
+                      </td>
+                      <td width='50'></td>
+                      <td width="70">静脉壶:</td>
+                      <td width="90">
+                        <label-box :isChecked="afterdialysis.cruor?(afterdialysis.cruor.indexOf('静脉壶凝血-无') > -1 ? true : false):false" showValue="无"></label-box>&nbsp;&nbsp;
+                        <label-box :isChecked="afterdialysis.cruor?(afterdialysis.cruor.indexOf('静脉壶凝血-有') > -1 ? true : false):false" showValue="有"></label-box>&nbsp;
+                      </td>
+                      <td width='50'></td>
+                      <td width="70">动脉壶:</td>
+                      <td width="90">
+                        <label-box :isChecked="afterdialysis.cruor?(afterdialysis.cruor.indexOf('动脉壶凝血-无') > -1 ? true : false):false" showValue="无"></label-box>&nbsp;&nbsp;
+                        <label-box :isChecked="afterdialysis.cruor?(afterdialysis.cruor.indexOf('动脉壶凝血-有') > -1 ? true : false):false" showValue="有"></label-box>&nbsp;
+                      </td>
+                      <td width="160"></td>
                     </tr>
                     </tbody>
                 </table>

src/xt_pages/dialysis/template/DialysisPrintOrderTwentyFive.vue

@@ -331,7 +331,7 @@
                     <label-box :isChecked="predialysis.is_hemorrhage == 2 ? true : false" showValue="无"></label-box>
                   </div>
                 </td>
-                <td width="420">
+                <td width="600">
                   <div>
                     <label-box :isChecked="predialysis.is_hemorrhage == 1 && predialysis.hemorrhage.indexOf('牙龈出血') > -1 ? true : false" showValue="牙龈出血"></label-box>
                     &nbsp;
@@ -342,6 +342,8 @@
                     <label-box :isChecked="predialysis.is_hemorrhage == 1 && predialysis.hemorrhage.indexOf('女性经期') > -1 ? true : false" showValue="女性经期"></label-box>
                     &nbsp;
                     <label-box :isChecked="predialysis.is_hemorrhage == 1 && predialysis.hemorrhage.indexOf('血尿') > -1 ? true : false" showValue="血尿"></label-box>
+                    &nbsp;
+                    <label-box :isChecked="predialysis.is_hemorrhage == 1 && predialysis.hemorrhage.indexOf('眼结膜出血') > -1 ? true : false" showValue="眼结膜出血"></label-box>
                   </div>
                 </td>
 

src/xt_pages/medicalScheduling/index.vue

@@ -1991,5 +1991,9 @@ export default {
         white-space: pre-line;/*保留换行符*/
     }
 }
+.el-dropdown-menu{
+    max-height:96%;
+    overflow-y: auto;
+}
 
 </style>

src/xt_pages/outpatientCharges/components/chargeDialog.vue

@@ -1,38 +1,43 @@
 <template>
-  <el-dialog width="854px" title="收费单" :visible.sync="visibility" :close-on-click-modal="isClose"
+  <el-dialog width="854px" title="收费单" class="chargeDialog" :visible.sync="visibility" :close-on-click-modal="isClose"
              :close-on-press-escape="isClose">
 
     <el-form :model="form"  ref="formValue" label-width="100px">
 
-      <el-form-item label="日期：">
+      <el-form-item label="日期：" style="width:100%;">
         <div>{{record_date}}</div>
       </el-form-item>
 
-
-      <el-form-item label="医保：" prop="name" :validate-event="is_Name">
-        <el-input type="number" v-model="form.medical_insurance_price"></el-input>
+      <el-form-item label="总计：" prop="name" :validate-event="is_Name" style="width:33%;">
+        <el-input type="number" v-model="form.total" :disabled="true"></el-input>
+      </el-form-item>
+      <el-form-item label="医保：" prop="name" :validate-event="is_Name" style="width:33%;">
+        <el-input type="number" v-model="form.medical_insurance_price" :disabled="true"></el-input>
       </el-form-item>
 
 
-      <el-form-item label="自费：" prop="age" :validate-event="is_Name">
-        <el-input type="number" v-model="form.private_price"></el-input>
+      <el-form-item label="自费：" prop="age" :validate-event="is_Name" style="width:33%;">
+        <el-input type="number" v-model="form.private_price" :disabled="true"></el-input>
       </el-form-item>
 
 
-      <el-form-item label="支付方式：">
-        <el-select v-model="form.pay_way" placeholder="请选择">
+      <el-form-item label="支付方式：" style="width:100%;">
+        <!-- <el-select v-model="form.pay_way" placeholder="请选择">
           <el-option
             v-for="(item,index) in payWays"
             :key="index"
             :label="item.label"
             :value="item.value">
           </el-option>
-        </el-select>
+        </el-select> -->
+        <el-radio-group v-model="form.pay_way">
+          <el-radio :label="index" v-for="(item,index) in payWays" :key="index">{{ item.label }}</el-radio>
+        </el-radio-group>
       </el-form-item>
 
 
       <el-form-item label="付款金额：" prop="id_card" :validate-event="is_Name">
-        <el-input type="number" v-model="form.pay_price"></el-input>
+        <el-input type="number" v-model="form.pay_price" :disabled="true"></el-input>
       </el-form-item>
 
 
@@ -42,17 +47,17 @@
 
       <el-form-item class="specialFormItem" label="折扣金额：">
         <div style="display:flex;">
-          <el-input v-model="form.discount_price"></el-input>
+          <el-input v-model="form.discount_price" :disabled="form.preferential_price != 0" @change="changeDiscountPrice"></el-input>
         </div>
       </el-form-item>
       <el-form-item class="specialFormItem" label="优惠金额：">
         <div style="display:flex;">
-          <el-input v-model="form.preferential_price"></el-input>
+          <el-input v-model="form.preferential_price" :disabled="form.discount_price != 0" @change="changePreferentialPrice"></el-input>
         </div>
       </el-form-item>
       <el-form-item label="实收金额：">
         <div style="display:flex;">
-          <el-input v-model="form.reality_price"></el-input>
+          <el-input v-model="form.reality_price" @change="realityPrice"></el-input>
         </div>
       </el-form-item>
       <el-form-item label="找回金额：">
@@ -82,7 +87,7 @@
       return {
         record_date:'',
         form: {
-          medical_insurance_price:'',
+          medical_insurance_price:0,
           private_price:'',
           pay_way:'',
           pay_price:'',
@@ -91,6 +96,7 @@
           preferential_price:'',
           reality_price:'',
           found_price:'',
+          total:0,
 
         },
         payWays: [
@@ -144,6 +150,9 @@
         this.total = total
         this.form.private_price = total
         this.form.pay_price = total
+        this.form.total = total + this.form.medical_insurance_price
+        this.form.discount_price = 0.0
+        this.form.preferential_price = 0.0
 
         this.visibility = true
 
@@ -167,6 +176,27 @@
         let form = {}
         form = this.form
         return form
+      },
+      realityPrice(val){
+        if(val < (this.form.total - this.form.discount_price - this.form.preferential_price)){
+          this.$message.error('实收金额不能小于收费金额')
+          return
+        }
+        this.form.found_price = parseInt(val) - parseInt(this.form.total) + parseInt(this.form.discount_price) + parseInt(this.form.preferential_price)
+      },
+      changeDiscountPrice(val){
+        if(val > this.form.total){
+          this.$message.error('折扣金额不能超过费用总额')
+          return
+        }
+        this.form.reality_price = parseInt(this.form.total) - parseInt(val) - parseInt(this.form.preferential_price)
+      },
+      changePreferentialPrice(val){
+        if(val > this.form.total){
+          this.$message.error('优惠金额不能超过费用总额')
+          return
+        }
+        this.form.reality_price = parseInt(this.form.total) - parseInt(val) - parseInt(this.form.discount_price)
       }
     },mounted() {
       var nowDate = new Date()
@@ -189,6 +219,14 @@
   }
 </script>
 
-<style scoped>
-
+<style lang="scss" scoped>
+.chargeDialog{
+  .el-form{
+    display: flex;
+    flex-wrap: wrap;
+  }
+  .el-form-item{
+    width:50%;
+  }
+}
 </style>

src/xt_pages/outpatientCharges/components/prescriptionTable.vue

@@ -61,15 +61,10 @@
         <template slot-scope="scope">{{ scope.row.project_name }}</template>
       </el-table-column>
       <el-table-column align="center" prop="statistical_classification" width="100" label="组">
-        <template slot-scope="scope">
-          {{getGroup(scope.row.statistical_classification)}}
-        </template>
+        <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">
-          <!--<el-input v-model="scope.row.single_dose" placeholder="" readonly></el-input>-->
-          {{scope.row.single_dose}}
-        </template>
+        <template slot-scope="scope">{{scope.row.single_dose}}</template>
       </el-table-column>
       <el-table-column align="center" prop="delivery_way" width="80" label="用法">
         <template slot-scope="scope">
@@ -121,7 +116,7 @@
 
     <div class="additionalBox">
       <div class="additionalOne" v-for="(item,index) in prescription.addition" :key="index">
-        <span>{{item.item_name}}</span>
+        <span :title="item.item_name">{{item.item_name}}</span>
         <el-input v-model="item.price" placeholder="" style="width:50px;" readonly></el-input>
         共
         <el-input v-model="item.count" placeholder="" style="width:50px;" readonly></el-input>

src/xt_pages/outpatientCharges/components/registerDialog.vue

@@ -1,14 +1,14 @@
 <template>
-  <el-dialog width="854px" :title="titles" :visible.sync="visibility" :close-on-click-modal="isClose"
+  <el-dialog width="854px" class="registerDialog" :title="titles" :visible.sync="visibility" :close-on-click-modal="isClose"
              :close-on-press-escape="isClose">
 
     <el-form :model="form"  :rules="rules"  ref="formValue"  label-width="100px">
       <el-form-item label="患者姓名："  prop="name" :validate-event="is_Name">
-         <el-input  v-model="form.name"></el-input>
+         <el-input  v-model="form.name" :disabled="true"></el-input>
       </el-form-item>
 
       <el-form-item label="性别：" prop="gender" :validate-event="is_Name">
-        <el-select v-model="form.gender" placeholder="请选择">
+        <el-select v-model="form.gender" placeholder="请选择" style="width:100%;">
           <el-option
             v-for="item in sex"
             :key="item.value"
@@ -24,7 +24,7 @@
 
 
       <el-form-item label="出生日期：" prop="birthday" :validate-event="is_Name">
-        <el-date-picker v-model="form.birthday" type="date" @change="getBirthday" placeholder="选择日期"></el-date-picker>
+        <el-date-picker v-model="form.birthday" type="date" @change="getBirthday" placeholder="选择日期" style="width:100%;"></el-date-picker>
       </el-form-item>
 
       <el-form-item label="手机号码：" prop="phone">
@@ -33,7 +33,7 @@
 
 
       <el-form-item label="医疗类别：">
-        <el-select v-model="form.medical_care" placeholder="请选择">
+        <el-select v-model="form.medical_care" placeholder="请选择" style="width:100%;">
           <el-option
             v-for="(item,index) in getDictionaryDataConfig('system','social_type')"
             :key="index"
@@ -45,7 +45,7 @@
 
 
       <el-form-item label="证件类型：">
-        <el-select v-model="form.certificates" placeholder="请选择">
+        <el-select v-model="form.certificates" placeholder="请选择"  style="width:100%;">
           <el-option
             v-for="item in certificates"
             :key="item.value"
@@ -61,7 +61,7 @@
 
 
       <el-form-item label="结算类型：">
-        <el-select v-model="form.settlement_value" placeholder="请选择">
+        <el-select v-model="form.settlement_value" placeholder="请选择" style="width:100%;">
           <el-option
             v-for="item in settlement"
             :key="item.value"
@@ -73,7 +73,7 @@
 
 
       <el-form-item label="社保类型：">
-        <el-select v-model="form.social_type" placeholder="请选择">
+        <el-select v-model="form.social_type" placeholder="请选择" style="width:100%;">
           <el-option
             v-for="item in medicalCare"
             :key="item.value"
@@ -89,7 +89,7 @@
       </el-form-item>
 
       <el-form-item label="挂号类型："  prop="register_type"  :validate-event="is_Name">
-        <el-select v-model="form.register_type"  placeholder="请选择">
+        <el-select v-model="form.register_type"  placeholder="请选择" style="width:100%;">
           <el-option
             v-for="item in register"
             :key="item.value"
@@ -108,7 +108,7 @@
 
     <span slot="footer" class="dialog-footer">
     <el-button  @click="cancel('formValue')">取 消</el-button>
-    <el-button  type="primary" @click="confirm('formValue')">保 存</el-button>
+    <el-button  type="primary" @click="confirm('formValue')">挂 号</el-button>
   </span>
   </el-dialog>
 
@@ -317,6 +317,14 @@
   }
 </script>
 
-<style scoped>
-
+<style lang="scss" scoped>
+.registerDialog{
+  .el-form{
+    display: flex;
+    flex-wrap: wrap;
+  }
+  .el-form-item{
+    width:50%;
+  }
+}
 </style>

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -5,21 +5,21 @@
     </div>
     <div class="app-container" style="display:flex;flex: 1;padding: 10px 20px 0px 20px;">
       <div class="mainLeft">
-        <div class="mainCell" style="justify-content: space-between;">
-          <p>未收费：<span style="color: red">{{cal_one}}</span>人</p>
-          <p>已收费：<span style="color: red">{{cal_two}}</span>人</p>
-          <p>已退费：<span style="color: red">{{cal_three}}</span>人</p>
-        </div>
+         <!-- <div class="mainCell" style="justify-content: space-between;font-size:14px;">
+          <p >未收费：<span style="color: red">{{cal_one}}</span>人</p>
+          <p>已收费：<span  style="color: red">{{cal_two}}</span>人</p>
+          <p>已退费：<span  style="color: red">{{cal_three}}</span>人</p>
+        </div> -->
         <div class="mainCell">
           <el-radio-group v-model="radio" @change="changeRadio">
-            <el-radio :label=1>未收费</el-radio>
+            <!-- <el-radio :label=1>未收费</el-radio>
             <el-radio :label=2>已收费</el-radio>
             <el-radio :label=3>已退费</el-radio>
+            <el-radio :label=4>全部</el-radio> -->
+            <el-radio :label=1>未收费<span style="color: red;margin-bottom:10px;display: inline-block;">{{cal_one}}</span>人</el-radio>
+            <el-radio :label=2>已收费<span style="color: red;margin-bottom:10px;display: inline-block;">{{cal_two}}</span>人</el-radio>
+            <el-radio :label=3>已退费<span style="color: red;margin-bottom:10px;display: inline-block;">{{cal_three}}</span>人</el-radio>
             <el-radio :label=4>全部</el-radio>
-            <!--<el-radio :label=1>未收费<span style="color: red;margin-bottom:10px;display: inline-block;">{{cal_one}}</span>人</el-radio>-->
-            <!--<el-radio :label=2>已收费<span style="color: red;margin-bottom:10px;display: inline-block;">{{cal_two}}</span>人</el-radio>-->
-            <!--<el-radio :label=3>已退费<span style="color: red;margin-bottom:10px;display: inline-block;">{{cal_three}}</span>人</el-radio>-->
-            <!--<el-radio :label=4>全部</el-radio>-->
 
           </el-radio-group>
         </div>
@@ -55,7 +55,7 @@
                      v-if="this.hisPatientInfo && this.hisPatientInfo.id == 0"
                      type="primary">挂号
           </el-button>
-          <el-button v-loading="loadingtwo" v-if="this.info.prescription_status == 1" size="small"
+          <el-button v-loading="loadingtwo" size="small"
                      @click="open(4)"
                      type="primary">收费
           </el-button>
@@ -214,7 +214,7 @@
                        :addtions_charge="addtions_charge"></additionalCharges>
 
     <register-dialog ref='register' v-on:confirm="confirm" v-on:cancel="cancel"></register-dialog>
-  <charge-dialog ref='charge' v-on:confirm="chargeConfirm" v-on:cancel="chargeCancel"></charge-dialog>
+    <charge-dialog ref='charge' v-on:confirm="chargeConfirm" v-on:cancel="chargeCancel"></charge-dialog>
     <el-dialog
       class="centerDialog"
       width="900px"
@@ -327,10 +327,12 @@
           if (response.data.state == 0) {
             this.$message.error(response.data.msg)
             this.loadingtwo = false
+            this.$refs.charge.hide()
             return false
           } else {
             this.state = '已收费'
             this.$message({message: '收费成功', type: 'success'})
+            this.$refs.charge.hide()
             this.loadingtwo = false
             this.cal_one = this.cal_one - 1
             this.cal_two = this.cal_two + 1
@@ -352,6 +354,7 @@
             this.$refs.register.hide()
             return false
           } else {
+            this.getPatientList()
             this.$message({message: '挂号成功', type: 'success'})
             this.$refs.register.hide()
             this.loadingone = false
@@ -362,6 +365,7 @@
 
 
       }, cancel() {
+        
         this.$refs.register.hide()
 
 
@@ -930,7 +934,7 @@
     height: 100%;
     display: flex;
     flex-direction: column;
-    margin-top: 20px;
+    padding-top: 20px;
 
   .el-radio {
     margin-right: 5px;

src/xt_pages/outpatientCharges/summaryDetail.vue

@@ -66,7 +66,7 @@
 
                       <div class="additionalBox">
                         <div class="additionalOne" v-for="(item,index) in additions" :key="index">
-                          <span>{{item.item_name}}</span>
+                          <span :title="item.item_name">{{item.item_name}}</span>
                           <el-input v-model="item.price" placeholder="" style="width:50px;" readonly></el-input>
                           共
                           <el-input v-model="item.count" placeholder="" style="width:50px;" readonly></el-input>
@@ -95,7 +95,7 @@
                         <li style="width:50%;">体重：{{patientInfo.weight?patientInfo.weight:''}}</li>
                         <li style="width:50%;">电话：{{patientInfo.phone}}</li>
                     </ul>
-                    <p class="centerRightTitle">收费信息</p>
+                    <p class="centerRightTitle" style="margin-top:10px;">收费信息</p>
                     <ul class="basicUl">
                         <li style="width:50%;">应收金额：{{order.medfee_sumamt }}元</li>
                         <li style="width:50%;">实收金额：{{order.reality_price}}元</li>
@@ -360,7 +360,7 @@ export default {
     }
     .centerRightTitle{
         color:#409EFF;
-        padding: 10px 0;
+        padding:0 0 10px 0;
     }
     .basicUl{
         border-top: 1px solid #e5e5e5;
@@ -377,6 +377,29 @@ export default {
             font-size: 14px;
         }
     }
+    .additionalBox{
+      margin-top: 20px;
+      display: flex;
+      flex-wrap: wrap;
+      .additionalOne{
+        margin-right:20px;
+        margin-bottom:10px;
+        display: flex;
+        align-items: center;
+        >span{
+          white-space: nowrap;
+          overflow: hidden;
+          text-overflow: ellipsis;
+          width:80px;
+          display: inline-block;
+          font-size: 14px;
+        }
+      }
+      .deleteIcon{
+        color:red;
+        margin-left:5px;
+      }
+    }
 }
 </style>
 

src/xt_pages/outpatientCharges/treatPrint.vue

@@ -82,7 +82,7 @@ export default {
       this.print_time = uParseTime(ptime, "{y}-{m}-{d} {h}:{i}");
 
       const style =
-        '@media print {.printTitle{font-size: 22px;text-align: center;font-weight: bold;}.infoMain{display: flex;flex-wrap: wrap;padding:0 10px;margin-top:10px;}.infoMain .infoP{width: 33%;line-height: 1px;}.chargeBox{border: 1px solid #000;}.chargeUl{display:flex;justify-content: space-between;text-align: center;}.chargeUl p{line-height: 1px;}.chargeP{line-height: 1px;padding-bottom:16px;}.moneyBox{display: flex;justify-content: space-between;padding: 0 10px;background: #eeeeee;-webkit-print-color-adjust:exact;-moz-print-color-adjust:exact;-ms-print-color-adjust:exact;print-color-adjust:exact;height: 40px;align-items: center;border:1px solid #000; border-top:none}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar p{width:150px;}}';
+        '@media print {.printTitle{font-size: 22px;text-align: center;font-weight: bold;}.infoMain{display: flex;flex-wrap: wrap;padding:0 10px;margin-top:10px;}.infoMain .infoP{width: 33%;}.chargeBox{border: 1px solid #000;}.chargeUl{display:flex;justify-content: space-between;text-align: center;}.chargeUl p{line-height: 1px;}.chargeP{line-height: 1px;padding-bottom:16px;}.moneyBox{display: flex;justify-content: space-between;padding: 0 10px;background: #eeeeee;-webkit-print-color-adjust:exact;-moz-print-color-adjust:exact;-ms-print-color-adjust:exact;print-color-adjust:exact;height: 40px;align-items: center;border:1px solid #000; border-top:none}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar div{width:150px;}}';
         printJS({
             printable: "prescription-print",
             type: "html",

src/xt_pages/outpatientCharges/treatTemplate/printOne.vue

@@ -2,15 +2,15 @@
     <div id='prescription-print' class="prescription-print">
         <div class="printTitle">{{orgname}}&nbsp;&nbsp; 血液透析中心医药费收据及收费项目清单</div>
         <div class="infoMain">
-            <p class="infoP">医院(药店)编号：</p>
-            <p class="infoP">名称：血液透析中心</p>
-            <p class="infoP">医生工号：</p>
-            <p class="infoP">门诊流水号：</p>
-            <p class="infoP">科别：{{list.p_info.departments?list.p_info.departments:""}}</p>
-            <p class="infoP">处方单据号：</p>
-            <p class="infoP">姓名：{{patient.name}}</p>
-            <p class="infoP">医疗账号：</p>
-            <p class="infoP">医疗类别：普通</p>
+            <div class="infoP">医院(药店)编号：</div>
+            <div class="infoP">名称：血液透析中心</div>
+            <div class="infoP">医生工号：</div>
+            <div class="infoP">门诊流水号：</div>
+            <div class="infoP">科别：{{list.p_info.departments?list.p_info.departments:""}}</div>
+            <div class="infoP">处方单据号：</div>
+            <div class="infoP">姓名：{{patient.name}}</div>
+            <div class="infoP">医疗账号：</div>
+            <div class="infoP">医疗类别：普通</div>
         </div>
         <div class="chargeBox">
             <div style="display:flex;justify-content: space-between;border-bottom:1px solid #000;">
@@ -49,7 +49,7 @@
                         <p style="width:50%;">{{list.order_info.psn_cash_pay}}</p>
                     </div>
                 </div>
-                <div style="width:80%;display:flex;height:600px;">
+                <div style="width:80%;display:flex;height:300px;">
                   
                     <div style="border-left:1px solid #000;border-right:1px solid #000;width:40%;text-align:center;">
                         <p v-for="(item,i) in prescription[0].advices" :key="i" class="chargeP">{{item.advice_name}}</p>
@@ -78,8 +78,8 @@
             <p>找赎金：</p>
         </div>
         <div class="actionBar">
-            <p>收费员：</p>
-            <p>日期：{{this.$route.query.record_date}}</p>
+            <div>收费员：</div>
+            <div>日期：{{this.$route.query.record_date}}</div>
         </div>
     </div>
 </template>
@@ -206,7 +206,7 @@ export default {
     line-height: 24px;
     padding:0 10px;
 }
-.actionBar p{
+.actionBar div{
     width:150px;
 }
 </style>

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -68,9 +68,6 @@
               placeholder="请输入内容"
             ></el-autocomplete>
           </el-form-item>
-          <el-form-item label="过敏病史: " prop="name" style="visibility: hidden;">
-            <el-input placeholder="" readonly></el-input>
-          </el-form-item>
         </el-form>
         <div class="tabsBox">
 
@@ -1492,7 +1489,8 @@
 
   .tabsBox {
     position: relative;
-    height: 76%;
+    // height: 76%;
+    flex: 1;
     overflow-y: auto;
     margin-bottom: 60px;
     margin-top: 4px;

src/xt_pages/outpatientDoctorStation/components/deskRecord.vue

@@ -50,19 +50,6 @@
       <el-form-item label="家庭住址: " prop="name">
         <el-input v-model="patientInfo.home_address" placeholder="" :disabled="true"></el-input>
       </el-form-item>
-      <el-form-item label="疾病类型: " prop="name">
-        <el-select v-model="delivery_way" style="width:100%;" placeholder="请选择">
-         <el-option
-            v-for="item in wayOptions"
-           :key="item.id"
-           :label="item.name"
-           :value="item.id"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="诊断: " prop="name">
-        <el-input v-model="patientInfo.health_care_no" placeholder=""></el-input>
-      </el-form-item>
       <el-form-item label="过敏史: " prop="name">
         <el-input v-model="patientInfo.home_address" placeholder=""></el-input>
       </el-form-item>
@@ -90,22 +77,39 @@
     </el-form>
     <div class="mainTitle">病历信息：</div>
     <el-form class="recordForm" :model="case_history" ref="form" label-width="80px">
-     
+     <el-form-item label="疾病类型: " prop="name" style="width:49%;">
+        <el-select v-model="case_history.sick" style="width:100%;" placeholder="请选择">
+          <el-option
+            v-for="(item,index) in sick"
+            :key="index"
+            :label="item.class_name"
+            :value="item.id">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="诊断: " prop="name" style="width:49%;">
+        <el-select style="width:100%;" v-model="case_history.diagnose" placeholder="">
+          <el-option
+            v-for="(item,index) in diagnoses"
+            :key="index"
+            :label="item.class_name"
+            :value="item.id">
+          </el-option>
+        </el-select>
+      </el-form-item>
 
-      <el-form-item label="发病日期: " prop="name">
+      <el-form-item label="发病日期: " prop="name" style="width:49%;">
         <el-date-picker
           style="width:100%;"
           v-model="start_time"
           type="date"
-          placeholder="选择日期">
+          placeholder="选择日期"
+           :picker-options="pickerOptions0">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="" prop="name">
+      <el-form-item label="" prop="name" style="width:49%;">
         <el-checkbox v-model="case_history.is_infect">是否传染</el-checkbox>
       </el-form-item>
-      <el-form-item label="" prop="name" style="visibility: hidden;">
-        <div></div>
-      </el-form-item>
       <el-form-item label="主诉:" style="width:49%;">
         <el-select @change="changeMainTemplate" v-model="value" style="width:100%;margin-bottom:10px;">
             <el-option
@@ -238,7 +242,7 @@
   import medicalRecord from './medicalRecord'
   import saveRecordTemplate from './saveRecordTemplate'
   import { getDictionaryDataConfig } from "@/utils/data";
-  import {  createCaseHistory } from '@/api/his/his'
+  import {  createCaseHistory,getInitData } from '@/api/his/his'
   import { getDataConfig } from "@/utils/data";
   import { getTemplateDetail,getMedicalTemplateList } from "@/api/project/project"
   export default {
@@ -270,6 +274,11 @@
         //   family_history:"",
 
         // },
+          pickerOptions0: {
+          disabledDate(time) {
+            return time.getTime() < Date.now() - 8.64e7;
+          }
+        },
         formValue:{
           temperature:"",
           blood_sugar:"",
@@ -303,8 +312,7 @@
         valueSix:'',
         valueSeven:'',
         diagnoses:[],
-        state1:"",
-        diagnose:""
+        sick:[],
       }
     },
     methods: {
@@ -376,7 +384,7 @@
 
 
       getTemplateDetail(id){
-          console.log("22222")
+         
           getTemplateDetail(id).then(response=>{
               if(response.data.state == 1){
                 var templatedetail =  response.data.data.templateDetail
@@ -390,8 +398,8 @@
                 this.case_history.diagnostic = templatedetail.diagnostic
                 this.case_history.doctor_advice = templatedetail.doctor_advice
                 this.case_history.remark = templatedetail.remark
-                this.sick = templatedetail.sick
-                this.diagnose = templatedetail.diagnose
+                this.case_history.sick = templatedetail.sick
+                this.case_history.diagnose = templatedetail.diagnose
               }
           })
         },
@@ -513,6 +521,7 @@
           } else {
             this.sick = response.data.data.sick
             this.diagnoses = response.data.data.diagnose
+          
           }
         })
 
@@ -520,6 +529,7 @@
     },
     created(){
        this.getlist()
+       this.getInitData()
        this.wayOptions = getDataConfig("patient", "reimbursement_ways");
        console.log("232322323",this)
        if(this.patientInfo.gender = 1){
@@ -527,7 +537,7 @@
        }else if(this.patientInfo.gender = 2){
           this.patientInfo.gender = '女'
         }
-     this.getInitData()
+    
     },
     watch:{
       detalid:function(val){
@@ -546,10 +556,17 @@
         deep: true
       },
       case_history:function(val){
-        console.log("val",val)
-        if(val.breathing == 0){
-           this.case_history.breathing = ''
+        console.log("南京人明",this.case_history)
+        if(this.case_history.breathing == 0){
+           this.case_history.breathing = ""
+        }
+        if(this.case_history.sick == 0){
+          this.case_history.sick = ""
+        }
+        if(this.case_history.diagnose == 0){
+           this.case_history.diagnose = ""
         }
+        
       }
     }
   }

src/xt_pages/outpatientDoctorStation/components/inquiriesDetail.vue

@@ -1,4 +1,5 @@
 <template>
+<div>
   <el-dialog
     title="详情"
     width="1000px"
@@ -6,10 +7,10 @@
     :before-close="_close"
     class="detailDialog"
   >
-    <!-- <div style="position: absolute;right:20px;z-index:99">
+    <div style="position: absolute;right:20px;z-index:99">
       <el-button v-if="activeName == 'first'" @click="open(1)" type="primary">打印</el-button>
       <el-button v-if="activeName == 'second'" @click="open(2)" type="primary">打印</el-button>
-    </div> -->
+    </div>
     <el-tabs v-model="activeName">
 
       <el-tab-pane label="处方详情" name="first">
@@ -33,11 +34,11 @@
         <div class="commonCell">
           <p style="color:#409EFF;">基本信息</p>
           <div class="detailMain">
-            <span style="width:260px;">处方号：{{order.prescription_number}}</span>
+            <span style="width:270px;">处方号：{{order.prescription_number}}</span>
             <span style="width:180px;">姓名：{{order.patient.name}}</span>
             <span style="width:240px;">证件号：{{order.patient.id_card_no}}</span>
             <span style="width:180px;">联系电话：{{order.patient.phone}}</span>
-            <span style="width:260px;">医生：{{order.doctor}}</span>
+            <span style="width:270px;">医生：{{order.doctor}}</span>
             <span style="width:180px;">科室：{{getDepartMent(order.departments)}}</span>
             <span style="width:240px;">创建时间： {{getTimes(order.ctime,"{y}-{m}-{d} {h}:{i}")}}</span>
             <!-- <span style="width:180px;">疾病名称：{{case_history.diagnostic}}</span>
@@ -102,7 +103,18 @@
       <el-button @click="hide">取 消</el-button>
       <!--<el-button type="primary" :loading="submitLoading" @click="hide">确定</el-button>-->
     </div>
+    <el-dialog
+      class="centerDialog detailDialog"
+      width="600px"
+      title="打印"
+      :visible.sync="innerVisible"
+      append-to-body>
+
+      <print v-if="activeName == 'first'" :paramsObj='paramsObj'></print>
+      <recordPrint v-if="activeName == 'second'" :patientid="patientid"></recordPrint>
+    </el-dialog>
   </el-dialog>
+</div>
 </template>
 
 
@@ -112,11 +124,13 @@
   import { getHisPrescriptionInfo } from '@/api/his/his'
   import NewPrescriptionTable from './newPrescriptionTable'
   import { uParseTime } from '@/utils/tools'
- import { getAllDoctorList } from "@/api/project/project"
-import moment from 'moment';
+  import { getAllDoctorList } from "@/api/project/project"
+  import moment from 'moment';
+  import print from '../print'
+  import recordPrint from '../recordPrint'
 
   export default {
-    components: { NewPrescriptionTable },
+    components: { NewPrescriptionTable,print,recordPrint },
     data() {
       return {
         visible: false,
@@ -147,7 +161,10 @@ import moment from 'moment';
         case_history:{},
         order:{},
         doctorList:[],
-        departmentList:[]
+        departmentList:[],
+        innerVisible:false,
+        paramsObj:{},
+        patientid:''
       }
     },
     methods: {
@@ -160,11 +177,22 @@ import moment from 'moment';
            var prescription_id = arr[0]
            var record_date = this.format(this.order.record_date)
            var ids = arr.toString()
-           this.$router.push("/outpatientDoctorStation/print?record="+record_date+"&prescription_id="+prescription_id+"&ids="+ids+"&patient_id="+this.patientInfo.id)
+
+           let obj = {
+             record:record_date,
+             prescription_id:prescription_id,
+             ids:ids,
+             patient_id:this.patientInfo.id
+           }
+           this.paramsObj = obj
+           this.innerVisible = true
+          //  this.$router.push("/outpatientDoctorStation/print?record="+record_date+"&prescription_id="+prescription_id+"&ids="+ids+"&patient_id="+this.patientInfo.id)
 
         }else if(index == 2){
-           var record_date = this.format(this.case_history.sick_date)
-          this.$router.push("/outpatientDoctorStation/recordPrint?record="+record_date+"&patient_id="+this.case_history.patient_id)
+          var record_date = this.format(this.case_history.sick_date)
+          this.patientid = this.patientInfo.id
+          this.innerVisible = true
+          // this.$router.push("/outpatientDoctorStation/recordPrint?record="+record_date+"&patient_id="+this.case_history.patient_id)
         }
       },
       getTimes(time,temp) {

src/xt_pages/outpatientDoctorStation/components/newPrescriptionTable.vue

@@ -61,12 +61,12 @@
       <el-table-column align="center" prop="project_name" label="名称">
         <template slot-scope="scope">{{ scope.row.project_name }}</template>
       </el-table-column>
-      <el-table-column align="center" prop="statistical_classification" width="50" label="组">
+      <el-table-column align="center" prop="statistical_classification" width="100" label="组">
         <template slot-scope="scope">
-          {{getGroup(scope.row.statistical_classification)}}
+          <div>{{getGroup(scope.row.statistical_classification)}}</div>
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="single_dose" width="130" :label="'单次\n用量'">
+      <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>
@@ -80,30 +80,26 @@
 
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="execution_frequency" width="130" label="频率">
+      <el-table-column align="center" prop="execution_frequency" width="100" label="频率">
         <template slot-scope="scope">
           <!--<el-input v-model="scope.row.execution_frequency" placeholder="" readonly></el-input>-->
           <div> {{scope.row.execution_frequency}}</div>
 
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="number_days" width="130" label="天数">
+      <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>
 
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="total" width="100" label="总量">
+      <el-table-column align="center" prop="total" width="80" label="总量">
         <template slot-scope="scope">
-          <div style="display:flex;">
-            <!--<el-input v-model="scope.row.total" style="width:50" placeholder="" readonly></el-input>-->
             <div> {{scope.row.total}}</div>
-
-          </div>
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="name" width="50" label="单价">
+      <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>

src/xt_pages/outpatientDoctorStation/components/recordTemplateDetail.vue

@@ -1,58 +1,44 @@
 <template>
     <el-dialog
-        title="病历模板详情"
-        width="1000px"
-        :visible.sync="visible"
-        :before-close="_close"
-        class="recordDialog"
-        append-to-body
+      title="病历模板详情"
+      width="1000px"
+      :visible.sync="visible"
+      :before-close="_close"
+      class="recordDialog"
+      append-to-body
     >
         <el-form class="recordForm" :model="form" ref="form" label-width="80px">
-            <el-form-item label="模板名称: " prop="name" style="width:100%;">
-                <el-input v-model="form.template_name" placeholder=""></el-input>
-            </el-form-item>
-            <el-form-item label="模板说明: " prop="name" style="width:100%;">
-                <el-input v-model="form.template_remark" placeholder=""></el-input>
-            </el-form-item>
-           <el-row :gutter = "20">
-        <el-col :span="24">
-          <el-form-item label="主诉:">
-              <el-select @change="changeMainTemplate" v-model="value" style="width:200px">
-                  <el-option
-                    v-for="(item, index) in tabledata"
-                    :label="item.title"
-                    :value="item.content"
-                    :key="index"
-                  ></el-option>
-              </el-select>
+          <el-form-item label="模板名称: " prop="name" style="width:100%;">
+            <el-input v-model="form.template_name" placeholder=""></el-input>
           </el-form-item>
-      </el-col>
-      <el-col :span="24">
-        <el-form-item  prop="name" style="width:100%;">
-          <el-input
-            type="textarea"
-            :rows="2"
-            placeholder="请输入内容"
-            v-model="form.chief_conplaint">
-          </el-input>
-        </el-form-item>
-      </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="24">
-           <el-form-item label="现病史:">
-              <el-select @change="changeMainTemplateOne" v-model="valueOne" style="width:200px">
-                  <el-option
-                    v-for="(item, index) in tabledataOne"
-                    :label="item.title"
-                    :value="item.content"
-                    :key="index"
-                  ></el-option>
-              </el-select>
+          <el-form-item label="模板说明: " prop="name" style="width:100%;">
+            <el-input v-model="form.template_remark" placeholder=""></el-input>
+          </el-form-item>
+          <el-form-item label="主诉:" class="width50">
+            <el-select @change="changeMainTemplate" v-model="value" style="width:100%;margin-bottom:10px;">
+              <el-option
+                v-for="(item, index) in tabledata"
+                :label="item.title"
+                :value="item.content"
+                :key="index"
+              ></el-option>
+            </el-select>
+            <el-input
+              type="textarea"
+              :rows="2"
+              placeholder="请输入内容"
+              v-model="form.chief_conplaint">
+            </el-input>
           </el-form-item>
-        </el-col>
-        <el-col :span="24">
-          <el-form-item  prop="name" style="width:100%;">
+          <el-form-item label="现病史:" class="width50">
+            <el-select @change="changeMainTemplateOne" v-model="valueOne" style="width:100%;margin-bottom:10px;">
+              <el-option
+                v-for="(item, index) in tabledataOne"
+                :label="item.title"
+                :value="item.content"
+                :key="index"
+              ></el-option>
+            </el-select>
             <el-input
               type="textarea"
               :rows="2"
@@ -60,138 +46,95 @@
               v-model="form.history_of_present_illness">
             </el-input>
           </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-         <el-col :span="24">
-           <el-form-item label="既往史:">
-            <el-select @change="changeMainTemplateTwo" v-model="valueTwo" style="width:200px">
-                  <el-option
-                    v-for="(item, index) in tabledataTwo"
-                    :label="item.title"
-                    :value="item.content"
-                    :key="index"
-                  ></el-option>
-             </el-select>
-            </el-form-item>
-         </el-col>
-         <el-col :span="24">
-            <el-form-item  prop="name" style="width:100%;">
-              <el-input
-                type="textarea"
-                :rows="2"
-                placeholder="请输入内容"
-                v-model="form.past_history">
-              </el-input>
-           </el-form-item>
-         </el-col>
-      </el-row>
-        <el-row :gutter="24">
-        <el-col :span="20">
-            <el-form-item label="个人史:">
-                <el-select @change="changeMainTemplateThree" v-model="valueThree" style="width:200px">
-                    <el-option
-                        v-for="(item, index) in tabledataThree"
-                        :label="item.title"
-                        :value="item.content"
-                        :key="index"
-                    ></el-option>
-                </el-select>
-                </el-form-item>
-        </el-col>
-        <el-col :span="20">
-            <el-form-item  prop="name" style="width:100%;">
+          <el-form-item label="既往史:" class="width50">
+            <el-select @change="changeMainTemplateTwo" v-model="valueTwo" style="width:100%;margin-bottom:10px;">
+              <el-option
+                v-for="(item, index) in tabledataTwo"
+                :label="item.title"
+                :value="item.content"
+                :key="index"
+              ></el-option>
+            </el-select>
             <el-input
-                type="textarea"
-                :rows="2"
-                placeholder="请输入内容"
-                v-model="form.personal_history">
+              type="textarea"
+              :rows="2"
+              placeholder="请输入内容"
+              v-model="form.past_history">
             </el-input>
-            </el-form-item>
-        </el-col>
-        </el-row>
-        <el-row :gutter="24">
-        <el-col :span="20">
-            <el-form-item  label="家族史:">
-                <el-select @change="changeMainTemplateFour" v-model="valueFour" style="width:200px">
-                    <el-option
-                        v-for="(item, index) in tabledataFour"
-                        :label="item.title"
-                        :value="item.content"
-                        :key="index"
-                    ></el-option>
-                </el-select>
-            </el-form-item>
-        </el-col>
-            <el-col :span="20">
-            <el-form-item prop="name" style="width:100%;">
-                <el-input
-                type="textarea"
-                :rows="2"
-                placeholder="请输入内容"
-                v-model="form.family_history">
-                </el-input>
-            </el-form-item>
-        </el-col>
-        </el-row>
-        <el-row :gutter="24">
-        <el-col :span="20">
-            <el-form-item label="诊断信息:">
-                <el-select @change="changeMainTemplateFive" v-model="valueFive" style="width:200px">
-                    <el-option
-                        v-for="(item, index) in tabledataFive"
-                        :label="item.title"
-                        :value="item.content"
-                        :key="index"
-                    ></el-option>
-                </el-select>
-            </el-form-item>
-        </el-col>
-        <el-col :span="20">
-            <el-form-item  prop="name" style="width:100%;">
+          </el-form-item>
+          <el-form-item label="个人史:" class="width50">
+            <el-select @change="changeMainTemplateThree" v-model="valueThree" style="width:100%;margin-bottom:10px;">
+              <el-option
+                v-for="(item, index) in tabledataThree"
+                :label="item.title"
+                :value="item.content"
+                :key="index"
+              ></el-option>
+            </el-select>
             <el-input
-                type="textarea"
-                :rows="2"
-                placeholder="请输入内容"
-                v-model="form.diagnostic">
+              type="textarea"
+              :rows="2"
+              placeholder="请输入内容"
+              v-model="form.personal_history">
             </el-input>
-        </el-form-item>
-        </el-col>
-        </el-row>
-
-        <el-row :gutter="24">
-        <el-col :span="20">
-            <el-form-item label="医嘱:">
-                <el-select @change="changeMainTemplateSix" v-model="valueSix" style="width:200px">
-                    <el-option
-                        v-for="(item, index) in tabledataSix"
-                        :label="item.title"
-                        :value="item.content"
-                        :key="index"
-                    ></el-option>
-                </el-select>
-            </el-form-item>
-        </el-col>
-        <el-col :span="20">
-            <el-form-item  prop="doctor_advice" style="width:100%;">
+          </el-form-item>
+          <el-form-item  label="家族史:" class="width50">
+            <el-select @change="changeMainTemplateFour" v-model="valueFour" style="width:100%;margin-bottom:10px;">
+              <el-option
+                v-for="(item, index) in tabledataFour"
+                :label="item.title"
+                :value="item.content"
+                :key="index"
+              ></el-option>
+            </el-select>
             <el-input
-                type="textarea"
-                :rows="2"
-                placeholder="请输入内容"
-                v-model="form.doctor_advice">
+            type="textarea"
+            :rows="2"
+            placeholder="请输入内容"
+            v-model="form.family_history">
+            </el-input>
+          </el-form-item>
+          <el-form-item label="诊断信息:" class="width50">
+            <el-select @change="changeMainTemplateFive" v-model="valueFive" style="width:100%;margin-bottom:10px;">
+              <el-option
+                v-for="(item, index) in tabledataFive"
+                :label="item.title"
+                :value="item.content"
+                :key="index"
+              ></el-option>
+            </el-select>
+            <el-input
+              type="textarea"
+              :rows="2"
+              placeholder="请输入内容"
+              v-model="form.diagnostic">
             </el-input>
-            </el-form-item>
-        </el-col>
-        </el-row>
+          </el-form-item>
+          <el-form-item label="医嘱:" class="width50">
+            <el-select @change="changeMainTemplateSix" v-model="valueSix" style="width:100%;margin-bottom:10px;">
+              <el-option
+                v-for="(item, index) in tabledataSix"
+                :label="item.title"
+                :value="item.content"
+                :key="index"
+              ></el-option>
+            </el-select>
+            <el-input
+              type="textarea"
+              :rows="2"
+              placeholder="请输入内容"
+              v-model="form.doctor_advice">
+            </el-input>
+          </el-form-item>
 
-            <el-form-item label ="备注"  prop="name" style="width:100%;">
+          <el-form-item label ="备注"  prop="name" class="width50">
             <el-input
-                type="textarea"
-                :rows="2"
-                placeholder="请输入内容"
-                v-model="form.remark">
+              type="textarea"
+              :rows="2"
+              placeholder="请输入内容"
+              v-model="form.remark">
             </el-input>
-            </el-form-item>
+          </el-form-item>
         </el-form>
         <div slot="footer" class="dialog-footer">
             <el-button @click="hide">取 消</el-button>
@@ -421,12 +364,15 @@ export default {
 
 <style lang="scss" scoped>
 .recordForm{
-    display: flex;
-    flex-wrap: wrap;
-    .el-form-item{
-        width:24%;
-        margin-right: 1%;
-    }
+  display: flex;
+  flex-wrap: wrap;
+  .el-form-item{
+    width:24%;
+    margin-right: 1%;
+  }
+  .width50{
+    width: 49%;
+  }
 }
 </style>
 

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -54,8 +54,8 @@
               <el-button size="small" ref="button_six"   @click="open(6)">治疗单</el-button>
               <el-button slot="reference" style="margin:0 10px;" type="primary" size="small">打印</el-button>
             </el-popover>
-            <!--<el-button size="small" ref="button_three" @click="open(4)" type="primary">选择模板</el-button>-->
-            <!--<el-button size="small" ref="button_four"  @click="open(5)" type="primary" :disabled='prescriptions && prescriptions[0].advices && prescriptions[0].project ? prescriptions[0].advices.length == 0 && prescriptions[0].project.length == 0 : false'>存模板</el-button>-->
+            <!-- <el-button size="small" ref="button_three" @click="open(4)" type="primary">选择模板</el-button>-->
+            <!--<el-button size="small" ref="button_four"  @click="open(5)" type="primary" :disabled='prescriptions && prescriptions[0].advices && prescriptions[0].project ? prescriptions[0].advices.length == 0 && prescriptions[0].project.length == 0 : false'>存模板</el-button> -->
           </div>
           <div class="mainCell fixedCell" style="float:right" v-if="titleType == '电子病历'">
             <el-button size="small" @click="opentwo(1)" type="primary">保存</el-button>
@@ -305,7 +305,8 @@
 
           }
         })
-      },getPatientInfo(val){
+      },
+      getPatientInfo(val){
         this.patientid = val.patients.id
         let params = {
           'record_date': this.record_date,
@@ -354,6 +355,15 @@
             if (this.case_history.sick_type <= 0) {
               this.case_history.sick_type = ''
             }
+
+             if (this.case_history.sick <= 0) {
+              this.case_history.sick= ''
+            }
+
+            if(this.case_history.diagnose <= 0){
+               this.case_history.diagnose = ''
+            }
+
             this.case_history.sick_date = uParseTime(this.case_history.sick_date, '{y}-{m}-{d}')
             if (this.case_history.is_infect == 1) {
               this.case_history.is_infect = true
@@ -497,13 +507,20 @@
                 this.hisPatientInfo = response.data.data.his_info
                 this.case_history = response.data.data.case_history
                 var case_history = response.data.data.case_history
-                console.log("case_history22222222",case_history)
-                if (case_history.breathing  == 0) {
-                  case_history.breathing = ""
-                }
+                console.log("切换患者查询病历",case_history)
+               
                 this.case_history = case_history
                 this.info = response.data.data.info
                 this.patientInfo.birth = uParseTime(this.patientInfo.birthday, '{y}-{m}-{d}')
+                 if (this.case_history.breathing  <= 0) {
+                    this.case_history.breathing = ""
+                }
+                if(this.case_history.sick <= 0){
+                  this.case_history.sick = ""
+                }
+                if(this.case_history.diagnose <= 0){
+                   this.case_history.diagnose = ""
+                }
                 if (this.case_history.temperature <= 0) {
                   this.case_history.temperature = ''
                 }
@@ -638,12 +655,20 @@
               this.case_history = response.data.data.case_history
               var case_history = response.data.data.case_history
               console.log("case_history22222222",case_history)
-              if (case_history.breathing  == 0) {
-                case_history.breathing = ""
-              }
+             
               this.case_history = case_history
               this.info = response.data.data.info
               this.patientInfo.birth = uParseTime(this.patientInfo.birthday, '{y}-{m}-{d}')
+              if (this.case_history.breathing  <= 0) {
+                  this.case_history.breathing = ""
+              }
+              if(this.case_history.sick <= 0){
+                  this.case_history.sick = ""
+              }
+              if(this.case_history.diagnose <= 0){
+                   this.case_history.diagnose = ""
+              }
+
               if (this.case_history.temperature <= 0) {
                 this.case_history.temperature = ''
               }
@@ -762,6 +787,7 @@
 
       },
       currentChange(currentRow, oldCurrentRow){
+       
         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)){
@@ -859,7 +885,7 @@
        // console.log("99999",this.selecting_schs)
       },
       handleClick(){
-
+       
       },
       savePrint(){
         var arr = []

src/xt_pages/outpatientDoctorStation/recordPrint.vue

@@ -50,7 +50,6 @@ export default {
       educationOptions:[],
       history:{},
       keyword:"",
-      patientid:''
     };
   },
   methods: {

src/xt_pages/outpatientDoctorStation/recordTemplate/printOne.vue

@@ -108,7 +108,8 @@ export default {
         return{
             educationOptions:[],
             departmentList:[],
-            orgname:''
+            orgname:'',
+            history:{}
         }                   
     },
     methods:{

src/xt_pages/outpatientDoctorStation/template/printOne.vue

@@ -13,7 +13,7 @@
           </div>
           <div class="infoMain">
               <div style="margin-bottom: 10px;">门诊号：{{hisPatient.number?hisPatient.number:""}}</div>
-              <div style="margin-bottom: 10px;">科室：{{getDepart(hisPatient.departments)?getDepart(hisPatient.departments):''}}</div>
+              <div style="margin-bottom: 10px;">科室：{{item.info?getDepart(item.info.departments):''}}</div>
               <div style="margin-bottom: 10px;">医保卡号：{{item.hisPatient.number?item.hisPatient.number:""}}</div>
               <div style="margin-bottom: 10px;">电话：{{item.patient.phone}}</div>
               <div>地址：{{item.patient.home_address}}</div>
@@ -23,11 +23,19 @@
               <div class="Rp">Rp:</div>
               <div class="drugsBox" v-for="(it,index) in item.advices" :key="index">
                   <div class="drugsOne">{{it.advice_name?it.advice_name:""}}&nbsp;&nbsp;{{it.single_dose}}{{it.single_dose_unit}}&nbsp;×&nbsp; {{it.prescribing_number}}{{it.prescribing_number_unit}}</div>
-                  <div style="margin-left:100px;"><span>用法：{{it.single_dose}}{{it.single_dose_unit}}</span>&nbsp;&nbsp;<span>{{it.execution_frequency}}</span>&nbsp;&nbsp;<span>{{it.advice_desc}}</span></div>
+                  <div style="margin-left:100px;"><span>用法：{{it.single_dose}}{{it.single_dose_unit}}</span>&nbsp;&nbsp;<span>{{it.execution_frequency}}&nbsp;{{it.delivery_way}}&nbsp;{{it.day}}天</span>&nbsp;&nbsp;<span>{{it.advice_desc}}</span></div>
               </div>
               <div class="drugsBox" v-for="(it,i) in item.additionalcharge" :key="i">
                 <div class="drugsOne">{{it.item_name?it.item_name:""}}:&nbsp;{{it.price}}元/{{it.count}}次</div>
                </div>
+               
+              <div class="drugsBox" v-for="(it,index) in item.project" :key="index">
+                  <div class="drugsOne">{{getProjectName(it.project_id)?getProjectName(it.project_id):""}}&nbsp;&nbsp;{{it.single_dose}}{{it.single_dose_unit}}&nbsp;×&nbsp; {{it.count}}{{unit}}</div>
+                  <div style="margin-left:100px;"><span>用法：{{it.single_dose}}{{it.single_dose_unit}}</span>&nbsp;&nbsp;<span>{{it.delivery_way}}</span>&nbsp;&nbsp;<span>{{it.advice_desc}}</span></div>
+              </div>
+              <div class="drugsBox" v-for="(it,i) in item.additionalcharge" :key="i">
+                <div class="drugsOne">{{it.project_id?it.project_id:""}}:&nbsp;{{it.price}}元/{{it.count}}次</div>
+               </div>
 
           </div>
           <div class="doctorBox">
@@ -75,8 +83,8 @@ export default {
         prescriptionInfo:[],
         hisPatient:{},
         department:[],
-        prescriptions:[]
-        
+        prescriptions:[],
+        projectList:[]
       }
     },
    methods:{
@@ -126,6 +134,9 @@ export default {
             var hisPatient = response.data.data.hisPatient
             console.log("hisPatient",hisPatient)
             this.hisPatient = hisPatient
+            var projectlist =  response.data.data.projectlist
+            console.log("所有项目列表",projectlist)
+            this.projectList = projectlist
           }
        })
      },
@@ -199,7 +210,16 @@ export default {
 
         return total + addtotal
       },
-
+      
+     getProjectName(id){
+        var project_name = ""
+        for(let i=0;i<this.projectList.length;i++){
+           if(id == this.projectList[i].id){
+               project_name = this.projectList[i].project_name
+           }
+        }
+        return project_name
+     },
 
    },
    created(){

src/xt_pages/outpatientDoctorStation/template/printTwo.vue

@@ -23,6 +23,8 @@
                 <div class="drugsOne">{{item.advice_name?item.advice_name:""}}&nbsp;&nbsp;{{item.single_dose}}{{item.single_dose_unit}}&nbsp;×&nbsp; {{item.prescribing_number}}{{item.prescribing_number_unit}}</div>
                 <div style="margin-left:100px;"><span>用法：{{item.single_dose}}{{item.single_dose_unit}}</span>&nbsp;&nbsp;<span>{{item.execution_frequency}}</span>&nbsp;&nbsp;<span>{{item.advice_desc}}</span></div>
             </div>
+
+            
         </div>
         <div class="doctorBox">
             <p>医师：{{getDoctor(advicePrint[0].advice_doctor)?getDoctor(advicePrint[0].advice_doctor):""}}</p>

src/xt_pages/outpatientDoctorStation/treatTemplate/printOne.vue

@@ -305,9 +305,8 @@ export default {
             this.prescriptions = advicePrint
             var projectlist =  response.data.data.projectlist
             console.log("所有项目列表",projectlist)
-            this.projectList = projectlist
-            console.log("hisPatient",hisPatient)
-            this.hisPatient = hisPatient
+            this.projectList = projectlist       
+            this.hisPatient = response.data.data.hisPatient
 
           }
        })

src/xt_pages/outpatientRegistration/registrationHistory.vue

@@ -102,10 +102,10 @@
                 </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.is_return == 1 && scope.row.record_date < startUnix" :disabled="true">已过号</el-button> 
+                      <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.is_return == 1 && scope.row.record_date >= startUnix" @click ="toReturnPatient(scope.row.id)">退号</el-button> 
-                      <el-button size="mini" type="primary" v-if="scope.row.is_return == 2" :disabled="true">已退号</el-button>
-                      <el-button size="mini" type="primary" v-if="scope.row.is_return == 3" >已就诊</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>
@@ -250,7 +250,7 @@ export default {
             ],
             start_time:moment().format("YYYY-MM-DD"),
             end_time:moment().format("YYYY-MM-DD"),
-            limit:20,
+            limit:10,
             page:1,
             total:0,
             departMent:[],
@@ -352,7 +352,8 @@ export default {
             startUnix:'',
 
             dialogVisible:false,
-            form:{}
+            form:{},
+            is_Name:false
         }
     },
     created(){
@@ -410,11 +411,11 @@ export default {
         },
        handleSizeChange(val) {
           this.limit = val
-          this.getList()
+          this.getlist()
        },
         handleCurrentChange(val) {
         this.page = val
-        this.getList()
+        this.getlist()
         },
         getlist(){
           var params = {
@@ -561,8 +562,8 @@ export default {
         let arr = this.medicalCare
         let str = ''
         arr.map(item => {
-          if(item.value == type)
-          str = item.label
+          if(item.id == type)
+          str = item.name
         })
         return str
       },

src/xt_pages/stock/Dialog/goodTypeDialog.vue

@@ -9,6 +9,14 @@
           </el-form-item>
         </el-col>
       </el-row>
+      <el-row>
+        <el-col>
+          <el-form-item label="耗材出库" prop="out_stock">
+             <el-radio v-model="out_stock" label="1">是</el-radio>
+             <el-radio v-model="out_stock" label="2">否</el-radio>
+          </el-form-item>     
+        </el-col>
+      </el-row>
       <el-row>
          <el-col >
           <el-form-item label="备注">
@@ -17,7 +25,7 @@
           </el-form-item>
         </el-col>
       </el-row>
-
+   
 
     </el-form>
 
@@ -48,7 +56,8 @@ export default {
         type_name: [
           { required: true, message: "请输入类型名称", trigger: "blur" }
         ]
-      }
+      },
+       out_stock: '1'
     };
   },
   props: {
@@ -87,6 +96,7 @@ export default {
       form["type_name"] = this.formValue.type_name;
       form["remark"] = this.formValue.remark;
       form["isCreated"] = this.isCreated;
+      form['out_stock'] = this.out_stock;
       return form;
     }
   },

src/xt_pages/stock/Dialog/manufacturerOrDealerDialog.vue

@@ -20,12 +20,12 @@
       </el-col>
 
       <el-col :span="8">
-        <el-form-item label="拼音" prop="pinyin">
+        <el-form-item label="拼音">
           <el-input  v-model="formValue.pinyin"></el-input>
         </el-form-item>
       </el-col>
       <el-col :span="8">
-        <el-form-item label="五笔" prop="wubi">
+        <el-form-item label="五笔">
           <el-input  v-model="formValue.wubi"></el-input>
         </el-form-item>
       </el-col>
@@ -119,11 +119,7 @@
           ],
           dealer_name: [
             {required: true, message: '请输入经销商名称', trigger: 'blur'},
-          ], pinyin: [
-            {required: true, message: '请输入拼音', trigger: 'blur'},
-          ], wubi: [
-            {required: true, message: '请输入五笔', trigger: 'blur'},
-          ],
+          ], 
 
         }
       }

src/xt_pages/stock/Dialog/stockInDialog.vue

@@ -10,7 +10,7 @@
     <el-row :gutter="20">
       <el-col :span="8">
         <el-table
-          :data="propForm.goods"
+          :data="propForm.goodType"
           ref="table"
           border
           highlight-current-row
@@ -24,7 +24,8 @@
             align="center"
             label="商品类型">
             <template slot-scope="scope">
-              <span>{{getGoodTypeName(scope.row)}}</span>
+              <!-- <span>{{getGoodTypeName(scope.row)}}</span> -->
+              <span>{{scope.row.type_name}}</span>
             </template>
           </el-table-column>
         </el-table>
@@ -102,7 +103,8 @@
         isClose: false,
         visibility: false,
         SelectedDatas: [],
-        table_current_index: -1
+        table_current_index: -1,
+        tableData:[],
       }
     },
     props: {
@@ -110,6 +112,10 @@
         type: Object
       }
     },
+    created(){
+      this.tableData = this.propForm.goodType
+      console.log("222233333",this.tableData)
+    },
     methods: {
       hide: function() {
         this.visibility = false
@@ -131,30 +137,27 @@
           }
         }
       },
-      goodTypeTableChange: function(currentRow, oldCurrentRow) {
-        let keyName = ''
-        for (var key in currentRow) {
-          if (key != 'index') {
-            keyName = key
-          }
-        }
-        this.goodInfoTableData = []
-        this.goodInfo = []
-        if (keyName.length > 0) {
-          this.currentGoodTypeId = parseInt(keyName)
-          this.goodInfo = currentRow[keyName]
-          this.goodInfoTableData = (currentRow[keyName])
+       goodTypeTableChange: function(currentRow, oldCurrentRow) {
+       
+        let keyName = ""
+        var arr = []
+        for(let i= 0;i<this.propForm.goods.length;i++){
+            for(var key in this.propForm.goods[i]){
+               if(key == currentRow.id){
+                  keyName = key
+                  arr.push(this.propForm.goods[i])
+               }
+            }
         }
-
-        for (let i = 0; i < this.goodInfoTableData.length; i++) {
-          if (this.goodInfoTableData[i].isSelected) {
-            this.$nextTick(function() {
-              this.$refs.multipleTable.toggleRowSelection(this.goodInfoTableData[i])
-            })
+        this.currentGoodTypeId = parseInt(keyName)
+        this.goodInfoTableData = arr[keyName]
+        for(let i=0;i<arr.length;i++){
+          for(var key in arr[i]){
+              this.goodInfo = arr[i][keyName]
+              this.goodInfoTableData = arr[i][keyName]
           }
-        }
-
-      },
+         }
+       },
       cancle: function(formName) {
         this.goodInfo = []
         this.goodInfoTableData = []
@@ -213,22 +216,24 @@
             return this.propForm.goodUnit[i].name
           }
         }
-      }, search: function() {
+      }, 
+     
+      search:function() {
         if (this.keywords.length <= 0) {
-          this.$message.error('搜索关键字不能为空')
-          return
+           console.log("0000000",this.propForm.goodType)
+           this.propForm.goodType = this.propForm.goodType
         }
         const searchArr = []
-        for (let i = 0; i < this.goodInfoTableData.length; i++) {
-          if (this.goodInfoTableData[i].specification_name.indexOf(this.keywords) != -1) {
-            searchArr.push(this.goodInfoTableData[i])
-          }
-        }
-        this.goodInfoTableData = []
-        for (let i = 0; i < searchArr.length; i++) {
-          this.goodInfoTableData.push(searchArr[i])
+        for(let i=0;i<this.propForm.goodType.length;i++){
+           if(this.propForm.goodType[i].type_name.indexOf(this.keywords)!=-1){
+              searchArr.push(this.propForm.goodType[i])
+           }
         }
-      }, changeGoodInfoTableData: function(val) {
+        console.log("searchArr",searchArr)
+        this.propForm.goodType = []
+        this.propForm.goodType = searchArr
+      },
+      changeGoodInfoTableData: function(val) {
       }, changeAllGoodInfoTableData: function(selection) {
 
         var goodInfos = this.propForm.goods[this.table_current_index][this.currentGoodTypeId]

src/xt_pages/stock/config/goodType.vue

@@ -313,9 +313,10 @@ export default {
           type_name: val.type_name,
           remark: val.remark,
           type_code: this.goodType.type_code,
-          id: this.goodType.editTypeId
+          id: this.goodType.editTypeId,
+          out_stock:val.out_stock,
         };
-
+      
         modifyGoodType(params).then(response => {
           if (response.data.state == 0) {
             this.$message.error(response.data.msg);
@@ -333,7 +334,9 @@ export default {
         });
       } else if (val.isCreated == 1) {
         //新增
+       
         createGoodType(val).then(response => {
+          
           if (response.data.state == 0) {
             this.$message.error(response.data.msg);
             return false;

src/xt_pages/stock/drugs/drugStockInOrderAdd.vue

@@ -390,7 +390,8 @@
         this.propForm.formValue = {}
         this.propForm.isCreated = 1
         this.isVisibility = true
-      }, comfirm: function(val) {
+      }, 
+      comfirm: function(val) {
 
         this.$refs.dialog.hide()
         if (val.selectedGoodInfo.length > 0) {
@@ -419,9 +420,11 @@
         }
 
         this.currentIndex = -1
-      }, cancle: function() {
+      }, 
+      cancle: function() {
         this.$refs.dialog.hide()
-      },  GetConfigInfo: function() {
+      },  
+      GetConfigInfo: function() {
         const loading = this.$loading({
           lock: true,
           text: 'Loading',

src/xt_pages/stock/stockInOrder.vue

@@ -124,8 +124,22 @@
           </template>
         </el-table-column>
 
-        <el-table-column label="操作" align="center">
+        <el-table-column label="操作" align="center" width="260px">
           <template slot-scope="scope">
+            <el-tooltip
+              class="item"
+              effect="dark"
+              content="详情"
+              placement="top"
+            >
+              <el-button
+                size="small"
+                type="warning"
+                icon="el-icon-document"
+                @click="handleSearch(scope.row.id)"
+              >
+              </el-button>
+            </el-tooltip>
             <el-tooltip
               class="item"
               effect="dark"
@@ -140,6 +154,7 @@
               >
               </el-button>
             </el-tooltip>
+
             <el-tooltip
               class="item"
               effect="dark"
@@ -170,10 +185,363 @@
       >
       </el-pagination>
     </div>
+
+
+
+    <el-dialog
+      title="详情"
+      :visible.sync="dialogVisible"
+      width="80%"
+     >
+      <span>
+        <div>
+          <el-row>
+           <span style="font-size: 18px;color: #606266">入库单详情</span>
+          </el-row>
+            <el-row style="float:left;">
+            <span style="color: #606266"
+              >入库单号: {{ WarehouseInfo.warehouse.warehousing_order }}</span
+            >
+          </el-row>
+        </div>
+         <div class="cell clearfix">
+          <span style="width: 300px;color: #606266;float:right">单据日期:{{ WarehouseInfo.warehouse.warehousing_time | parseTime("{y}-{m}-{d}")}} </span>
+          <span style="width: 300px;color: #606266;float:right">厂商:{{ getManufactuerName(WarehouseInfo.warehouse.manufacturer) }}</span>
+          <span style="width: 300px;color: #606266"
+            >经销商:{{ getDealerName(WarehouseInfo.warehouse.dealer) }} </span>
+       </div>
+        <div class="cell clearfix" style="margin-top: 10px">
+          <el-button size="small" icon="el-icon-edit" @click="editRecord"
+            >编辑</el-button
+          >
+          <el-button size="small" icon="el-icon-delete" @click="deleteRecord"
+            >删除</el-button
+          >
+
+      <el-row :gutter="12" style="margin-top: 10px">
+        <el-table
+          :data="WarehouseInfo.warehouseInfoDate"
+          :class="signAndWeighBoxPatients"
+          style="width: 100%"
+          border
+          :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }"
+        >
+          <el-table-column min-width="35" align="center">
+            <template slot="header" slot-scope="scope">
+              <span>商品类型</span>
+            </template>
+
+            <template slot-scope="scope">
+              <span v-if="scope.row.good_type_id != 0">{{
+                getTypeName(scope.row.good_type_id)
+              }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column min-width="35" align="center">
+            <template slot="header" slot-scope="scope">
+              <span>规格名称</span>
+            </template>
+            <template slot-scope="scope">
+              <span v-if="scope.row.good_id != 0">{{
+                getSpecificationName(scope.row.good_id)
+              }}</span>
+            </template>
+          </el-table-column>
+
+          <el-table-column min-width="23" align="center">
+            <template slot="header" slot-scope="scope">
+              <span>单价</span>
+            </template>
+            <template slot-scope="scope">
+              <span>{{ scope.row.price }}</span>
+            </template>
+          </el-table-column>
+
+          <el-table-column min-width="23" align="center">
+            <template slot="header" slot-scope="scope">
+              <span>入库数量</span>
+            </template>
+            <template slot-scope="scope">
+              <span>{{ scope.row.warehousing_count }}</span>
+            </template>
+          </el-table-column>
+
+          <el-table-column label="总价" min-width="20" align="center">
+            <template slot-scope="scope">
+              {{ calculate(scope.row.price * scope.row.warehousing_count) }}
+            </template>
+          </el-table-column>
+
+          <el-table-column align="center" min-width="25">
+            <template slot="header" slot-scope="scope">
+              <span>批号</span>
+            </template>
+            <template slot-scope="scope">
+              <span>{{ scope.row.number }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="生产日期" min-width="40" align="center">
+            <template v-if="scope.row.product_date != 0" slot-scope="scope">
+              {{ scope.row.product_date }}
+            </template>
+          </el-table-column>
+          <el-table-column label="有效日期" min-width="40" align="center">
+            <template v-if="scope.row.expiry_date != 0" slot-scope="scope">
+              {{ scope.row.expiry_date  }}
+            </template>
+          </el-table-column>
+          <el-table-column label="备注" min-width="20" align="center">
+            <template slot-scope="scope">
+              <el-popover placement="top-start" width="250" trigger="hover">
+                <div>{{ scope.row.remark }}</div>
+                <span slot="reference" v-if="scope.row.remark.length > 20">{{
+                  scope.row.remark.substr(0, 20) + "..."
+                }}</span>
+                <span slot="reference" v-else>{{ scope.row.remark }}</span>
+              </el-popover>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-row>
+      </div>
+
+      </span>
+      <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>
+
+
+    <el-dialog
+      title="新增"
+      :visible.sync="editDialogVisible"
+      width="80%"
+    >
+      <span>
+       
+        <div style="margin-bottom:10px">
+          <label class="title"><span class="name">入库时间</span> : </label>
+          <el-date-picker size="small" v-model="warehousing_time" prefix-icon="el-icon-date" :editable="false"
+                          style="width: 196px;" type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
+                          value-format="yyyy-MM-dd"></el-date-picker>
+          <label class="title" style="margin-left:10px;"><span class="name">经 销 商</span> : </label>
+          <el-select size="small" v-model="form.dealer" clearable placeholder="请选择经销商" @change="changeDealer">
+            <el-option
+              v-for="(option, index) in dealer"
+              :key="index"
+              :label="option.dealer_name"
+              :value="option.id">
+            </el-option>
+          </el-select>
+          <label class="title" style="margin-left:10px;"><span class="name">厂商</span> : </label>
+
+          <el-select size="small" v-model="form.manufacturer" clearable placeholder="请选择厂商" @change="changeManufacturer">
+            <el-option
+              v-for="(option, index) in manufacturer"
+              :key="index"
+              :label="option.manufacturer_name"
+              :value="option.id">
+            </el-option>
+          </el-select>
+        </div>
+
+        <el-form :rules="tableRules" :model="recordInfo" ref="tableForm">
+        <el-table
+          id="oictable"
+          :data="recordInfo.recordData"
+          :class="signAndWeighBoxPatients"
+          style="width: 100%"
+          border
+          max-height="450"
+          :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }"
+        >
+          <el-table-column align="center" width="200">
+            <template slot="header" slot-scope="scope">
+              <span>商品类型<span style="color: red">*</span></span>
+            </template>
+
+            <template slot-scope="scope">
+              <el-form-item style="padding-top: 15px">
+                <el-input
+                  placeholder="请输入商品类型"
+                  v-model="scope.row.good_type_id"
+                  :value="typeName(scope.row.good_type_id)"
+                  @focus="showDialog(scope.$index, scope.row)"
+                ></el-input>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <el-table-column align="center" width="200">
+            <template slot="header" slot-scope="scope">
+              <span>规格名称<span style="color: red">*</span></span>
+            </template>
+            <template slot-scope="scope">
+              <el-form-item style="padding-top: 15px">
+                <el-input
+                  placeholder="请输入规格名称"
+                  v-model="scope.row.good_id"
+                  :value="specificationName(scope.row.good_id)"
+                  @focus="showDialog(scope.$index, scope.row)"
+                ></el-input>
+              </el-form-item>
+            </template>
+          </el-table-column>
+
+          <el-table-column align="center" width="150">
+            <template slot="header" slot-scope="scope">
+              <span>单价<span style="color: red">*</span></span>
+            </template>
+            <template slot-scope="scope">
+              <!--<el-input type="number" v-model="scope.row.price"  @blur="handleBlur(scope.$index, scope.row)"></el-input>-->
+              <el-form-item
+                :prop="'recordData.' + scope.$index + '.price'"
+                :rules="tableRules.price"
+                style="padding-top: 17px"
+              >
+                <el-input
+                  placeholder="请输入单价"
+                  type="number"
+                  v-model="scope.row.price"
+                ></el-input>
+              </el-form-item>
+            </template>
+          </el-table-column>
+
+          <el-table-column align="center" width="180">
+            <template slot="header" slot-scope="scope">
+              <span>入库数量<span style="color: red">*</span></span>
+            </template>
+            <template slot-scope="scope">
+              <!--{{scope.row.warehousing_count}}-->
+              <!--<el-input type="number" v-model="scope.row.warehousing_count"   @blur="handleBlur(scope.$index, scope.row)"></el-input>-->
+
+              <el-form-item
+                :prop="'recordData.' + scope.$index + '.warehousing_count'"
+                :rules="tableRules.warehousing_count"
+                style="padding-top: 17px"
+              >
+                <el-input
+                  placeholder="请输入入库数量"
+                  type="number"
+                  v-model="scope.row.warehousing_count"
+                ></el-input>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <el-table-column label="总价" align="center" width="150">
+            <template slot-scope="scope">
+              {{ calculate(scope.row.price * scope.row.warehousing_count) }}
+            </template>
+          </el-table-column>
+
+          <el-table-column align="center" width="150">
+            <template slot="header" slot-scope="scope">
+              <span>批号</span>
+            </template>
+            <template slot-scope="scope">
+              <el-form-item style="padding-top: 15px">
+                <el-input
+                  placeholder="请输入批号"
+                  v-model="scope.row.number"
+                ></el-input>
+              </el-form-item>
+            </template>
+          </el-table-column>
+
+          <el-table-column label="生产日期" width="250" align="center">
+            <template slot-scope="scope">
+            
+              <el-date-picker
+                prefix-icon="el-icon-date"
+                style="width: 145px"
+                v-model="scope.row.product_date"
+                type="date"
+                placeholder="选择日期时间"
+                format="yyyy-MM-dd"
+                value-format="yyyy-MM-dd"
+              ></el-date-picker>
+            </template>
+          </el-table-column>
+          <el-table-column label="有效日期" width="250" align="center">
+            <template slot-scope="scope">
+             
+              <el-date-picker
+                prefix-icon="el-icon-date"
+                style="width: 145px"
+                v-model="scope.row.expiry_date"
+                type="date"
+                placeholder="选择日期时间"
+                format="yyyy-MM-dd"
+                value-format="yyyy-MM-dd"
+              ></el-date-picker>
+            </template>
+          </el-table-column>
+          <el-table-column label="备注" width="150" align="center">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.remark"></el-input>
+            </template>
+          </el-table-column>
+
+          <el-table-column
+            label="操作"
+            fixed="right"
+            align="center"
+            width="150"
+          >
+            <template slot-scope="scope">
+              <el-tooltip
+                class="item"
+                effect="dark"
+                content="新增"
+                placement="top"
+              >
+                <el-button
+                  size="mini"
+                  type="primary"
+                  icon="el-icon-circle-plus-outline"
+                  @click="handleEditTwo(scope.$index, scope.row)"
+                >
+                </el-button>
+              </el-tooltip>
+              <el-tooltip
+                class="item"
+                effect="dark"
+                content="删除"
+                placement="top"
+              >
+                <el-button
+                  size="mini"
+                  type="danger"
+                  icon="el-icon-delete"
+                  @click="DeleteWarehouseInfoItem(scope.$index, scope.row)"
+                >
+                </el-button>
+              </el-tooltip>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-form>
+      </span>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="editDialogVisible = false">取 消</el-button>
+        <el-button type="primary" @click="submit()">保 存</el-button>
+      </span>
+    </el-dialog>
+
+
+     <stock-in-dialog
+        ref="dialog"
+        :propForm="propForm"
+        :visibility="isVisibility"
+        v-on:dialog-comfirm="comfirm"
+        v-on:dialog-cancle="cancle">
+    </stock-in-dialog>
   </div>
 </template>
 
 <script>
+import stockInDialog from "./Dialog/stockInDialog";
 import { uParseTime } from "@/utils/tools";
 import { fetchAllAdminUsers, fetchAllDoctorAndNurse } from "@/api/doctor";
 import {
@@ -182,43 +550,19 @@ import {
   GetAllGoodInfo,
   GetAllGoodType,
   getWarehouseInfoList,
-  getWarehouseList
+  getWarehouseList,
+  DeleteWarehouseInfoItem,
+  GetAllGoodInfoByID,
+  EditWarehouse
 } from "@/api/stock";
+
+import { GetAllDrugInfoByID,postDrugWarehouse} from "@/api/drug/drug_stock";
 import BreadCrumb from "../components/bread-crumb";
 
 export default {
   name: "stockIn",
-  components: { BreadCrumb },
+  components: { BreadCrumb, stockInDialog },
   created() {
-    // var nowDate = new Date();
-    //
-    // var year = new Date().getFullYear()
-    // var month = new Date().getMonth() + 1
-    // var day = nowDate.getDate()
-    // if (parseInt(month) < 10) {
-    //   month = '0' + month
-    // }
-    // if (parseInt(day) < 10) {
-    //   day = '0' + day
-    // }
-    // const endTime = year + '-' + month + '-' + day
-    // this.end_time = endTime
-    //
-    //
-    // var year = new Date().getFullYear()
-    // var month = new Date().getMonth()
-    // var day = new Date().getDate()
-    //
-    // day.setMonth(day.getMonth() - 3);
-    //
-    // if (parseInt(month) < 10) {
-    //   month = '0' + month
-    // }
-    // if (parseInt(day) < 10) {
-    //   day = '0' + day
-    // }
-    // const startTime = year + '-' + month + '-' + day
-    // this.start_time = startTime
 
     var nowDate = new Date();
     var nowYear = nowDate.getFullYear();
@@ -231,21 +575,38 @@ export default {
       "-" +
       (nowDay < 10 ? "0" + nowDay : nowDay);
     nowDate.setMonth(nowDate.getMonth() - 1);
-    nowYear = nowDate.getFullYear();
-    nowMonth = nowDate.getMonth() + 1;
-    nowDay = nowDate.getDate();
+  
     this.start_time =
       nowYear +
       "-" +
       (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
       "-" +
       (nowDay < 10 ? "0" + nowDay : nowDay);
+   
+
+      // this.warehousing_time =
+      //   nowYear +
+      //   '-' +
+      //   (nowMonth < 10 ? '0' + nowMonth : nowMonth) +
+      //   '-' +
+      //   (nowDay < 10 ? '0' + nowDay : nowDay)
 
+    
     this.GetWarehouse();
     this.GetConfigInfo();
     this.fetchAllAdminUsers();
+    this.GetAllGoodType()
+    this.GetAllGoodInfo()
   },
   data() {
+
+    var checkGoodId = (rule, value, callback) => {
+      setTimeout(() => {
+        if (value == "" || value == 0) {
+          return callback(new Error("规格名称不能为空"));
+        }
+      }, 2000);
+    };
     return {
       crumbs: [
         { path: false, name: "库存管理" },
@@ -277,10 +638,59 @@ export default {
 
       WarehouseInfo: {
         loading: false,
-        warehouseInfoDate: []
+        warehouseInfoDate: [],
+        warehouse: {}
+      },
+      startTime: "",
+      dialogVisible:false,
+      editDialogVisible:false,
+
+      recordInfo: {
+        recordData: [],
+        stock_in_code: "",
+        current_index: ""
+      },
+
+      tableRules: {
+        price: [{ required: true, message: "单价不能为空", trigger: "blur" }],
+        warehousing_count: [
+          { required: true, message: "数量不能为空", trigge: "blur" }
+        ],
+
+        good_id: [{ validator: checkGoodId, trigger: "blur" }]
+      },
+
+      form: {
+        manufacturer:0,
+        dealer:0
+      }, 
+      warehousing_time: '',
+     warehouse:{},
+      propForm: {
+        goods: [],
+        goodType: [],
+        goodInfo: [],
+        goodUnit: [],
+        title: '入库',
+        formValue: {
+        good_type_id: '',
+        good_id: '',
+        number: '',
+        product_date: '',
+        expiry_date: '',
+        warehousing_count: '',
+        price: '',
+        remark: '',
+        dealer: '',
+        manufacturer: ''
+      },
+        isCreated: 1,
+        isVisibility: false,
+        drug_id:1
       },
-      startTime: ""
     };
+
+  
   },
   methods: {
     search: function() {
@@ -349,9 +759,7 @@ export default {
         } else {
           this.WarehouseInfo.loading = false;
           for (let i = 0; i < response.data.data.info.length; i++) {
-            this.WarehouseInfo.warehouseInfoDate.push(
-              response.data.data.info[i]
-            );
+            this.WarehouseInfo.warehouseInfoDate.push(response.data.data.info[i]);
           }
         }
       });
@@ -425,6 +833,7 @@ export default {
           this.$message.error(response.data.msg);
           return false;
         } else {
+          
           for (let i = 0; i < response.data.data.goodType.length; i++) {
             this.goodType.push(response.data.data.goodType[i]);
           }
@@ -437,7 +846,9 @@ export default {
           this.$message.error(response.data.msg);
           return false;
         } else {
+          
           for (let i = 0; i < response.data.data.goodInfo.length; i++) {
+
             this.goodInfo.push(response.data.data.goodInfo[i]);
           }
         }
@@ -502,6 +913,13 @@ export default {
       // 把时间日期转成时间戳
       return new Date(time).getTime() / 1000;
     },
+    getTime(val, temp) {
+      if (val != 0) {
+        return uParseTime(val, temp);
+      } else {
+        return "";
+      }
+    },
     calculate: function(val) {
       return Math.round(parseFloat(val) * 100) / 100;
     },
@@ -513,6 +931,9 @@ export default {
         } else {
           this.manufacturer = response.data.data.manufacturer;
           this.dealer = response.data.data.dealer;
+          this.manufacturer.splice(0, 0, { id: 0, manufacturer_name: "全部" });
+          this.dealer.splice(0, 0, { id: 0, dealer_name: "全部" });
+         
         }
       });
     },
@@ -544,7 +965,7 @@ export default {
       const params = {
         ids: idStr
       };
-
+     
       this.$confirm("确认删除入库单记录?", "删除入库单记录", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
@@ -626,7 +1047,307 @@ export default {
           });
         })
         .catch(() => {});
-    }
+    },
+
+    handleSearch(id){
+      this.GetOrderDetail(id)
+      this.drug_id = id
+      this.dialogVisible = true
+    },
+
+    GetOrderDetail: function(id) {
+      const params = {
+        id: id
+      };
+      getWarehouseInfoList(params).then(response => {
+        if (response.data.state == 0) {
+          this.$message.error(response.data.msg);
+          return false;
+        } else {
+         
+          for (let i = 0; i < response.data.data.info.length; i++) {
+            this.WarehouseInfo.warehouseInfoDate.push(response.data.data.info[i]);
+            response.data.data.info[i].product_date = this.getTime(
+              response.data.data.info[i].product_date,
+              "{y}-{m}-{d}"
+            );
+            response.data.data.info[i].expiry_date = this.getTime(
+              response.data.data.info[i].expiry_date,
+              "{y}-{m}-{d}"
+            );
+            
+           response.data.data.info[i].price = response.data.data.info[i].price.toString();
+           response.data.data.info[i].warehousing_count = response.data.data.info[i].warehousing_count.toString();
+
+            this.recordInfo.recordData.push(response.data.data.info[i]);
+
+          
+          }
+           this.warehouse = response.data.data.warehousing;
+           this.warehousing_time = this.getTime(this.warehouse.warehousing_time,"{y}-{m}-{d}");
+           console.log("单据日期",this.warehousing_time)
+          this.WarehouseInfo.warehouse = response.data.data.warehousing;
+         
+        }
+      });
+    },
+
+     editRecord: function() {
+     
+     
+      this.editDialogVisible = true
+    },
+
+     deleteRecord: function() {
+      const ids = [];
+      ids.push(this.WarehouseInfo.warehouse.id);
+      const idStr = ids.join(",");
+
+      const params = {
+        ids: idStr
+      };
+
+      this.$confirm("确认删除入库单记录?", "删除入库单记录", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          deleteWarehouseInfo(params).then(response => {
+            if (response.data.state == 0) {
+              this.$message.error(response.data.msg);
+              return false;
+            } else {
+              this.$notify({
+                title: "成功",
+                message: "删除成功",
+                type: "success",
+                duration: 2000
+              });
+
+              this.$router.back(-1);
+            }
+          });
+        })
+        .catch(() => {});
+    },
+
+     typeName: function(good_type_id) {
+     
+      let name = "";
+      for (let i = 0; i < this.goodType.length; i++) {
+        if (this.goodType[i].id == good_type_id) {
+          name = this.goodType[i].type_name;
+        }
+      }
+      return name;
+    },
+
+    showDialog(index, row) {
+      this.currentIndex = index;
+      const params = {
+        manufacturer_id: this.form.manufacturer,
+        dealer_id: this.form.dealer
+      };
+      this.propForm.goods = []
+
+      GetAllGoodInfoByID(params).then(response => {
+        if (response.data.state == 0) {
+          this.$message.error(response.data.msg);
+          return false;
+        } else {
+          if (response.data.data.goodInfo.length <= 0) {
+            this.$message.error("该厂商或经销商没有物品信息");
+            return;
+          }
+          this.$refs.dialog.show();
+          for (let i = 0; i < response.data.data.goodInfo.length; i++) {
+            this.propForm.goodType.push(
+              response.data.data.goodInfo[i].type
+            );
+          }
+          const obj = {};
+          this.propForm.goodType = this.propForm.goodType.reduce(
+            (cur, next) => {
+              obj[next.id] ? "" : (obj[next.id] = true && cur.push(next));
+              return cur;
+            },
+            []
+          ); // 设置cur默认类型为数组，并且初始值为空的数组
+        }
+
+        for (let i = 0; i < this.propForm.goodType.length; i++) {
+          let goodInfo = [];
+          let goodObj = {};
+
+          for (let a = 0; a < response.data.data.goodInfo.length; a++) {
+            var respObj = response.data.data.goodInfo[a];
+            respObj["isSelected"] = false;
+            if (respObj.type.id == this.propForm.goodType[i].id) {
+              goodInfo.push(respObj);
+            }
+          }
+          const obj = {};
+          goodInfo = goodInfo.reduce((cur, next) => {
+            obj[next.id] ? "" : (obj[next.id] = true && cur.push(next));
+            return cur;
+          }, []); // 设置cur默认类型为数组，并且初始值为空的数组
+
+          this.$set(goodObj, this.propForm.goodType[i].id, goodInfo);
+          this.propForm.goods.push(goodObj);
+        }
+      });
+    },
+
+    specificationName: function(drug_id) {
+     
+        let name = "";
+        for (let i = 0; i < this.goodInfo.length; i++) {
+          if (this.goodInfo[i].id == drug_id) {
+            name = this.goodInfo[i].specification_name;
+          }
+        }
+        return name;
+    }, 
+
+     submit() {
+      this.$refs["tableForm"].validate(valid => {
+        if (valid) {
+          const array = this.recordInfo.recordData;
+          console.log('array',array)
+          for (let i = 0; i < array.length; i++) {
+            if (array[i].good_type_id == 0) {
+              this.$message.error("商品类型不能为空");
+              return;
+            }
+            if (array[i].good_id == 0) {
+              this.$message.error("规格名称不能为空");
+              return;
+            }
+          }
+
+          const params = {
+            stockIn: this.recordInfo.recordData
+          };
+          EditWarehouse(
+            params,
+            this.warehousing_time,
+            this.drug_id,
+            this.type,
+            this.form.manufacturer,
+            this.form.dealer
+          ).then(response => {
+            if (response.data.state == 0) {
+              this.$message.error(response.data.msg);
+              return false;
+            } else {
+              this.$message.success("入库成功");
+              this.dialogVisible = false
+              this.editDialogVisible = false
+             
+            }
+          });
+        } else {
+          return false;
+        }
+      });
+    },
+
+      changeManufacturer(val) {
+
+      }, 
+      changeDealer(val) {
+
+      },
+
+     DeleteWarehouseInfoItem: function(index, row) {
+      if (row.id == 0) {
+        this.recordInfo.recordData.splice(index, 1);
+      } else {
+        const params = {
+          id: row.id
+        };
+        this.$confirm("确认删除该入库商品信息记录?", "删除入库商品信息记录", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        })
+          .then(() => {
+            DeleteWarehouseInfoItem(params).then(response => {
+              if (response.data.state == 0) {
+                this.$message.error(response.data.msg);
+                return false;
+              } else {
+                this.$message.success("删除成功");
+
+                this.recordInfo.recordData.splice(index, 1);
+              }
+            });
+          })
+          .catch(() => {});
+      }
+    },
+    handleEditTwo: function(index, row) {
+      const tempObj = {};
+      tempObj["id"] = 0;
+      tempObj["good_type_id"] = 0;
+      tempObj["good_id"] = 0;
+      tempObj["number"] = "";
+      tempObj["product_date"] = "";
+      tempObj["expiry_date"] = "";
+      tempObj["warehousing_count"] = "";
+      tempObj["price"] = "";
+      tempObj["remark"] = "";
+      tempObj["dealer"] = "";
+      tempObj["manufacturer"] = "";
+      this.recordInfo.recordData.push(tempObj);
+    },
+
+     comfirm: function(val) {
+      this.$refs.dialog.hide();
+      this.propForm.goodType = [];
+      this.propForm.goods = [];
+
+      if (val.selectedGoodInfo.length > 0) {
+        for (let i = val.selectedGoodInfo.length - 1; ; i--) {
+          if (i == 0) {
+            this.recordInfo.recordData[this.currentIndex].good_type_id =
+              val.selectedGoodInfo[i].good_type_id;
+            this.recordInfo.recordData[this.currentIndex].good_id =
+              val.selectedGoodInfo[i].id;
+            this.recordInfo.recordData[
+              this.currentIndex
+            ].price = val.selectedGoodInfo[i].buy_price.toString();
+          } else {
+            const tempForm = {};
+            tempForm["id"] = 0;
+            tempForm["good_type_id"] = val.selectedGoodInfo[i].good_type_id;
+            tempForm["good_id"] = val.selectedGoodInfo[i].id;
+            tempForm["number"] = "";
+            tempForm["product_date"] = "";
+            tempForm["expiry_date"] = "";
+            tempForm["warehousing_count"] = "";
+            tempForm["price"] = val.selectedGoodInfo[i].buy_price.toString();
+            tempForm["remark"] = "";
+            tempForm["dealer"] = "";
+            tempForm["manufacturer"] = "";
+            this.recordInfo.recordData.splice(
+              this.currentIndex + 1,
+              0,
+              tempForm
+            );
+          }
+        }
+      }
+
+      this.currentIndex = -1;
+    },
+    cancle: function() {
+      this.$refs.dialog.hide();
+      this.propForm.goods = [];
+
+      this.propForm.goodType = [];
+    },
   }
 };
 </script>

src/xt_pages/stock/stockInOrderAdd.vue

@@ -15,7 +15,8 @@
       <stock-in-dialog ref="dialog" :propForm="propForm"
                        :visibility="isVisibility"
                        v-on:dialog-comfirm="comfirm"
-                       v-on:dialog-cancle="cancle"></stock-in-dialog>
+                       v-on:dialog-cancle="cancle">
+      </stock-in-dialog>
 
 
       <div class="cell clearfix">
@@ -374,7 +375,8 @@
         this.propForm.goodType = []
         this.propForm.goods = []
         this.$refs.dialog.hide()
-      }, GetAllGoodType: function() {
+      }, 
+      GetAllGoodType: function() {
         GetAllGoodType().then(response => {
           if (response.data.state == 0) {
             this.$message.error(response.data.msg)

src/xt_pages/stock/stockInOrderEdit.vue

@@ -559,6 +559,7 @@ export default {
       this.$router.go(-1);
     },
     submit() {
+     
       this.$refs["tableForm"].validate(valid => {
         if (valid) {
           const array = this.recordInfo.recordData;

src/xt_pages/stock/stockOutOrder.vue

@@ -119,8 +119,24 @@
           </template>
         </el-table-column>
 
-        <el-table-column label="操作" align="center">
+        <el-table-column label="操作" align="center" width="300px">
           <template slot-scope="scope">
+           
+            <el-tooltip
+              class="item"
+              effect="dark"
+              content="详情"
+              placement="top"
+            >
+              <el-button
+                size="small"
+                type="warning"
+                icon="el-icon-document"
+                @click="handleSearch(scope.row.id)"
+              >
+              </el-button>
+            </el-tooltip>
+
             <el-tooltip
               class="item"
               effect="dark"
@@ -165,6 +181,187 @@
       >
       </el-pagination>
     </div>
+
+
+
+
+    <!-- 新增弹窗 -->
+
+    <el-dialog
+      title="提示"
+      :visible.sync="dialogVisible"
+      width="80%"
+     >
+      <span>
+        <div class="filter-container">
+          <span style="font-size: 18px;color: #606266">出库单详情</span>
+          <el-row style="float:right;">
+            <span style="color: #606266">{{warehousingOutInfo.info.warehouse_out_order_number}}</span>
+          </el-row>
+        </div>
+
+        <div class="cell clearfix">
+          <span style="width: 300px;color: #606266">单据日期:  {{warehousingOutInfo.info.warehouse_out_time | parseTime('{y}-{m}-{d}')}} </span>
+          <span style="width: 300px;color: #606266">厂商 {{getManufactuerName(warehousingOutInfo.info.manufacturer)}}</span>
+          <span style="width: 300px;color: #606266">经销商 {{getDealerName(warehousingOutInfo.info.dealer)}}</span>
+        </div>
+
+        <div class="filter-container" style="margin-top: 10px">
+        <el-button size="small" icon="el-icon-edit" @click="editRecord" v-if="warehousingOutInfo.info.is_sys != 1">编辑</el-button>
+        <el-button size="small" icon="el-icon-delete" @click="deleteRecord" v-if="warehousingOutInfo.info.is_sys != 1">删除</el-button>
+        </div>
+
+
+         <el-row :gutter="12" style="margin-top: 10px">
+          <el-table :data="warehousingOutInfo.warehousingOutData" :class="signAndWeighBoxPatients" style="width: 100%"
+                    border :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}"
+                  
+          >
+            <el-table-column min-width="35" align="center">
+              <template slot="header" slot-scope="scope">
+                <span>商品类型</span>
+              </template>
+
+              <template slot-scope="scope">
+                <span v-if="scope.row.good_type_id != 0">{{getTypeName(scope.row.good_type_id)}}</span>
+              </template>
+            </el-table-column>
+            <el-table-column min-width="35" align="center">
+              <template slot="header" slot-scope="scope">
+                <span>规格名称</span>
+              </template>
+              <template slot-scope="scope">
+                <span v-if="scope.row.good_id != 0">{{getSpecificationName(scope.row.good_id)}}</span>
+              </template>
+            </el-table-column>
+
+
+            <el-table-column min-width="23" align="center">
+              <template slot="header" slot-scope="scope">
+                <span>单价</span>
+              </template>
+              <template slot-scope="scope">
+                <span>{{scope.row.price}}</span>
+              </template>
+            </el-table-column>
+
+            <el-table-column min-width="23" align="center">
+              <template slot="header" slot-scope="scope">
+                <span>出库数量</span>
+              </template>
+              <template slot-scope="scope">
+                <span>{{scope.row.count}}</span>
+
+              </template>
+            </el-table-column>
+            <el-table-column label="总价" min-width="20" align="center">
+              <template slot-scope="scope">
+                {{calculate(scope.row.price*scope.row.count)}}
+              </template>
+            </el-table-column>
+
+            <el-table-column label="备注" min-width="20" align="center">
+              <template slot-scope="scope">
+                <el-popover placement="top-start" width="250" trigger="hover">
+                  <div>{{scope.row.remark}}</div>
+                  <span slot="reference"
+                        v-if="scope.row.remark.length > 20">{{ scope.row.remark.substr(0,20)+'...' }}</span>
+                  <span slot="reference" v-else>{{ scope.row.remark}}</span>
+                </el-popover>
+
+              </template>
+            </el-table-column>
+
+            <el-table-column label="" align="center"  >
+              <template slot-scope="scope" v-if="scope.row.is_sys == 1">
+              <div style="color: #589ff8" @click="jump(scope.row.id)">使用明细</div>
+              </template>
+            </el-table-column>
+             
+
+
+          </el-table>
+      </el-row>
+      </span>
+      <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>
+
+
+  <!-- 使用明细查询 -->
+   <el-dialog
+    title="出库单详情"
+    :visible.sync="editdialogVisible"
+    width="80%">
+    <span>
+      <div class="filter-container">
+        <span style="font-size: 18px;color: #606266">商品使用明细</span>
+      </div>
+     
+      <div class="cell clearfix">
+        <span style="width: 300px;color: #606266">商品类型: {{type_name}} </span>
+        <span style="width: 300px;color: #606266">规格名称: {{specification_name}}</span>
+      </div>
+
+       <el-row :gutter="12" style="margin-top: 10px">
+        <el-table :data="userList" :class="signAndWeighBoxPatients" style="width: 80%"
+                  border :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}"
+        >
+          <el-table-column min-width="35" align="center">
+            <template slot="header" slot-scope="scope">
+              <span>序号</span>
+            </template>
+            <template slot-scope="scope">
+              <span v-if="scope.row.is_total == 0">{{scope.$index+1}}</span>
+              <span v-if="scope.row.is_total == 1">{{'合计'}}</span>
+            </template>
+          </el-table-column>
+
+          <el-table-column min-width="35" align="center">
+            <template slot="header" slot-scope="scope">
+              <span>使用人</span>
+            </template>
+            <template slot-scope="scope">
+              <span v-if="scope.row.is_total == 0">{{scope.row.user.name}}</span>
+              <span v-if="scope.row.is_total == 1"></span>
+            </template>
+          </el-table-column>
+          <el-table-column min-width="35" align="center">
+            <template slot="header" slot-scope="scope">
+              <span>使用数量</span>
+            </template>
+            <template slot-scope="scope">
+              <span v-if="scope.row.is_total == 0">{{scope.row.count}}</span>
+              <span  v-if="scope.row.is_total == 1">{{scope.row.total}} </span>
+
+            </template>
+          </el-table-column>
+          <el-table-column min-width="35" align="center">
+            <template slot="header" slot-scope="scope">
+              <span>使用时间</span>
+            </template>
+            <template slot-scope="scope">
+              <span>{{scope.row.ctime | parseTime('{y}-{m}-{d} {h}:{i}')}} </span>
+
+            </template>
+          </el-table-column>
+
+        </el-table>
+      </el-row>
+    </span>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="editdialogVisible = false">取 消</el-button>
+      <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
+    </span>
+  </el-dialog>
+  
+
+
+  <!-- 编辑 -->
+  
+  
   </div>
 </template>
 
@@ -175,7 +372,9 @@ import { fetchAllAdminUsers, fetchAllDoctorAndNurse } from "@/api/doctor";
 import {
   deleteWarehouseOut,
   GetAllConfig,
-  getWarehouseOutList
+  getWarehouseOutList,
+  getWarehouseOutInfo,
+  getWarehouseOutUser
 } from "@/api/stock";
 import BreadCrumb from "../components/bread-crumb";
 
@@ -203,8 +402,9 @@ export default {
       (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
       "-" +
       (nowDay < 10 ? "0" + nowDay : nowDay);
-    this.GetWarehouseOut();
     this.GetConfigInfo();
+    this.GetWarehouseOut();
+   
     this.fetchAllAdminUsers();
   },
   data() {
@@ -231,7 +431,19 @@ export default {
       manufacturer: [],
       selectedTableData: [],
       dealer: [],
-      type: 1
+      type: 1,
+      drug_id:0,
+      dialogVisible:false,
+      editdialogVisible:false,
+      warehousingOutInfo: {
+        loading: false,
+        warehousingOutData: [],
+        info: {}
+      },
+      userList:[],
+      type_name:'',
+      specification_name:"",
+      
     };
   },
   methods: {
@@ -366,6 +578,8 @@ export default {
         } else {
           this.manufacturer = response.data.data.manufacturer;
           this.dealer = response.data.data.dealer;
+          this.goodInfo = response.data.data.goodInfo
+          this.goodType = response.data.data.goodType
         }
       });
     },
@@ -479,7 +693,108 @@ export default {
           });
         })
         .catch(() => {});
-    }
+    },
+
+ 
+
+    
+    //新增
+    handleSearch(id){ 
+      this.warehousingOutInfo.info = []
+      this.warehousingOutInfo.warehousingOutData = []
+      this.GetOrderDetailOne(id)
+      this.dialogVisible = true
+    },
+  
+    //获取出库单详情数据
+    GetOrderDetailOne(id) {
+        const params = {
+          'id': id
+        }
+      getWarehouseOutInfo(params).then(response => {
+          if (response.data.state == 0) {
+
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            for (let i = 0; i < response.data.data.list.length; i++) {
+              this.warehousingOutInfo.warehousingOutData.push(response.data.data.list[i])
+            }
+
+            this.warehousingOutInfo.info = response.data.data.info
+            // this.handleSpanTempArr()
+          }
+        })
+     }, 
+
+      getTypeName: function(id) {
+        let name = ''
+        for (let i = 0; i < this.goodType.length; i++) {
+          if (this.goodType[i].id == id) {
+            name = this.goodType[i].type_name
+          }
+        }
+        return name
+      },
+
+     getSpecificationName: function(id) {
+        let name = ''
+        for (let i = 0; i < this.goodInfo.length; i++) {
+          if (this.goodInfo[i].id == id) {
+            name = this.goodInfo[i].specification_name
+          }
+        }
+        return name
+      },
+     getManufactuerName: function(manufacturer_id) {
+        for (let i = 0; i < this.manufacturer.length; i++) {
+          if (this.manufacturer[i].id == manufacturer_id) {
+            return this.manufacturer[i].manufacturer_name
+          }
+        }
+      }, 
+
+    jump(id){
+      this.userList = []
+      this.GetOrderDetail(id)
+     
+    },
+
+     GetOrderDetail: function(order_id) {
+        const params = {
+          'id': order_id
+        }
+      
+        getWarehouseOutUser(params).then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            var total = 0
+            for (let i = 0; i < response.data.data.list.length; i++) {
+              var obj = response.data.data.list[i]
+              obj['is_total'] = 0
+              this.userList.push(obj)
+              total = total + response.data.data.list[i].count
+            }
+            this.userList.push({
+              is_total: 1,
+              total: total,
+            })
+            this.type_name = this.userList[0].type.type_name
+            this.specification_name = this.userList[0].info.specification_name
+            console.log("详情数据区",this.userList)
+              this.editdialogVisible = true
+          }
+        })
+      },
+
+      editRecord(){
+     
+      },
+      deleteRecord(){
+
+      }
   }
 };
 </script>

src/xt_pages/stock/stockOutOrderDetail.vue

@@ -152,7 +152,8 @@
           }
         }
         return name
-      }, getTypeName: function(id) {
+      },
+       getTypeName: function(id) {
         let name = ''
         for (let i = 0; i < this.goodType.length; i++) {
           if (this.goodType[i].id == id) {
@@ -160,7 +161,8 @@
           }
         }
         return name
-      }, GetConfigInfo: function() {
+      },
+       GetConfigInfo: function() {
         GetAllConfig().then(response => {
           if (response.data.state == 0) {
             this.$message.error(response.data.msg)
@@ -184,12 +186,14 @@
             return this.dealer[i].dealer_name
           }
         }
-      }, calculate: function(val) {
+      }, 
+      calculate: function(val) {
         if (val == 0) {
           return ''
         }
         return Math.round(parseFloat(val) * 100) / 100
-      }, GetOrderDetail: function(order_id) {
+      },
+       GetOrderDetail: function(order_id) {
         const params = {
           'id': order_id
         }

src/xt_pages/stock/stockOutOrderEdit.vue

@@ -315,7 +315,8 @@
           }
         }
         return name;
-      }, handleEdit: function(index, row) {
+      }, 
+      handleEdit: function(index, row) {
         const tempObj = {}
         tempObj['id'] = 0
         tempObj['good_type_id'] = 0
@@ -422,7 +423,8 @@
 
       back() {
         this.$router.go(-1)
-      }, submit() {
+      },
+       submit() {
         this.$refs['tableForm'].validate((valid) => {
           if (valid) {
             const array = this.recordInfo.recordData

src/xt_pages/stock/stockUserDetail.vue

@@ -106,7 +106,8 @@
           }
         }
         return name
-      }, GetOrderDetail: function(order_id) {
+      },
+       GetOrderDetail: function(order_id) {
         const params = {
           'id': order_id
         }

src/xt_pages/workforce/components/tableData.vue

@@ -1950,9 +1950,9 @@ export default {
     ScheduleItem
   },
   mounted() {
-    console.log(this.tableContainHeight);
+    console.log('this.tableContainHeight,',this.$refs.table.$el.offsetTop);
     this.tableContainHeight =
-      window.innerHeight - this.$refs.table.$el.offsetTop - 160;
+      window.innerHeight - this.$refs.table.$el.offsetTop - 120;
     console.log(this.tableContainHeight);
     // var theType = this.weekType(this.weekTime);
     // this.getSchedules(theType);
@@ -1963,7 +1963,7 @@ export default {
         if (window.fullHeight < 200) {
           that.tableHeight = 200;
         } else {
-          that.tableHeight = window.fullHeight - 200;
+          that.tableHeight = window.fullHeight - 160;
         }
       })();
     };