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

src/api/stock.js

@@ -625,3 +625,11 @@ export function getAllStockList(params) {
     params: params
   })
 }
+
+export function getStockDrugCount(params) {
+  return request({
+    url: '/api/good/getstockdrugcount',
+    method: 'get',
+    params: params
+  })
+}

src/xt_pages/data/components/addDrugs.vue

@@ -663,7 +663,6 @@
         this.form.intro = ''
       },
       show(id, obj) {
-
         this.unitList = []
         this.packingUnit = []
         var arr =  getDataConfig('hemodialysis','units')
@@ -672,11 +671,45 @@
             this.unitList.push(arr[i])
             this.packingUnit.push(arr[i])
           }
-          if(obj.max_unit == arr[i].name){
+          if(obj.dose_unit == arr[i].name){
             this.unitList.push(arr[i])
+          }
+          if(obj.max_unit == arr[i].name){
             this.packingUnit.push(arr[i])
           } 
+
+          let idArr = []
+          this.unitList.map(item => {
+            idArr.push(item.id)
+          })
+          if(idArr.indexOf(obj.drug_dose_unit) == -1){
+            if(obj.drug_dose_unit == arr[i].id){
+              this.unitList.push(arr[i])
+            }
+          }
+          let packingIdArr = []
+          this.packingUnit.map(item => {
+            packingIdArr.push(item.id)
+          })
+          if(packingIdArr.indexOf(obj.prescribing_number_unit) == -1){
+            if(obj.prescribing_number_unit == arr[i].id || obj.prescribing_number_unit == arr[i].name){
+              this.packingUnit.push(arr[i])
+            }
+          }
         }
+        let ojb = {};
+        this.unitList = this.unitList.reduce(function(prevArr, currentItem) {
+          //利用对象的键名无法重复的特点，mch_id是唯一区别的属性值
+          ojb[currentItem.name] ? '' : ojb[currentItem.name] = true && prevArr.push(currentItem);
+          return prevArr
+        }, [])
+
+        let newojb = {};
+        this.packingUnit = this.packingUnit.reduce(function(prevArr, currentItem) {
+          //利用对象的键名无法重复的特点，mch_id是唯一区别的属性值
+          newojb[currentItem.name] ? '' : newojb[currentItem.name] = true && prevArr.push(currentItem);
+          return prevArr
+        }, [])
         console.log('this.unitList',this.unitList)
         this.getInitializtion()
         this.getlist()

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

@@ -566,7 +566,7 @@
           </el-col>
           
           <el-col :span="8">
-            <el-form-item label="预计进食量:" v-if="isShow('预计进食量')">
+            <el-form-item label="预计进食量(g):" v-if="isShow('预计进食量')">
              <el-input v-model="assessmentBeforeDislysis.estimated_food_intake"></el-input>
             </el-form-item>
           </el-col>

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

@@ -578,12 +578,12 @@
             </el-form-item>
           </el-col>
 
-          <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 == 29 || template_id == 30 || template_id == 31 || template_id == 34 || template_id == 35) ">
+          <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 == 29 || template_id == 30 || template_id == 31 || template_id == 34 || template_id == 35 || template_id == 38) ">
             <el-form-item label="超滤率(ml/h)">
               <el-input v-model="form.ultrafiltration_rate"></el-input>
             </el-form-item>
           </el-col>
-          <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 != 29 && template_id != 30 && template_id != 31 && template_id != 34 && template_id != 35">
+          <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 != 29 && template_id != 30 && template_id != 31 && template_id != 34 && template_id != 35 && template_id != 38">
             <el-form-item label="超滤率(L/h)">
               <el-input v-model="form.ultrafiltration_rate"></el-input>
             </el-form-item>
@@ -591,7 +591,7 @@
 
           <el-col
             :span="8"
-            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 || template_id == 31 || template_id == 32 || template_id == 34 || template_id == 35 || template_id == 36 || 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 || template_id == 31 || template_id == 32 || template_id == 34 || template_id == 35 || template_id == 36 || template_id == 38 || org_id == 9555) " >
             <el-form-item label="超滤量(ml)：">
               <el-input v-model="form.ultrafiltration_volume"></el-input>
             </el-form-item>
@@ -599,7 +599,7 @@
 
           <el-col
             :span="8"
-            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 && template_id!=31 && template_id!=32 && template_id!=34 && template_id!=35 && template_id!=36 && 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 && template_id!=31 && template_id!=32 && template_id!=34 && template_id!=35 && template_id!=36 && template_id!=38 && org_id !=9555" >
             <el-form-item label="超滤量(L)：">
               <el-input v-model="form.ultrafiltration_volume"></el-input>
             </el-form-item>

src/xt_pages/dialysis/template/DialysisPrintOrderThirtyEight.vue

@@ -85,7 +85,7 @@
           <div class="widthLength25">附加重物量：{{ predialysis.additional_weight ? predialysis.additional_weight : 0 }} Kg</div>
           <div class="widthLength25">透前体重：{{ predialysis.weight_before ? predialysis.weight_before : "" }} Kg</div>
           <div class="widthLength25">干体重：{{ predialysis.dry_weight ? predialysis.dry_weight : "" }} Kg</div>
-          <div class="widthLength25">预计进食量：{{ predialysis.estimated_food_intake ? predialysis.estimated_food_intake : '无' }}</div>
+          <div class="widthLength25">预计进食量：{{ predialysis.estimated_food_intake ? predialysis.estimated_food_intake + ' g' : '无' }}</div>
       </div>
       <div class="lineHeight">
           其他：{{ predialysis.remark ? predialysis.remark : '' }}
@@ -169,7 +169,6 @@
             <td colspan="3" style="width:130px;height:40px">执行时间</td>
             <td colspan="2" style="width:130px;height:40px">核对护士</td>
             <td colspan="2" style="width:108px;height:40px">执行护士</td>
-            <td colspan="2" style="width:108px;height:40px">带教学生</td>
           </tr>
 
           <tr v-for="(advice, advice_index) in tableAdvice" style="height:30px">
@@ -211,7 +210,6 @@
               </span>
               <img style="height:20px;" :src="setAdminUserES(advice.execution_staff)" alt srcset v-else />
             </td>
-            <td colspan="2"><span v-if="advice.start_time">无</span></td>
           </tr>
         </tbody>
       </table>
@@ -260,7 +258,6 @@
               <img class="es-img" style="height:20px;" :src="setAdminUserES(dialysisOrder==null?0:dialysisOrder.start_nurse)" alt="" srcset="" v-else>
             </span>
           </div>
-          <div style="width:16%;">学生：无</div>
       </div>
       <div class="lineHeight">治疗过程中检测记录：血压检测部位：{{ monitors && monitors[0] ? monitors[0].blood_pressure_monitoring_site : '' }}</div>
       <table class="print-table" border="1">
@@ -413,8 +410,6 @@
               <img class="es-img" style="height:20px;" :src="setAdminUserES(dialysisOrder==null?0:dialysisOrder.finish_nurse)" alt="" srcset="" v-else>
             </span>
           </div>
-          <div style="width:16%;">学生：无</div>
-          <div style="width:16%;">带教老师：无</div>
       </div>
       <div class="lineHeight">
           病程记录：
@@ -883,30 +878,6 @@ export default {
           if (prescription.anticoagulant == 7) {
             prescription.anticoagulant = "低分子肝素钠";
           }
-          if (prescription.blood_access === 1) {
-            prescription.blood_access = "正常";
-          }
-          if (prescription.blood_access === 2) {
-            prescription.blood_access = "震颤";
-          }
-          if (prescription.blood_access === 3) {
-            prescription.blood_access = "堵塞";
-          }
-          if (prescription.blood_access === 4) {
-            prescription.blood_access = "血肿";
-          }
-          if (prescription.blood_access === 5) {
-            prescription.blood_access = "淤血";
-          }
-          if (prescription.blood_access === 6) {
-            prescription.blood_access = "感染";
-          }
-          if (prescription.blood_access === 7) {
-            prescription.blood_access = "自体内瘘";
-          }
-          if (prescription.blood_access === 8) {
-            prescription.blood_access = "人工血管内瘘";
-          }
           if (prescription.replacement_way === 1) {
             prescription.replacement_way = "前置换";
           }

src/xt_pages/stock/drugs/drugStockInOrderAdd.vue

@@ -73,7 +73,7 @@
             </template>
 
             <template slot-scope="scope">
-              <el-form-item style="padding-top: 15px">
+              <el-form-item style="padding-top: 20px">
                   <el-autocomplete
                     class="checkSearch"
                     popper-class="my-autocomplete"
@@ -93,12 +93,12 @@
               </el-form-item>
             </template>
           </el-table-column>
-           <el-table-column align="center" width="200">
+           <el-table-column align="center" width="140">
             <template slot="header" slot-scope="scope">
               <span>药品类型</span>
             </template>
              <template slot-scope="scope">
-               <el-select size="small" v-model="scope.row.drug_type" filterable placeholder="请选择厂商">
+               <el-select v-model="scope.row.drug_type" filterable placeholder="请选择厂商">
                 <el-option
                   v-for="(option, index) in drugTypeList"
                   :key="index"
@@ -108,12 +108,12 @@
                </el-select>
             </template>
           </el-table-column>
-          <el-table-column align="center" width="200">
+          <el-table-column align="center" width="140">
             <template slot="header" slot-scope="scope">
               <span>规格&单位</span>
             </template>
             <template slot-scope="scope">
-              <el-form-item style="padding-top: 15px">
+              <el-form-item style="padding-top: 20px">
                 <el-input
                   :disabled="true"
                   placeholder="请输入规格&单位"
@@ -122,12 +122,12 @@
               </el-form-item>
             </template>
           </el-table-column>
-         <el-table-column align="center" width="200">
+         <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-form-item style="padding-top: 20px">
                   <el-input
                     placeholder="请输入批号"
                     v-model="scope.row.lot_number"
@@ -136,7 +136,7 @@
               </template>
          </el-table-column>
 
-         <el-table-column align="center" width="180">
+         <el-table-column align="center" width="120">
             <template slot="header" slot-scope="scope">
               <span>入库数量<span style="color: red">*</span></span>
             </template>
@@ -144,20 +144,19 @@
               <el-form-item
                 :prop="'recordData.' + scope.$index + '.warehousing_count'"
                 :rules="tableRules.warehousing_count"
-                style="padding-top: 17px"
+                style="padding-top: 20px"
               >
                 <el-input
                   placeholder="请输入入库数量"
                   type="number"
                   v-model="scope.row.warehousing_count"
-                  style="width:100px"
                 ></el-input>
                 {{scope.row.max_unit}}
               </el-form-item>
             </template>
           </el-table-column>
        
-          <el-table-column align="center" width="150">
+          <el-table-column align="center" width="120">
             <template slot="header" slot-scope="scope">
               <span>进货单价(元)<span style="color: red">*</span></span>
             </template>
@@ -165,7 +164,7 @@
               <el-form-item
                 :prop="'recordData.' + scope.$index + '.price'"
                 :rules="tableRules.last_price"
-                style="padding-top: 17px"
+                style="padding-top: 20px"
               >
                 <el-input
                   style="width:100px"
@@ -178,15 +177,15 @@
             </template>
           </el-table-column>
 
-          <el-table-column label="总价(元)" align="center" width="150">
+          <el-table-column label="总价(元)" align="center" width="80">
             <template slot-scope="scope">
               {{ calculate(scope.row.last_price * scope.row.warehousing_count) }} 
             </template>
           </el-table-column>
 
-          <el-table-column label="生产厂家" width="250" align="center">
+          <el-table-column label="生产厂家" width="140" align="center">
             <template slot-scope="scope">
-               <el-select size="small" v-model="scope.row.manufacturer" filterable placeholder="请选择厂商">
+               <el-select v-model="scope.row.manufacturer" filterable placeholder="请选择厂商">
                 <el-option
                   v-for="(option, index) in manufacturerList"
                   :key="index"
@@ -198,7 +197,7 @@
           </el-table-column>
  
 
-          <el-table-column label="生产日期" width="250" align="center">
+          <el-table-column label="生产日期" width="180" align="center">
             <template slot-scope="scope">
               <el-date-picker
                 prefix-icon="el-icon-date"
@@ -211,7 +210,7 @@
               ></el-date-picker>
             </template>
           </el-table-column>
-          <el-table-column label="有效日期" width="250" align="center">
+          <el-table-column label="有效日期" width="180" align="center">
             <template slot-scope="scope">
               <el-date-picker
                 prefix-icon="el-icon-date"
@@ -227,7 +226,7 @@
         
         <el-table-column align="center" width="150" label="批准文号">
             <template slot-scope="scope">
-              <el-form-item>
+              <el-form-item style="padding-top: 20px">
                 <el-input
                   placeholder="请输入批准文号"
                   v-model="scope.row.batch_number"

src/xt_pages/stock/drugs/drugStockInOrderEdit.vue

@@ -114,7 +114,7 @@
             </template>
 
             <template slot-scope="scope">
-              <el-form-item style="padding-top: 15px">
+              <el-form-item style="padding-top: 20px">
                  <el-autocomplete
                     class="checkSearch"
                     popper-class="my-autocomplete"
@@ -134,12 +134,12 @@
               </el-form-item>
             </template>
           </el-table-column>
-         <el-table-column align="center" width="200">
+         <el-table-column align="center" width="140">
             <template slot="header" slot-scope="scope">
               <span>药品类型</span>
             </template>
              <template slot-scope="scope">
-               <el-select size="small" v-model="scope.row.drug_type" filterable placeholder="请选择厂商">
+               <el-select v-model="scope.row.drug_type" filterable placeholder="请选择厂商">
                 <el-option
                   v-for="(option, index) in drugTypeList"
                   :key="index"
@@ -149,12 +149,12 @@
                </el-select>
             </template>
           </el-table-column>
-          <el-table-column align="center" width="200">
+          <el-table-column align="center" width="140">
             <template slot="header" slot-scope="scope">
               <span>规格&单位</span>
             </template>
             <template slot-scope="scope">
-              <el-form-item style="padding-top: 15px">
+              <el-form-item style="padding-top: 20px">
                 <el-input
                   :disabled="true"
                   placeholder="请输入规格&单位"
@@ -163,12 +163,12 @@
               </el-form-item>
             </template>
           </el-table-column>
-          <el-table-column align="center" width="200">
+          <el-table-column align="center" width="140">
             <template slot="header" slot-scope="scope" >
               <span>批号</span>
               </template>
                 <template slot-scope="scope">
-                  <el-form-item style="padding-top: 15px">
+                  <el-form-item style="padding-top: 20px">
                     <el-input
                       placeholder="请输入批号"
                       v-model="scope.row.lot_number"
@@ -177,7 +177,7 @@
                 </template>
           </el-table-column>
                    
-         <el-table-column align="center" width="180">
+         <el-table-column align="center" width="120">
             <template slot="header" slot-scope="scope">
               <span>入库数量<span style="color: red">*</span></span>
             </template>
@@ -185,19 +185,20 @@
               <el-form-item
                 :prop="'recordData.' + scope.$index + '.warehousing_count'"
                 :rules="tableRules.warehousing_count"
-                style="padding-top: 17px"
+                style="padding-top: 20px;"
               >
-                <el-input
-                  placeholder="请输入入库数量"
-                  type="number"
-                  v-model="scope.row.warehousing_count"
-                  style="width:100px"
-                ></el-input>
-                {{scope.row.max_unit}}
+                <div style="display:flex;">
+                  <el-input
+                    placeholder="请输入入库数量"
+                    type="number"
+                    v-model="scope.row.warehousing_count"
+                  ></el-input>
+                  {{scope.row.max_unit}}
+                </div>
               </el-form-item>
             </template>
           </el-table-column>
-          <el-table-column>
+          <el-table-column width="120">
             <template slot="header" slot-scope="scope">
                 <span>进货单价(元)<span style="color: red">*</span></span>
               </template>
@@ -205,7 +206,7 @@
                 <el-form-item
                   :prop="'recordData.' + scope.$index + '.price'"
                   :rules="tableRules.last_price"
-                  style="padding-top: 17px"
+                  style="padding-top: 20px"
                 >
                   <el-input
                     style="width:100px"
@@ -218,15 +219,15 @@
               </template>
           </el-table-column>
 
-          <el-table-column label="总价(元)" align="center" width="150">
+          <el-table-column label="总价(元)" align="center" width="80">
             <template slot-scope="scope">
               {{ calculate(scope.row.last_price * scope.row.warehousing_count) }} 
             </template>
           </el-table-column>
          
-          <el-table-column label="生产厂家" width="250" align="center">
+          <el-table-column label="生产厂家" width="140" align="center">
             <template slot-scope="scope">
-               <el-select size="small" v-model="scope.row.manufacturer" filterable placeholder="请选择厂商">
+               <el-select v-model="scope.row.manufacturer" filterable placeholder="请选择厂商">
                 <el-option
                   v-for="(option, index) in manufacturerList"
                   :key="index"
@@ -237,7 +238,7 @@
             </template>
           </el-table-column>
 
-          <el-table-column label="生产日期" width="250" align="center">
+          <el-table-column label="生产日期" width="180" align="center">
             <template slot-scope="scope">
               <el-date-picker
                 prefix-icon="el-icon-date"
@@ -252,7 +253,7 @@
           </el-table-column>
 
 
-         <el-table-column label="有效日期" width="250" align="center">
+         <el-table-column label="有效日期" width="180" align="center">
             <template slot-scope="scope">
               <el-date-picker
                 prefix-icon="el-icon-date"

src/xt_pages/stock/drugs/drugStockOutOrderAdd.vue

@@ -48,7 +48,7 @@
           v-model="warehouse_out_time"
           prefix-icon="el-icon-date"
           :editable="false"
-          style="width: 196px;"
+          style="width: 200px;"
           type="date"
           placeholder="选择日期时间"
           align="right"
@@ -65,6 +65,7 @@
           filterable
           placeholder="请选择经销商"
           @change="changeDealer"
+          style="width: 200px;"
         >
           <el-option
             v-for="(option, index) in dealer"
@@ -84,6 +85,7 @@
           filterable
           placeholder="请选择厂商"
           @change="changeManufacturer"
+          style="width: 200px;"
         >
           <el-option
             v-for="(option, index) in manufacturer"
@@ -110,7 +112,7 @@
             </template>
 
             <template slot-scope="scope">
-              <el-form-item style="padding-top: 15px">
+              <el-form-item style="padding-top: 20px">
                 <el-autocomplete
                     class="checkSearch"
                     popper-class="my-autocomplete"
@@ -130,12 +132,12 @@
               </el-form-item>
             </template>
           </el-table-column>
-          <el-table-column align="center" width="200">
+          <el-table-column align="center" width="140">
             <template slot="header" slot-scope="scope">
               <span>药品类型</span>
             </template>
              <template slot-scope="scope">
-               <el-select size="small" v-model="scope.row.drug_type" filterable placeholder="请选择厂商">
+               <el-select v-model="scope.row.drug_type" filterable placeholder="请选择厂商">
                 <el-option
                   v-for="(option, index) in drugTypeList"
                   :key="index"
@@ -145,12 +147,12 @@
                </el-select>
             </template>
           </el-table-column>
-          <el-table-column align="center" width="200">
+          <el-table-column align="center" width="140">
             <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-form-item style="padding-top: 20px">
                 <el-input
                   :disabled="true"
                   placeholder="请输入规格&单位"
@@ -159,12 +161,12 @@
               </el-form-item>
             </template>
           </el-table-column>
-          <el-table-column align="center" width="200">
+          <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-form-item style="padding-top: 20px">
                     <el-input
                       placeholder="请输入批号"
                       v-model="scope.row.batch_number"
@@ -172,7 +174,7 @@
                   </el-form-item>
               </template>
           </el-table-column>
-          <el-table-column width="180" align="center">
+          <el-table-column width="120" align="center">
             <template slot="header" slot-scope="scope">
               <span>出库数量<span style="color: red">*</span></span>
             </template>
@@ -180,20 +182,21 @@
               <el-form-item
                 :prop="'recordData.' + scope.$index + '.count'"
                 :rules="tableRules.count"
-                style="padding-top: 17px"
+                style="padding-top: 20px"
               >
-                <el-input
-                  placeholder="请输入出库数量"
-                  type="number"
-                  v-model="scope.row.count"
-                  style="width:100px"
-                ></el-input>
-                {{scope.row.packing_unit}}
+                <div style="display:flex;">
+                  <el-input
+                    placeholder="请输入出库数量"
+                    type="number"
+                    v-model="scope.row.count"
+                  ></el-input>
+                  {{scope.row.packing_unit}}
+                </div>
               </el-form-item>
               
             </template>
           </el-table-column>
-          <el-table-column width="100" align="center">
+          <el-table-column width="120" align="center">
             <template slot="header" slot-scope="scope">
               <span>出货价<span style="color: red">*</span></span>
             </template>
@@ -202,7 +205,7 @@
               <el-form-item
                 :prop="'recordData.' + scope.$index + '.last_price'"
                 :rules="tableRules.last_price"
-                style="padding-top: 17px"
+                style="padding-top: 20px"
               >
                 <el-input
                   placeholder="请输入出货价"
@@ -235,7 +238,7 @@
 
           
 
-          <el-table-column label="总价" width="100" align="center">
+          <el-table-column label="总价" width="80" align="center">
             <template slot-scope="scope">
               {{ calculate(scope.row.last_price * scope.row.count) }}
             </template>
@@ -254,9 +257,9 @@
             </template>
           </el-table-column> -->
           
-             <el-table-column label="生产厂家" width="250" align="center">
+          <el-table-column label="生产厂家" width="140" align="center">
             <template slot-scope="scope">
-               <el-select size="small" v-model="scope.row.manufacturer" filterable placeholder="请选择厂商">
+               <el-select v-model="scope.row.manufacturer" filterable placeholder="请选择厂商">
                 <el-option
                   v-for="(option, index) in manufacturerList"
                   :key="index"
@@ -268,7 +271,7 @@
           </el-table-column>
  
 
-          <el-table-column label="生产日期" width="250" align="center">
+          <el-table-column label="生产日期" width="180" align="center">
             <template slot-scope="scope">
               <el-date-picker
                 prefix-icon="el-icon-date"
@@ -281,7 +284,7 @@
               ></el-date-picker>
             </template>
           </el-table-column>
-          <el-table-column label="有效日期" width="250" align="center">
+          <el-table-column label="有效日期" width="180" align="center">
             <template slot-scope="scope">
               <el-date-picker
                 prefix-icon="el-icon-date"
@@ -297,7 +300,7 @@
         
         <el-table-column align="center" width="150" label="批准文号">
             <template slot-scope="scope">
-              <el-form-item>
+              <el-form-item style="padding-top: 20px">
                 <el-input
                   placeholder="请输入批准文号"
                   v-model="scope.row.number"
@@ -306,13 +309,13 @@
             </template>
           </el-table-column>
 
-          <el-table-column label="备注" width="80" align="center">
+          <el-table-column label="备注" width="120" align="center">
             <template slot-scope="scope">
               <el-input v-model="scope.row.remark"></el-input>
             </template>
           </el-table-column>
 
-          <el-table-column label="操作" align="center" width="150">
+          <el-table-column label="操作" align="center" width="150" fixed="right">
             <template slot-scope="scope">
               <el-tooltip
                 class="item"

src/xt_pages/stock/drugs/query.vue

@@ -41,7 +41,6 @@
             </el-option>
         </el-select>
          <el-date-picker
-            size="small"
             v-model="start_time"
             prefix-icon="el-icon-date"
             :editable="false"
@@ -54,7 +53,6 @@
             @change="startTimeChange"
            ></el-date-picker>-
             <el-date-picker
-              size="small"
               v-model="end_time"
               prefix-icon="el-icon-date"
               :editable="false"
@@ -67,7 +65,6 @@
               @change="endTimeChange"
           ></el-date-picker>
           <el-input
-            size="small"
             style="width: 200px;"
             class="filter-item"
             v-model.trim="keywords"
@@ -83,41 +80,38 @@
           </el-button>
       </div>
       
-       <el-table
-        :data="tableList"
-        border
-        style="width: 100%">
+       <el-table :data="tableList" border style="width: 100%">
         <!-- <el-table-column prop="date" label="药品编号" width="180">
            <template  slot-scope="scope">
               
            </template>
         </el-table-column> -->
-        <el-table-column prop="drug_type" label="药品类型" width="180">
+        <el-table-column prop="drug_type" label="药品类型" width="180" align="center">
            <template slot-scope="scope">
              {{getDrugType(scope.row.drug_type)}}
            </template>
         </el-table-column>
-        <el-table-column prop="drug_name" label="药品名称">
+        <el-table-column prop="drug_name" label="药品名称" align="center">
            <template slot-scope="scope">
              {{scope.row.drug_name}}
            </template>
         </el-table-column>
-        <el-table-column prop="drug_name" label="规格&&单位">
+        <el-table-column prop="drug_name" label="规格&&单位" align="center">
            <template slot-scope="scope">
              {{scope.row.dose + scope.row.dose_unit +"*"+scope.row.min_number+scope.row.min_unit+"/"+scope.row.max_unit}}
            </template>
         </el-table-column>
-         <el-table-column prop="drug_name" label="进货单价">
+         <el-table-column prop="drug_name" label="进货单价" align="center">
            <template slot-scope="scope">
              {{scope.row.last_price}}
            </template>
         </el-table-column>
-         <el-table-column prop="drug_name" label="厂家">
+         <el-table-column prop="drug_name" label="厂家" align="center">
            <template slot-scope="scope">
              {{getManufacturerList(scope.row.manufacturer)}}
            </template>
         </el-table-column>
-        <el-table-column prop="drug_name" label="剩余库存量">
+        <el-table-column prop="drug_name" label="剩余库存量" align="center">
            <template slot-scope="scope">
             <span v-if="scope.row.stock_max_number!=''">
               {{scope.row.stock_max_number}}{{scope.row.max_unit}}
@@ -127,36 +121,20 @@
             </span> 
            </template>
         </el-table-column>
-        <el-table-column prop="drug_name" label="操作">
+        <el-table-column prop="drug_name" label="操作" align="center">
           <template slot-scope="scope">
-            <el-tooltip
-              class="item"
-              effect="dark"
-              content="库存流水"
-              placement="top"
-            >
-              <el-button
-                size="small"
-                type="primary"
-                icon="el-icon-edit-outline"
-                @click="handleDetail(scope.row.drug_id)"
-              >
-              </el-button>
-            </el-tooltip>
-            <el-tooltip
-              class="item"
-              effect="dark"
-              content="批次"
-              placement="top"
-            >
-              <el-button
-                size="small"
-                type="primary"
-                icon="el-icon-edit-outline"
-                @click="handleBatch(scope.row.drug_id)"
-              >
-              </el-button>
-            </el-tooltip>
+            <el-button
+              size="small"
+              type="primary"
+              @click="handleDetail(scope.row.drug_id)"
+            >库存流水
+            </el-button>
+            <el-button
+              size="small"
+              type="primary"
+              @click="handleBatch(scope.row.drug_id)"
+            >批次
+            </el-button>
           </template>
         </el-table-column>
        </el-table>

src/xt_pages/stock/stockInOrder.vue

@@ -71,9 +71,9 @@
           @change="changeAllSelected"
           >全选</el-checkbox
         >
-        <el-button size="small" icon="el-icon-delete" @click="batchDelete"
-          >删除</el-button
-        >
+        <el-button size="small" icon="el-icon-delete" @click="batchDelete">删除</el-button>
+
+        <el-button size="small" type="primary" @click="toPrint">打印</el-button>
       </div>
 
       <el-table
@@ -188,7 +188,7 @@
     </div>
 
 
-   <div v-show="tableShow" style="margin-bottom:10px">
+   <div v-show="tableShow" style="margin-top:80px">
       <el-table
         :data="tableList"
         :class="signAndWeighBoxPatients"
@@ -204,8 +204,8 @@
           color: '#606266'
         }"
       >
-       <el-table-column align="center" type="selection" width="55">
-       </el-table-column>
+       <!-- <el-table-column align="center" type="selection" width="55">
+       </el-table-column> -->
 
        <el-table-column label="耗材名称" align="center">
           <template slot-scope="scope">
@@ -790,7 +790,8 @@ export default {
       drug_id:1,
       tableShow:false,
       tableList:[],
-      isVisibility:false
+      isVisibility:false,
+      order_id:0,
     };
     
   
@@ -1119,7 +1120,10 @@ export default {
       }
     },
     select(selection) {
+      this.order_id = selection[0].id
+      console.log("selection",selection)
       this.selectedTableData = selection;
+
     },
     batchDelete() {
       if (this.selectedTableData.length <= 0) {
@@ -1465,6 +1469,13 @@ export default {
 
       this.propForm.goodType = [];
     },
+    toPrint(){
+      if(this.order_id == 0){
+        this.$message.error("请勾选入库单")
+      }else{
+        this.$router.push("/stock/in/detail/print?id="+this.order_id)
+      }
+    }
   }
 };
 </script>

src/xt_pages/stock/stockInOrderAdd.vue

@@ -76,31 +76,31 @@
                   >
                     <i class="el-icon-search el-input__icon" slot="suffix"></i>
                   <template slot-scope="{ item }">
-                    <div class="name">{{ item.good_name }}</div>
+                    <div class="name">{{ item.good_name +"  " +item.specification_name }}</div>
                   </template>
                  </el-autocomplete>
             </template>
           </el-table-column>
-          <el-table-column align="center" width="200">
+          <el-table-column align="center" width="140">
             
             <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;margin-left: 10px;margin-right: 10px">
+              <el-form-item style="padding-top: 20px;">
                 <el-input placeholder="请输入耗材类型" v-model="scope.row.good_type_id" :value="typeName(scope.row.good_type_id)"></el-input>
               </el-form-item>
             </template>
           </el-table-column>
-          <el-table-column align="center" width="200">
+          <el-table-column align="center" width="140">
             
             <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-form-item style="padding-top: 20px">
                 <el-input placeholder="请输入规格名称" v-model="scope.row.name"></el-input>
               </el-form-item>
 
@@ -112,7 +112,7 @@
               <span>批号</span>
             </template>
             <template slot-scope="scope">
-              <el-form-item style="padding-top: 17px">
+              <el-form-item style="padding-top: 20px">
                 <el-input placeholder="请输入批号" v-model="scope.row.number"></el-input>
               </el-form-item>
 
@@ -120,28 +120,28 @@
           </el-table-column>
 
 
-          <el-table-column align="center" width="180">
+          <el-table-column align="center" width="120">
             <template slot="header" slot-scope="scope">
               <span>入库数量<span style="color: red">*</span></span>
             </template>
             <template slot-scope="scope">
               <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" style="width:120px"></el-input>
+                            :rules='tableRules.warehousing_count' style="padding-top: 20px">
+                <el-input placeholder="请输入入库数量" type="number" v-model="scope.row.warehousing_count"></el-input>
                   {{scope.row.min_unit}}
               </el-form-item>
             
             </template>
           </el-table-column>
 
-          <el-table-column align="center" width="150">
+          <el-table-column align="center" width="120">
             <template slot="header" slot-scope="scope">
               <span>进货单价<span style="color: red">*</span></span>
             </template>
             <template slot-scope="scope">
             
               <el-form-item :prop="'recordData.' + scope.$index + '.price'" :rules='tableRules.price'
-                            style="padding-top: 17px">
+                            style="padding-top: 20px">
                 <el-input placeholder="请输入单价" type="number" v-model="scope.row.price"></el-input>
               </el-form-item>
 
@@ -149,7 +149,7 @@
             </template>
           </el-table-column>
 
-          <el-table-column label="总价" align="center" width="150">
+          <el-table-column label="总价" align="center" width="80">
             <template slot-scope="scope">
               {{calculate(scope.row.price*scope.row.warehousing_count)}}
             </template>
@@ -168,16 +168,16 @@
             </template>
           </el-table-column>
         
-          <el-table-column label="生产日期" align="center" width="250">
+          <el-table-column label="生产日期" align="center" width="180">
             <template slot-scope="scope">
-              <el-date-picker prefix-icon="el-icon-date" style="width: 145px" v-model="scope.row.product_date"
+              <el-date-picker prefix-icon="el-icon-date" v-model="scope.row.product_date" style="width: 145px"
                               type="date" placeholder="选择日期时间" format="yyyy-MM-dd"
                               value-format="yyyy-MM-dd">
               </el-date-picker>
 
             </template>
           </el-table-column>
-          <el-table-column label="有效日期" align="center" width="250">
+          <el-table-column label="有效日期" align="center" width="180">
             <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"

src/xt_pages/stock/stockInOrderEdit.vue

@@ -40,7 +40,7 @@
           v-model="warehousing_time"
           prefix-icon="el-icon-date"
           :editable="false"
-          style="width: 196px;"
+          style="width: 200px;"
           type="date"
           placeholder="选择日期时间"
           align="right"
@@ -50,13 +50,14 @@
         </el-date-picker>
       </div>
 
-      <div class="cell clearfix">
+      <!-- <div class="cell clearfix">
         <label class="title"><span class="name">经销商</span> : </label>
         <el-select
           size="small"
           v-model="form.dealer"
           clearable
           placeholder="请选择经销商"
+          style="width: 200px;"
         >
           <el-option
             v-for="(option, index) in dealer"
@@ -66,9 +67,9 @@
           >
           </el-option>
         </el-select>
-      </div>
+      </div> -->
 
-      <div class="cell clearfix">
+      <!-- <div class="cell clearfix">
         <label class="title"><span class="name">厂商</span> : </label>
 
         <el-select
@@ -76,6 +77,7 @@
           v-model="form.manufacturer"
           clearable
           placeholder="请选择厂商"
+          style="width: 200px;"
         >
           <el-option
             v-for="(option, index) in manufacturer"
@@ -85,7 +87,7 @@
           >
           </el-option>
         </el-select>
-      </div>
+      </div> -->
 
       <el-form :rules="tableRules" :model="recordInfo" ref="tableForm">
         <el-table
@@ -115,18 +117,18 @@
                   >
                     <i class="el-icon-search el-input__icon" slot="suffix"></i>
                   <template slot-scope="{ item }">
-                    <div class="name">{{ item.good_name }}</div>
+                    <div class="name">{{ item.good_name +" " + item.specification_name}}</div>
                   </template>
                  </el-autocomplete>
             </template>
           </el-table-column>
-          <el-table-column align="center" width="200">
+          <el-table-column align="center" width="140">
             <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-form-item style="padding-top: 20px">
                 <el-input
                   placeholder="请输入耗材类型"
                   v-model="scope.row.good_type_id"
@@ -135,14 +137,14 @@
               </el-form-item>
             </template>
           </el-table-column>
-          <el-table-column align="center" width="200">
+          <el-table-column align="center" width="140">
             
             <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-form-item style="padding-top: 20px">
                 <el-input placeholder="请输入规格名称" v-model="scope.row.name"></el-input>
               </el-form-item>
 
@@ -164,7 +166,7 @@
             </template>
           </el-table-column> -->
 
-          <el-table-column align="center" width="150">
+          <el-table-column align="center" width="120">
             <template slot="header" slot-scope="scope">
               <span>单价<span style="color: red">*</span></span>
             </template>
@@ -173,7 +175,7 @@
               <el-form-item
                 :prop="'recordData.' + scope.$index + '.price'"
                 :rules="tableRules.price"
-                style="padding-top: 17px"
+                style="padding-top: 20px"
               >
                 <el-input
                   placeholder="请输入单价"
@@ -184,7 +186,7 @@
             </template>
           </el-table-column>
 
-          <el-table-column align="center" width="180">
+          <el-table-column align="center" width="120">
             <template slot="header" slot-scope="scope">
               <span>入库数量<span style="color: red">*</span></span>
             </template>
@@ -193,19 +195,18 @@
               <el-form-item
                 :prop="'recordData.' + scope.$index + '.warehousing_count'"
                 :rules="tableRules.warehousing_count"
-                style="padding-top: 17px"
+                style="padding-top: 20px"
               >
                 <el-input
                   placeholder="请输入入库数量"
                   type="number"
                   v-model="scope.row.warehousing_count"
-                  style="width:120px"
                 ></el-input>
                 {{scope.row.min_unit}}
               </el-form-item>
             </template>
           </el-table-column>
-          <el-table-column label="总价" align="center" width="150">
+          <el-table-column label="总价" align="center" width="80">
             <template slot-scope="scope">
               {{ calculate(scope.row.price * scope.row.warehousing_count) }}
             </template>
@@ -216,7 +217,7 @@
               <span>批号</span>
             </template>
             <template slot-scope="scope">
-              <el-form-item>
+              <el-form-item style="padding-top: 20px">
                 <el-input
                   placeholder="请输入批号"
                   v-model="scope.row.number"
@@ -225,7 +226,7 @@
             </template>
           </el-table-column>
 
-          <el-table-column label="生产日期" width="250" align="center">
+          <el-table-column label="生产日期" width="180" align="center">
             <template slot-scope="scope">
               <!--{{scope.row.product_date | parseTime("{y}-{m}-{d}")}}-->
               <el-date-picker
@@ -239,7 +240,7 @@
               ></el-date-picker>
             </template>
           </el-table-column>
-          <el-table-column label="有效日期" width="250" align="center">
+          <el-table-column label="有效日期" width="180" align="center">
             <template slot-scope="scope">
               <!--{{ scope.row.expiry_date | parseTime("{y}-{m}-{d}")}}-->
               <el-date-picker

src/xt_pages/stock/stockOutOrder.vue

@@ -275,7 +275,11 @@
             {{ scope.row.remark }}
           </template>
         </el-table-column>
-       
+        <el-table-column label="操作" align="center">
+          <template slot-scope="scope">
+            <span v-if="scope.row.is_sys == 1"  style="color: #589ff8" @click="GetOrderDetail(scope.row.id)">使用明细</span>
+          </template>
+        </el-table-column>
       </el-table>  
     
   </div>
@@ -379,7 +383,7 @@
 
             <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>
+              <div style="color: #589ff8" @click="GetOrderDetailThree(scope.row.id)">使用明细</div>
               </template>
             </el-table-column>
              
@@ -398,17 +402,17 @@
   <!-- 使用明细查询 -->
    <el-dialog
     title="出库单详情"
-    :visible.sync="editdialogVisible"
+    :visible.sync="editdialogVisibleTwo"
     width="80%">
     <span>
       <div class="filter-container">
         <span style="font-size: 18px;color: #606266">商品使用明细</span>
       </div>
      
-      <div class="cell clearfix">
+      <!-- <div class="cell clearfix">
         <span style="width: 300px;color: #606266">商品类型: {{type_name}} </span>
         <span style="width: 300px;color: #606266">规格名称: {{specification_name}}</span>
-      </div>
+      </div> -->
 
        <el-row :gutter="12" style="margin-top: 10px">
         <el-table :data="userList" :class="signAndWeighBoxPatients" style="width: 80%"
@@ -597,6 +601,74 @@
       </span>
   </el-dialog>
    
+  
+    <el-dialog
+      title="出库明细"
+      :visible.sync="editdialogVisibleTwo"
+      width="60%">
+      <span>
+         <div class="app-container">
+
+      <div class="filter-container">
+        <span style="font-size: 18px;color: #606266">商品使用明细</span>
+      </div>
+
+       <!-- <div class="cell clearfix">
+        <span style="width: 300px;color: #606266">商品类型: {{userList[0].type.type_name}} </span>
+        <span style="width: 300px;color: #606266">规格名称: {{userList[0].info.specification_name}}</span>
+      </div> -->
+
+      <el-row :gutter="12" style="margin-top: 10px">
+      <el-table :data="userList" :class="signAndWeighBoxPatients" style="width: 50%"
+              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>
+    </div>
+      </span>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="editdialogVisibleTwo = false">取 消</el-button>
+        <el-button type="primary" @click="editdialogVisibleTwo = false">确 定</el-button>
+      </span>
+    </el-dialog>
 
    <stock-in-dialog
         ref="dialog"
@@ -738,6 +810,9 @@ export default {
       good_type_id:"",
       tableShow:false,
       tableList:[],
+      dialogVisibleTwo:false,
+      userList:[],
+      editdialogVisibleTwo:false
     };
   },
   methods: {
@@ -1030,7 +1105,7 @@ export default {
             this.tableShow = true
             for (let i = 0; i < response.data.data.list.length; i++) {
               this.warehousingOutInfo.warehousingOutData.push(response.data.data.list[i])
-
+              console.log("表格00000000",this.tableList)
               this.tableList.push(response.data.data.list[i])
             }
             this.warehousingOutInfo.info = response.data.data.info
@@ -1105,10 +1180,10 @@ export default {
               is_total: 1,
               total: total,
             })
-            this.type_name = this.userList[0].type.type_name
-            this.specification_name = this.userList[0].info.specification_name
+            // 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
+            this.editdialogVisibleTwo = true
           }
         })
       },
@@ -1202,8 +1277,8 @@ export default {
             }
             this.warehouseOut = response.data.data.info
             this.warehouse_out_time = this.getTime(this.warehouseOut.warehouse_out_time, '{y}-{m}-{d}')
-            this.form.manufacturer = this.warehouseOut.manufacturer
-            this.form.dealer = this.warehouseOut.dealer
+            // this.form.manufacturer = this.warehouseOut.manufacturer
+            // this.form.dealer = this.warehouseOut.dealer
             this.editDialogVisible = true
           }
 
@@ -1427,6 +1502,9 @@ export default {
           }
         })
       }, 
+     
+     
+
   }
 };
 </script>

src/xt_pages/stock/stockOutOrderAdd.vue

@@ -45,7 +45,7 @@
           v-model="warehouse_out_time"
           prefix-icon="el-icon-date"
           :editable="false"
-          style="width: 196px;"
+          style="width: 200px;"
           type="date"
           placeholder="选择日期时间"
           align="right"
@@ -62,6 +62,7 @@
           filterable
           placeholder="请选择经销商"
           @change="changeDealer"
+          style="width: 200px;"
         >
           <el-option
             v-for="(option, index) in dealer"
@@ -81,6 +82,7 @@
           filterable
           placeholder="请选择厂商"
           @change="changeManufacturer"
+          style="width: 200px;"
         >
           <el-option
             v-for="(option, index) in manufacturer"
@@ -101,13 +103,13 @@
           max-height="450"
           :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }"
         >
-         <el-table-column width="150" align="center">
+         <el-table-column width="200" align="center">
             <template slot="header" slot-scope="scope">
               <span>耗材名称</span>
             </template>
 
             <template slot-scope="scope">
-              <el-form-item style="padding-top: 15px">
+              <el-form-item style="padding-top: 20px">
                 <el-autocomplete
                     class="checkSearch"
                     popper-class="my-autocomplete"
@@ -127,7 +129,7 @@
               </el-form-item>
             </template>
           </el-table-column>
-          <el-table-column  width="150" align="center">
+          <el-table-column  width="140" align="center">
             <template slot="header" slot-scope="scope">
               <span>耗材类型</span>
             </template>
@@ -135,7 +137,7 @@
             <template slot-scope="scope">
              
 
-              <el-form-item style="padding-top: 15px">
+              <el-form-item style="padding-top: 20px">
                 <el-input
                   placeholder="请输入商品类型"
                   v-model="scope.row.good_type_id"
@@ -146,12 +148,12 @@
           </el-table-column>
       
           
-          <el-table-column width="150" align="center">
+          <el-table-column width="140" align="center">
             <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-form-item style="padding-top: 20px">
                 <el-input v-model="scope.row.name"></el-input>
               </el-form-item>
             </template>
@@ -193,7 +195,7 @@
               <el-form-item
                 :prop="'recordData.' + scope.$index + '.price'"
                 :rules="tableRules.price"
-                style="padding-top: 17px"
+                style="padding-top: 20px"
               >
                 <el-input
                   placeholder="请输入单价"
@@ -206,7 +208,7 @@
 
 
 
-          <el-table-column label="总价"  width="150" align="center">
+          <el-table-column label="总价"  width="80" align="center">
             <template slot-scope="scope">
               {{ calculate(scope.row.price * scope.row.count) }}
             </template>
@@ -260,7 +262,7 @@
             </template>
           </el-table-column>
 
-          <el-table-column label="操作" align="center" min-width="20" width="150">
+          <el-table-column label="操作" align="center" min-width="150">
             <template slot-scope="scope">
               <el-tooltip
                 class="item"

src/xt_pages/stock/stockOutOrderEdit.vue

@@ -26,7 +26,7 @@
       <div class="cell clearfix">
         <label class="title"><span class="name">出库时间</span> : </label>
         <el-date-picker size="small" v-model="warehouse_out_time" prefix-icon="el-icon-date" :editable="false"
-                        style="width: 196px;"
+                        style="width: 200px;"
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
                         value-format="yyyy-MM-dd"></el-date-picker>
       </div>
@@ -34,7 +34,7 @@
 
       <div class="cell clearfix">
         <label class="title"><span class="name">经销商</span> : </label>
-        <el-select size="small" v-model="form.dealer" clearable placeholder="请选择经销商" @change="changeDealer">
+        <el-select size="small" v-model="form.dealer" clearable placeholder="请选择经销商" @change="changeDealer" style="width: 200px;">
           <el-option
             v-for="(option, index) in dealer"
             :key="index"
@@ -47,8 +47,7 @@
 
       <div class="cell clearfix">
         <label class="title"><span class="name">厂商</span> : </label>
-
-        <el-select size="small" v-model="form.manufacturer" clearable placeholder="请选择厂商" @change="changeManufacturer">
+        <el-select size="small" v-model="form.manufacturer" clearable placeholder="请选择厂商" @change="changeManufacturer" style="width: 200px;">
           <el-option
             v-for="(option, index) in manufacturer"
             :key="index"
@@ -64,13 +63,13 @@
         >
 
        
-          <el-table-column width="150" align="center">
+          <el-table-column width="200" align="center">
               <template slot="header" slot-scope="scope">
                 <span>耗材名称</span>
               </template>
 
               <template slot-scope="scope">
-                <el-form-item style="padding-top: 15px">
+                <el-form-item style="padding-top: 20px">
                   <el-autocomplete
                       class="checkSearch"
                       popper-class="my-autocomplete"
@@ -90,13 +89,13 @@
                 </el-form-item>
               </template>
             </el-table-column>
-           <el-table-column width="150" align="center">
+           <el-table-column width="140" align="center">
             <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-form-item style="padding-top: 20px">
                 <el-input
                   placeholder="请输入商品类型"
                   v-model="scope.row.good_type_id"
@@ -107,12 +106,12 @@
           </el-table-column>
           
              
-          <el-table-column width="150" align="center">
+          <el-table-column width="140" align="center">
             <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-form-item style="padding-top: 20px">
                 <el-input v-model="scope.row.name"></el-input>
               </el-form-item>
             </template>

src/xt_pages/stock/stockQuery.vue

@@ -62,7 +62,7 @@
           <el-button size="small" type="primary" @click="toPrint">打印</el-button>
         </div>
       </div>
-      
+
 
       <!-- <el-table
         :row-style="{ color: '#303133' }"
@@ -185,47 +185,42 @@
             {{scope.row.price}}
           </template>
         </el-table-column>
-        <el-table-column label="厂商">
+        <el-table-column label="厂商" align="center">
           <template slot-scope="scope">
            {{getManufacture(scope.row.manufacturer)}}
           </template>
         </el-table-column>
-       <el-table-column label="剩余库存量">
+       <el-table-column label="入库数量" align="center">
+         <template slot-scope="scope">
+          <span>{{getInCount(scope.row.good_id)}}</span>
+         </template>
+       </el-table-column>
+       <el-table-column label="出库数量" align="center">
+         <template slot-scope="scope">
+           <span>{{getOutCount(scope.row.good_id)+getAutoCount(scope.row.good_id)}}</span>
+
+         </template>
+       </el-table-column>
+      
+       <el-table-column label="剩余库存量" align="center">
          <template slot-scope="scope">
-          <span v-if="scope.row.stock_count!=0">{{scope.row.stock_count}}</span>
+           {{getInCount(scope.row.good_id)- getOutCount(scope.row.good_id) - getAutoCount(scope.row.good_id)}}
          </template>
        </el-table-column>
        <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="primary"
-                icon="el-icon-edit-outline"
                 @click="toClick(scope.row)"
-              >
+              >库存流水
               </el-button>
-            </el-tooltip>
-
-            <el-tooltip
-              class="item"
-              type="primary"
-              content="批次"
-              placement="top"
-            >
               <el-button
                 size="small"
                 type="primary"
-                icon="el-icon-edit-outline"
                 @click="toClickOne(scope.row)"
-              >
+              >批次
               </el-button>
-            </el-tooltip>
           </template>
         </el-table-column>
       </el-table>
@@ -252,7 +247,8 @@ import {
   GetAllGoodInfo,
   GetAllGoodType,
   getAllStockQueryList,
-  getAllStockList
+  getAllStockList,
+  getStockDrugCount
 } from "@/api/stock";
 
 export default {
@@ -262,6 +258,7 @@ export default {
     this.GetAllGoodInfo();
     this.GetAllGoodType();
     this.getlist()
+    this.getStockDrugCount()
   },
   components: {
     BreadCrumb
@@ -291,7 +288,10 @@ export default {
       type_name:0,
       types:[],
       tableList:[],
-      manufacturerList:[]
+      manufacturerList:[],
+      countList:[],
+      outCountList:[],
+      autoCountList:[],
     };
   },
   methods: {
@@ -305,7 +305,7 @@ export default {
         end_time:this.end_time,
         type_name:this.type_name,
       };
-     
+
       this.WarehouseInfo.loading = true;
       this.WarehouseInfo.warehouseInfoDate = [];
       getAllStockQueryList(Params).then(response => {
@@ -321,7 +321,7 @@ export default {
           }
         }
         console.log("数据源头",this.WarehouseInfo.warehouseInfoDate)
-         
+
          for(let i=0;i<this.WarehouseInfo.warehouseInfoDate.length;i++){
             this.WarehouseInfo.warehouseInfoDate[i].type_name = this.WarehouseInfo.warehouseInfoDate[i].type.type_name
 
@@ -349,7 +349,7 @@ export default {
 
 
          }
-        
+
         console.log("数据2222222",this.WarehouseInfo.warehouseInfoDate)
       });
     },
@@ -369,7 +369,7 @@ export default {
             this.goodType.push(response.data.data.goodType[i]);
             this.types.push(response.data.data.goodType[i])
           }
-          
+
           console.log("商品类型",this.types)
         }
       });
@@ -391,7 +391,7 @@ export default {
     },
     handleSizeChange(val) {
       this.limit = val;
-     
+
       this.getlist()
     },
     handleCurrentChange(val) {
@@ -403,7 +403,7 @@ export default {
     },
     startTimeChange: function(val) {
       var time = this.getTimestamp(val) - this.getTimestamp(this.end_time);
-      
+
       if (time > 0) {
         this.$message.error("开始时间不能大于结束时间");
         this.start_time = "";
@@ -421,7 +421,7 @@ export default {
         this.end_time = val
          this.getlist()
       }
-     
+
     },
     stockInCount: function(row) {
       let total = 0;
@@ -438,7 +438,7 @@ export default {
       return total;
     },
     stockOutCount: function(row) {
-      
+
       let total = 0;
       for (let i = 0; i < row.query_warehouseout_info.length; i++) {
         total = total + row.query_warehouseout_info[i].count;
@@ -461,13 +461,13 @@ export default {
     },
 
     exportList(){
-      
+
          import('@/vendor/Export2Excel').then(excel => {
          const tHeader = ['商品编码', '耗材名称', '耗材类型','规格型号','入库数量','进货价','入库退货','实际入库','出库数量','出库退库','实际出库','剩余库存']
-         const filterVal = ['good_code', 'good_name', 'type_name','specification_name','stockInCount','price','salesReturnCount','realCount','stockOutCount','cancelStockCount','realOutCount','overplus'] 
+         const filterVal = ['good_code', 'good_name', 'type_name','specification_name','stockInCount','price','salesReturnCount','realCount','stockOutCount','cancelStockCount','realOutCount','overplus']
          const data = this.formatJson(filterVal, this.WarehouseInfo.warehouseInfoDate)
          console.log("data",data)
-         
+
          excel.export_json_to_excel({
            header: tHeader,
            data,
@@ -484,16 +484,16 @@ export default {
       },
       toPrint(){
         this.$router.push("/stock/stockprint?start_time="+this.start_time+"&end_time="+this.end_time+"&keyword="+this.keywords+"&type_name="+this.type_name+"&page="+this.page+"&limit="+this.limit)
-        
+
       },
 
       getUnit(id){
-        
+
         var name = ""
         for(let i=0;i<this.$store.getters.good_unit.length;i++){
            if(id == this.$store.getters.good_unit[i].id){
               name = this.$store.getters.good_unit[i].name
-           } 
+           }
         }
         return name
       },
@@ -548,7 +548,54 @@ export default {
     },
     toClickOne(val){
       this.$router.push({path:"/stock/in/stockbatchnumber?id="+val.good_id+"&good_name="+val.good_name})
-    }
+    },
+    getStockDrugCount(){
+        var params ={
+          keywords: this.keywords,
+          start_time:this.start_time,
+          end_time:this.end_time,
+        }
+      getStockDrugCount(params).then(response=>{
+         if(response.data.state == 1){
+           var count = response.data.data.count
+           console.log("入库统计",count)
+           this.countList = count
+           var outlist = response.data.data.outList
+           console.log("出库数量",outlist)
+           this.outCountList = outlist
+           var autoCount = response.data.data.autoCount
+           console.log("autoCount",autoCount)
+           this.autoCountList = autoCount
+         }
+      })
+    },
+    getInCount(id){
+      var count= ""
+     for(let i=0;i<this.countList.length;i++){
+      if(id == this.countList[i].good_id){
+          count = this.countList[i].count
+      }
+     }
+     return count
+    },
+    getOutCount(id){
+      var count = ""
+      for(let i=0;i<this.outCountList.length;i++){
+         if(id == this.outCountList[i].good_id){
+           count = this.outCountList[i].count
+         }
+      }
+      return count
+    },
+   getAutoCount(id){
+     var count= ""
+     for(let i=0;i<this.autoCountList.length;i++){
+       if(id == this.autoCountList[i].good_id){
+         count = this.outCountList[i].count
+       }
+     }
+     return count
+   }
   }
 };
 </script>