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

@@ -469,3 +469,27 @@ export function getStockOutList(params) {
     params: params
   })
 }
+
+export function getDrugCountList(params) {
+  return request({
+    url: '/api/drug/getdrugcountlist',
+    method: 'get',
+    params: params
+  })
+}
+
+export function getSinleOrderDetail(params) {
+  return request({
+    url: '/api/drug/getsingleorderdetail',
+    method: 'get',
+    params: params
+  })
+}
+
+export function getAutoDrugDetail(params) {
+  return request({
+    url: '/api/drug/getautodrugdetial',
+    method: 'Get',
+    params: params
+  })
+}

src/api/patient.js

@@ -70,7 +70,6 @@ export function createPatientDialysisSolution(id, solution, mode) {
 }
 
 export function editPatientDialysisSolution(patient, id, solution, mode) {
-  
   return request({
     url: '/api/patients/dialysissolution/edit?patient=' + patient + '&id=' + id + '&mode=' + mode,
     method: 'put',
@@ -158,18 +157,17 @@ export function getCourseOfDiseaseRecords(patient_id, start_time_ymd, end_time_y
 }
 
 export function createCourseOfDiseaseRecord(patient_id, content, record_time, title) {
-  
   var params = {
     patient_id: patient_id,
     content: content,
     record_time: record_time,
     title: title
   }
-  console.log("params222222",params)
+  console.log('params222222', params)
   return request({
     url: '/api/patient/course/create',
-    method: 'post',
-    data: params
+    method: 'get',
+    params: params
   })
 }
 
@@ -185,8 +183,8 @@ export function modifyCourseOfDiseaseRecord(patient_id, content, record_time, id
   }
   return request({
     url: '/api/patient/course/modify',
-    method: 'post',
-    data: params
+    method: 'get',
+    params: params
   })
 }
 
@@ -376,7 +374,6 @@ export function modifyDryWeightData(params) {
 }
 
 export function deleteDryWeight(id, data) {
- 
   return request({
     url: '/api/patient/deletedryweight?id=' + id,
     method: 'delete',
@@ -384,102 +381,90 @@ export function deleteDryWeight(id, data) {
   })
 }
 
-
-export function saveVasularAccess(params){
-   
+export function saveVasularAccess(params) {
   return request({
-    url:"/api/patient/savevasularaccess",
-    method:"Get",
-    params:params
+    url: '/api/patient/savevasularaccess',
+    method: 'Get',
+    params: params
   })
-} 
+}
 
-export function getAllVascularAccessList(params){
-  
+export function getAllVascularAccessList(params) {
   return request({
-    url:"/api/patient/getallvascualraccesslist",
-    method:"Get",
-    params:params
+    url: '/api/patient/getallvascualraccesslist',
+    method: 'Get',
+    params: params
   })
 }
 
-export function getVascularAccessByDetail(id,params){
-  
+export function getVascularAccessByDetail(id, params) {
   return request({
-    url:"/api/patient/getvascularaccessbydetial?id="+id,
-    method:"get",
-    params:params,
+    url: '/api/patient/getvascularaccessbydetial?id=' + id,
+    method: 'get',
+    params: params
   })
 }
 
-export function updatedVasularAccess(params){
-  
+export function updatedVasularAccess(params) {
   return request({
-    url:"/api/patient/updatevasularaccess",
-    method:"get",
-    params:params
+    url: '/api/patient/updatevasularaccess',
+    method: 'get',
+    params: params
   })
 }
 
-export function DeleteVascularAccess(id,params){
-  
+export function DeleteVascularAccess(id, params) {
   return request({
-    url:"/api/patient/deletevascularaccess?id="+id,
-    method:"get",
-    params:params
+    url: '/api/patient/deletevascularaccess?id=' + id,
+    method: 'get',
+    params: params
   })
 }
 
-export function savePasswayAssessment(params){
-  
+export function savePasswayAssessment(params) {
   return request({
-    url:"/api/patient/savepasswayassessment",
-    method:"get",
-    params:params
+    url: '/api/patient/savepasswayassessment',
+    method: 'get',
+    params: params
   })
 }
 
-export function getAllPassWayAssessmentList(params){
-  
+export function getAllPassWayAssessmentList(params) {
   return request({
-    url:"/api/patient/getallpasswayassessment",
-    method:"get",
-    params:params
+    url: '/api/patient/getallpasswayassessment',
+    method: 'get',
+    params: params
   })
 }
 
-export function getPassWayAssessmentById(id,params){
-  
+export function getPassWayAssessmentById(id, params) {
   return request({
-    url:"/api/patient/getpasswayassmentbyid?id="+id,
-    method:"Get",
-    params:params,
+    url: '/api/patient/getpasswayassmentbyid?id=' + id,
+    method: 'Get',
+    params: params
   })
 }
 
-export function updatePasswayAssessment(params){
-  
+export function updatePasswayAssessment(params) {
   return request({
-    url:"/api/patient/updatepasswayassesment",
-    method:"get",
-    params:params
+    url: '/api/patient/updatepasswayassesment',
+    method: 'get',
+    params: params
   })
 }
 
-export function DeletePassWayAssessMent(id,params){
-  
+export function DeletePassWayAssessMent(id, params) {
   return request({
-    url:"/api/patient/deletepasswayassessment?id="+id,
-    method:"get",
-    params:params
+    url: '/api/patient/deletepasswayassessment?id=' + id,
+    method: 'get',
+    params: params
   })
 }
 
-export function getAccessList(params){
-  
+export function getAccessList(params) {
   return request({
-    url:"/api/patient/getaccesslist",
-    method:"get",
-    params:params
+    url: '/api/patient/getaccesslist',
+    method: 'get',
+    params: params
   })
-}
+}

src/api/stock.js

@@ -633,3 +633,19 @@ export function getStockDrugCount(params) {
     params: params
   })
 }
+
+export function getOrderDetailByOrderId(params) {
+  return request({
+    url: '/api/good/getorderdetialbyorderid',
+    method: 'get',
+    params: params
+  })
+}
+
+export function getOrderDetailById(params) {
+  return request({
+    url: '/api/good/getorderdetaibyid',
+    method: 'Get',
+    params: params
+  })
+}

src/router/modules/drugs.js

@@ -199,6 +199,15 @@ export default {
       hidden: true,
       is_menu: false,
       meta: { title: 'stockBatchNumber' }
+    },
+    {
+      path: '/drug/out/drugstockoutorderedit',
+      component: () => import('@/xt_pages/stock/drugs/drugStockOutOrderEdit'),
+      name: 'drugStockOutOrderEdit',
+      hidden: true,
+      is_menu: false,
+      meta: { title: 'drugStockOutOrderEdit' }
+
     }
 
   ]

src/router/modules/selfPreparedMedicine.js

@@ -21,30 +21,30 @@ export default {
     },
 
     {
-        path: '/stock/selfPreparedMedicineIndex',
-        component: () => import('@/xt_pages/stock/selfPreparedMedicine/index'),
-        name: 'selfPreparedMedicineIndex',
-        meta: { title: 'selfPreparedMedicineIndex', noCache: true }
+      path: '/stock/selfPreparedMedicineIndex',
+      component: () => import('@/xt_pages/stock/selfPreparedMedicine/index'),
+      name: 'selfPreparedMedicineIndex',
+      meta: { title: 'selfPreparedMedicineIndex', noCache: true }
     },
     {
-        path: '/stock/selfPreparedMedicineQuery',
-        component: () => import('@/xt_pages/stock/selfPreparedMedicine/query'),
-        name: 'selfPreparedMedicineQuery',
-        meta: { title: 'selfPreparedMedicineQuery', noCache: true }
+      path: '/stock/selfPreparedMedicineQuery',
+      component: () => import('@/xt_pages/stock/selfPreparedMedicine/query'),
+      name: 'selfPreparedMedicineQuery',
+      meta: { title: 'selfPreparedMedicineQuery', noCache: true }
     },
     {
-        path: '/stock/selfPreparedMedicineQueryPrint',
-        component: () => import('@/xt_pages/stock/selfPreparedMedicine/queryPrint'),
-        name: 'selfPreparedMedicineQueryPrint',
-        hidden: true,
-        is_menu: false,
-        meta: { title: 'selfPreparedMedicineQueryPrint', noCache: true }
+      path: '/stock/selfPreparedMedicineQueryPrint',
+      component: () => import('@/xt_pages/stock/selfPreparedMedicine/queryPrint'),
+      name: 'selfPreparedMedicineQueryPrint',
+      hidden: true,
+      is_menu: false,
+      meta: { title: 'selfPreparedMedicineQueryPrint', noCache: true }
     },
     {
-        path: '/stock/selfPreparedMedicineInfo',
-        component: () => import('@/xt_pages/stock/selfPreparedMedicine/info'),
-        name: 'selfPreparedMedicineInfo',
-        meta: { title: 'selfPreparedMedicineInfo', noCache: true }
+      path: '/stock/selfPreparedMedicineInfo',
+      component: () => import('@/xt_pages/stock/selfPreparedMedicine/info'),
+      name: 'selfPreparedMedicineInfo',
+      meta: { title: 'selfPreparedMedicineInfo', noCache: true }
     },
     {
       path: '/stock/stockprint',
@@ -53,40 +53,40 @@ export default {
       hidden: true,
       is_menu: false,
       meta: { title: 'stockprint', noCache: true }
-     },
-     {
-       path:"/stock/selfstockprint",
-       component:()=>import('@/xt_pages/stock/selfStockPrint'),
-       name:'selfStockQuery',
-       hidden:true,
-       is_menu:false,
-       meta:{title:'selfStockPrint',noCache:true}
-     },
+    },
+    {
+      path: '/stock/selfstockprint',
+      component: () => import('@/xt_pages/stock/selfStockPrint'),
+      name: 'selfStockQuery',
+      hidden: true,
+      is_menu: false,
+      meta: { title: 'selfStockPrint', noCache: true }
+    },
 
-     {
+    {
       path: '/stock/stockprint',
       component: () => import('@/xt_pages/stock/stockPrint'),
       name: 'stockqueryprint',
       hidden: true,
       is_menu: false,
       meta: { title: 'stockprint', noCache: true }
-     },
+    },
 
-     {
+    {
       path: '/stock/in/detail/print',
       component: () => import('@/xt_pages/stock/stockInOrderDetailPrint'),
       name: 'stockInDetailPrint',
       hidden: true,
       is_menu: false,
-      meta: { title: 'stockInDetailPrint',noCache: true }
+      meta: { title: 'stockInDetailPrint', noCache: true }
     },
     {
-      path: '/stock/out/detail',
+      path: '/stock/out/detail/print',
       component: () => import('@/xt_pages/stock/stockOutOrderDetailPrint'),
       name: 'stockOutDetailPrint',
       hidden: true,
       is_menu: false,
-      meta: { title: 'stockOutDetailPrint',noCache: true }
-    },
+      meta: { title: 'stockOutDetailPrint', noCache: true }
+    }
   ]
 }

src/xt_pages/data/components/addDrugs.vue

@@ -757,6 +757,17 @@
           if(unitArr.indexOf(this.form.drug_dose_unit) == -1){
             this.form.drug_dose_unit = ''
           }
+          if(obj.dose_unit == obj.min_unit){
+            this.dosageShow = true
+          }else{
+            this.dosageShow = false
+          }
+
+          if(obj.min_unit == obj.max_unit){
+            this.minNumberShow = true
+          }else{
+            this.minNumberShow = false
+          }
 
         }
         this.getAdviceConfig()

src/xt_pages/data/components/addInspection.vue

@@ -313,7 +313,7 @@
             this.projectList[i].number =  this.projectList[i].number.toString()
             this.tableData.push(this.projectList[i])
             this.form.project_detail = ""
-            this.form.number = ""
+            this.form.number = 1
           }
         }
         // console.log("33333",this.tableData)

src/xt_pages/data/components/consumables.vue

@@ -105,7 +105,7 @@
           {{ getGoodUnit(scope.row.good_unit) }}
         </template>
       </el-table-column> -->
-      <el-table-column label="零售价" width="60" align="center">
+      <el-table-column label="零售价" width="100" align="center">
         <template slot-scope="scope">
           {{ scope.row.retail_price }}
         </template>
@@ -124,18 +124,18 @@
 
       </el-table-column>
 
-      <el-table-column prop="date" label="操作" width="300" align="center">
+      <el-table-column prop="date" label="操作" width="320" align="center">
         <template slot-scope="scope">
           <el-button @click="handleGoodInfoEdit(scope.$index, scope.row)" type="primary" size="small">编辑</el-button>
           <!--<el-button type="primary" size="small" @click="clickSelfPayment(scope.row.id)">自付比例</el-button>-->
           <el-button type="danger" size="small" @click="handleGoodInfoDelete(scope.$index, scope.row)">删除</el-button>
 
-          <el-button type="primary" size="small" icon="el-icon-refresh-left" @click="toReturn(scope.row.id,scope.row.is_mark)" v-if="$store.getters.xt_user.org_id == 9504 || $store.getters.xt_user.org_id == 10028 || $store.getters.xt_user.org_id == 10138">
+          <el-button type="primary" size="small" @click="toReturn(scope.row.id,scope.row.is_mark)" v-if="$store.getters.xt_user.org_id == 9504 || $store.getters.xt_user.org_id == 10028 || $store.getters.xt_user.org_id == 10138">
              <span v-if="scope.row.is_mark == 0">备案</span>
              <span v-if="scope.row.is_mark == 1">撤销</span>
           </el-button>
 
-          <el-button type="primary" size="small" icon="el-icon-refresh-left" v-if="$store.getters.xt_user.org_id != 9504 && $store.getters.xt_user.org_id != 10028">
+          <el-button type="primary" size="small" v-if="$store.getters.xt_user.org_id != 9504 && $store.getters.xt_user.org_id != 10028">
             <span v-if="scope.row.is_mark == 0 || scope.row.is_mark == 2"  @click="putOnRecord(scope.row.id)" >目录对照</span>
             <span v-if="scope.row.is_mark == 1"  @click="putOnUnRecord(scope.row.id)" >撤消对照</span>
           </el-button>

src/xt_pages/data/components/drugs.vue

@@ -17,7 +17,7 @@
             :value="item.id">
           </el-option>
         </el-select>
-        <label class="title"><span class="name">是否收费</span> : </label>
+        <label class="title"><span class="name">是否备案</span> : </label>
         <el-select v-model="is_charge" style="width:140px;margin-right:10px;" placeholder="请选择" @change="changeCharge">
           <el-option
             v-for="item in options"
@@ -76,15 +76,17 @@
        ></el-table-column>
       <el-table-column type="index" label="序号" width="60px" align="center"></el-table-column>
 
-      <el-table-column prop="date" label="药品名称" align="center" width="100">
+      <el-table-column prop="date" label="药品名称" align="center" >
         <template slot-scope="scope">
           <div>{{scope.row.drug_name}}</div>
         </template>
       </el-table-column>
-      <el-table-column prop="date" label="单位&规格" width="120" align="center">
+      <el-table-column prop="date" label="单位&规格" align="center">
         <template slot-scope="scope">
           <!-- <div>{{scope.row.drug_spec}}</div> -->
-          <div>{{scope.row.dose}}{{scope.row.dose_unit}}&nbsp;* &nbsp;{{scope.row.min_number}}{{scope.row.min_unit}}/{{scope.row.max_unit}}</div>
+          <div>
+            <span v-if="scope.row.min_unit != scope.row.dose_unit">{{scope.row.dose}}{{scope.row.dose_unit}}&nbsp;* &nbsp;</span>{{scope.row.min_number}}{{scope.row.min_unit}}/{{scope.row.max_unit}}
+          </div>
         </template>
       </el-table-column>
       <!-- <el-table-column prop="date" label="最大单位" width="60" align="center">
@@ -97,12 +99,12 @@
           <div>{{scope.row.min_unit}}</div>
         </template>
       </el-table-column> -->
-      <el-table-column prop="date" label="进货价" width="60" align="center">
+      <el-table-column prop="date" label="进货价" width="100" align="center">
         <template slot-scope="scope">
           <div>{{scope.row.last_price}}</div>
         </template>
       </el-table-column>
-      <el-table-column label="零售价" width="60" align="center">
+      <el-table-column label="零售价" width="100" align="center">
         <template slot-scope="scope">
           <div>{{scope.row.retail_price}}</div>
         </template>

src/xt_pages/data/components/inspection.vue

@@ -37,7 +37,7 @@
                    {{scope.row.wubi}}
                 </template>
             </el-table-column>
-            <el-table-column label="价格" width="60" align="center">
+            <el-table-column label="价格" width="100" align="center">
                 <template slot-scope="scope">
                    {{scope.row.price}}
                 </template>

src/xt_pages/data/components/project.vue

@@ -228,7 +228,6 @@ export default {
               label: '未备案'
           }],
           is_mark:"",
-          limit:100,
           page:1,
           departMentList:[],
            dialogVisible:false,

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

@@ -24,33 +24,7 @@
       </div>
 
 
-      <!--<el-table-->
-      <!--:header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }"-->
-      <!--:data="other_doctor_advices"-->
-      <!--border-->
-      <!--style="width: 100%"-->
-      <!--ref="advices_list"-->
-      <!--@row-click="cellMouseEnter"-->
-      <!--:row-class-name="tableRowClassName"-->
-      <!--:span-method="objectSpanMethod"-->
-      <!--:cell-class-name="adviceNameShow"-->
-      <!--:modal-append-to-body="false"-->
-      <!--highlight-current-row-->
-      <!--@current-change="handleCurrentChange"-->
-      <!--&gt;-->
-
-      <!--<el-table-column prop="advice_name" min-width="50px" label="医嘱内容" align="center">-->
-      <!--<template slot-scope="scope">-->
-      <!--<span class="el-dropdown-link">-->
-      <!--{{ getAdviceContent(scope.row, 1)-->
-      <!--}}-->
-      <!--<i class="el-icon-arrow-down el-icon&#45;&#45;right"></i>-->
-      <!--</span>-->
-      <!--</template>-->
-      <!--</el-table-column>-->
-
-
-      <!--</el-table>-->
+      
       <el-form
         ref="adForm"
         :rules="adRules"

src/xt_pages/dialysis/details/dialog/adviceDialog/AddGroupAdvice.vue

@@ -693,13 +693,17 @@ export default {
             adviceNames: [],
             advice_doctor: this.groupForm.advice_doctor,
             remark: this.groupForm.remark,
-            parent_id: this.groupForm.parent_id
+            parent_id: this.groupForm.parent_id,
+            id:this.groupForm.id,
           };
          
           var adviceNames = [];
           for (const index in this.groupForm.adviceNames) {
             adviceNames.unshift(this.groupForm.adviceNames[index]);
           }
+          for(let i=0;i<adviceNames.length;i++){
+            adviceNames[i].template_id = "888888888"
+          }
           submitForm.adviceNames = adviceNames;
           let mode = "1";
           
@@ -729,7 +733,7 @@ export default {
              }
           }
           console.log("2222",submitForm)
-          
+  
           CreateGroupAdvice(this.patientID, 0, submitForm, mode).then(
             response => {
               if (response.data.state == 0) {
@@ -1684,6 +1688,7 @@ export default {
   created(){
     //获取自备药
     this.getSelfMedicalList()
+    console.log("模板数据",this.adviceTemplates)
   }
 };
 </script>

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

@@ -1837,8 +1837,12 @@
         // 入口
         var pre = pre
         this.dialysisPrescription.mode_id = this.$route.query.mode_id ? this.$route.query.mode_id : this.mode_id
+        if(pre.id > 0){
+          this.dialysisPrescription.mode_id = pre.mode_id
+        }
         console.log('this.dialysisPrescription.mode_id',this.dialysisPrescription.mode_id)
-        if (pre.mode_id == 2 || pre.mode_id == 5 || pre.mode_id == 12 || this.schedual.mode_id == 2 || this.schedual.mode_id == 5 || this.schedual.mode_id == 12) {
+        console.log('this.schedual',schedual.mode_id)
+        if (pre.mode_id == 2 || pre.mode_id == 5 || pre.mode_id == 12 || schedual.mode_id == 2 || schedual.mode_id == 5 || schedual.mode_id == 12) {
           this.zhiShow = true
           this.huShow = true
           this.totalShow = true

src/xt_pages/dialysis/template/DialysisPrintOrderThirtyEight.vue

@@ -112,6 +112,7 @@
           <div class="widthLength25">实际进食量：{{ afterdialysis.dialysis_during ? afterdialysis.dialysis_during : '' }} g</div>
           <div class="widthLength25">透后体重：{{ afterdialysis.weight_after ? afterdialysis.weight_after : "" }} Kg</div>
           <div class="widthLength25">脉搏：{{ afterdialysis.weight_after ? afterdialysis.weight_after : "" }} 次/分</div>
+          <div class="widthLength25"></div>
       </div>
       <div class="lineHeight">治疗方案：</div>
       <div class="lineHeight">
@@ -297,7 +298,7 @@
             <td>&nbsp;{{ monitor.transmembrane_pressure ? monitor.transmembrane_pressure : "" }}</td>
             <td>&nbsp;{{ monitor.ultrafiltration_rate ? monitor.ultrafiltration_rate : "" }}</td>
             <td>&nbsp;{{ monitor.ultrafiltration_volume ? monitor.ultrafiltration_volume : "" }}</td>
-            <td>&nbsp;{{ monitor.complication ? monitor.complication : "" }}</td>
+            <td>&nbsp;{{ monitor.complication ? getComplication(monitor.complication) : "" }}</td>
             <td style="text-align:left;padding-left:10px;">
               <div v-if="monitor.operate_time" style="line-height:20px;text-align: left;display: inline-block;">
                 {{ monitor.dispose ? monitor.dispose : '无' }}
@@ -328,7 +329,7 @@
           <div class="widthLength25">实际治疗时长：{{ afterdialysis.actual_treatment_hour ? afterdialysis.actual_treatment_hour : 0 }}小时
             {{ afterdialysis.actual_treatment_minute ? afterdialysis.actual_treatment_minute : 0 }}分钟
           </div>
-          <div class="widthLength25">静脉管道：
+          <!-- <div class="widthLength25">静脉管道：
             <span v-if="afterdialysis.intravenous_tube == 1">0级</span>
             <span v-if="afterdialysis.intravenous_tube == 2">I级</span>
             <span v-if="afterdialysis.intravenous_tube == 3">Ⅱ级</span>
@@ -339,8 +340,10 @@
             <span v-if="afterdialysis.arterial_tube == 2">I级</span>
             <span v-if="afterdialysis.arterial_tube == 3">Ⅱ级</span>
             <span v-if="afterdialysis.arterial_tube == 4">Ⅲ级</span>
-          </div>
+          </div> -->
           <div class="widthLength25">透析器凝血：{{ afterdialysis.cruor ? afterdialysis.cruor : "" }}</div>
+          <div class="widthLength25"></div>
+          <div class="widthLength25"></div>
           
       </div>
       <div class="lineHeight">
@@ -568,10 +571,20 @@ export default {
         finish_nurse: "",
         url: ""
       },
-      displaceLiquiPartOptions: []
+      displaceLiquiPartOptions: [],
+      complicationList:[]
     };
   },
   methods: {
+    getComplication(id){
+      var name = "";
+      for(let i=0;i<this.complicationList.length;i++){
+         if(id == this.complicationList[i].id){
+            name = this.complicationList[i].name
+         }
+      }
+      return name
+    },
     getDisplaceLiquiPart: function(val) {
       let displace_liqui_part_name = "/";
       const displace_liqui_part = this.displaceLiquiPartOptions;
@@ -722,7 +735,7 @@ export default {
           this.assessmentafter = response.data.data.assessmentAfterDislysis;
           console.log("上次透后体重", this.assessmentafter);
           var doctorAdevieInfo = response.data.data.doctorAdevieInfo;
-          var doctorAdevieInfo = response.data.data.advices;
+          var doctorAdevieInfo = JSON.parse(JSON.stringify(response.data.data.advices))
           var tableAdvice = doctorAdevieInfo;
           console.log("医生", tableAdvice);
           if (tableAdvice.length === 0) {
@@ -1274,6 +1287,7 @@ export default {
     this.lapse_arr = getDataConfig("hemodialysis", "lapse");
     this.displaceLiquiPartOptions = this.$store.getters.displace_liqui;
     // this.bloodAccessParOpera = getDataConfig('hemodialysis', 'vascular_access_desc')
+    this.complicationList = getDataConfig('hemodialysis','complication')
 
     var bloodAccessParOpera = getDataConfig(
       "hemodialysis",

src/xt_pages/dialysis/template/DialysisPrintOrderThirtyFive.vue

@@ -1367,7 +1367,7 @@ export default {
           if (patientInfo.gender === 2) {
             patientInfo.gender = "女";
           }
-          console.log("patientInfo", patientInfo);
+          // console.log("patientInfo", patientInfo);
           this.patientInfo = patientInfo;
           this.patientInfo.birth = uParseTime(
             this.patientInfo.birthday,

src/xt_pages/outpatientCharges/invoiceTemplate/printTwo.vue

@@ -9,17 +9,17 @@
             <div  style="position: absolute;top:40px;left:300px">{{ list.number }}</div>
             <div></div>
             <div>
-                <span style="position: absolute;left:590px;top:40px;">{{ printDate.slice(0,4) }}</span>
-                <span style="position: absolute;left:630px;top:40px;">{{ printDate.slice(5,7) }}</span>
-                <span style="position: absolute;left:690px;top:40px;">{{ printDate.slice(8,11) }}</span>
+                <span style="position: absolute;left:590px;top:40px;">{{ paramsObj.setl_time.split(' ')[0].slice(0,4) }}</span>
+                <span style="position: absolute;left:630px;top:40px;">{{ paramsObj.setl_time.split(' ')[0].slice(5,7) }}</span>
+                <span style="position: absolute;left:690px;top:40px;">{{ paramsObj.setl_time.split(' ')[0].slice(8,11) }}</span>
             </div>
         </div>
         <div style="display:flex;justify-content: space-between;">
             <div style="position: absolute;top:60px;left:120px;"> {{ paramsObj.name }}</div>
             <div style="position: absolute;top:60px;left:210px;">√</div>
             <!-- <div>{{ list.pay_way }}</div> -->
-            <div style="position: absolute;top:60px;left:460px;">{{ paramsObj.setl_time.split(' ')[0] }}</div>
-            <div style="position: absolute;top:60px;left:640px;">{{ paramsObj.setl_time.split(' ')[0] }}</div>
+            <div style="position: absolute;top:60px;left:460px;">{{ getTime(list.date, '{y}-{m}-{d}') }}</div>
+            <div style="position: absolute;top:60px;left:640px;">{{ getTime(list.date, '{y}-{m}-{d}') }}</div>
         </div>
         <div style="display:flex;justify-content: space-between;">
             <!-- <div>{{ paramsObj.gend == 1 ? '男' : '女' }}</div> -->
@@ -115,6 +115,7 @@
 
 <script>
 import { getInvoice } from '@/api/project/project'
+import { uParseTime } from '@/utils/tools'
 export default {
     props:{
         paramsObj:Object
@@ -202,6 +203,15 @@ export default {
             this.zhongwen =  str.replace(/零(仟|佰|拾|角)/g, "零").replace(/(零)+/g, "零").replace(/零(万|亿|元)/g, "$1").replace(/(亿)万|壹(拾)/g, "$1$2").replace(/^元零?|零分/g, "").replace(/元$/g, "元整");
             console.log(this.zhongwen)
         },
+        getTime(value, temp) {
+            if (value == 0) {
+                return ''
+            }
+            if (value != undefined) {
+                return uParseTime(value, temp)
+            }
+            return ''
+        },
 
     },
     watch:{

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -268,7 +268,10 @@
                                             <template slot-scope="scope">{{ scope.row.drug_name }}</template>
                                         </el-table-column>
                                         <el-table-column label="规格" width="60">
-                                            <template slot-scope="scope">{{ scope.row.drug_spec }}</template>
+                                            <template slot-scope="scope">
+                                              <!-- {{ scope.row.drug_spec }} -->
+                                              <span v-if="scope.row.min_unit != scope.row.dose_unit">{{scope.row.dose}}{{scope.row.dose_unit}}&nbsp;* &nbsp;</span>{{scope.row.min_number}}{{scope.row.min_unit}}/{{scope.row.max_unit}}
+                                            </template>
                                         </el-table-column>
                                         <el-table-column label="库存" width="60">
                                             <template slot-scope="scope">
@@ -283,7 +286,7 @@
                                             <template slot-scope="scope">{{ scope.row.retail_price }}</template>
                                         </el-table-column>
                                     </el-table>
-                                    <div>{{3*(2/3)}}</div>
+                                    <!-- <div>{{3*(2/3)}}</div> -->
                                 </div>
 
                             </el-tab-pane>
@@ -2598,6 +2601,7 @@
             this.curPrescriptions = this.prescriptions[i]
             this.$refs.multipleTable.clearSelection()
             this.$refs.tables.clearSelection()
+            this.clearSelection()
 
           }
         }

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -190,7 +190,7 @@
             <span slot="footer" class="dialog-footer">
         <el-button @click="centerDialogVisible = false">取 消</el-button>
         <el-button type="primary" @click="savePrint">确 定</el-button>
-      </span>。
+      </span>
         </el-dialog>
         <el-dialog
                 class="centerDialog"
@@ -437,10 +437,10 @@
             case 0:
               this.all_data = this.all_data_two
               break
-            case 1:
+            case 2:
               this.cure_data = this.cure_data_two
               break
-            case 2:
+            case 1:
               this.un_cure_data = this.un_cure_data_two
               break
           }
@@ -452,12 +452,13 @@
               for (let i = 0; i < this.all_data.length; i++) {
                 if (this.all_data[i].name.indexOf(this.search_input) != -1 || this.all_data[i].number.indexOf(this.search_input) != -1) {
                   arr = arr.concat(this.all_data[i])
+                  console.log(arr)
                 }
               }
               this.all_data = arr
 
               break
-            case 1:
+            case 2:
               let arr2 = []
               for (let i = 0; i < this.cure_data.length; i++) {
                 if (this.cure_data[i].name.indexOf(this.search_input) != -1 || this.cure_data[i].number.indexOf(this.search_input) != -1) {
@@ -467,7 +468,7 @@
               this.cure_data = arr2
 
               break
-            case 2:
+            case 1:
               let arr3 = []
               for (let i = 0; i < this.un_cure_data.length; i++) {
                 if (this.un_cure_data[i].name.indexOf(this.search_input) != -1 || this.un_cure_data[i].number.indexOf(this.search_input) != -1) {
@@ -3577,7 +3578,7 @@
           this.$refs.prescriptions.open(1, this.saveLoading)
         } else if (index == 2) {
 
-          this.getPrescriptionList(this.patientInfo.id)
+          this.getPrescriptionList(this.patientInfo.id,1)
           // this.$router.push("/outpatientDoctorStation/print?record="+this.record_date+"&prescription_id="+this.prescription_id)
         } else if (index == 3) {
           this.$refs.prescriptions.open(3)
@@ -3585,7 +3586,7 @@
           this.$refs.prescriptions.open(4)
         } else if (index == 6) {
           // this.$router.push("/outpatientDoctorStation/treatPrint?record="+this.record_date+"&prescription_id="+this.prescription_id)
-          this.getPrescriptionList(this.patientInfo.id)
+          this.getPrescriptionList(this.patientInfo.id,2)
           // this.$router.push("/outpatientDoctorStation/treatPrint?record="+this.record_date+"&prescription_id="+this.prescription_id)
 
         }
@@ -3626,15 +3627,20 @@
         this.prescription_id = data
       },
 
-      getPrescriptionList(id) {
+      getPrescriptionList(id,type) {
         getPrescriptionList(id,2).then(response => {
           if (response.data.state == 1) {
             this.centerDialogVisible = true
             var list = response.data.data.list
+            let arr = []
             for (let i = 0; i < list.length; i++) {
-              list[i].prescription_number = list[i].prescription_number + i
+              if(list[i].type == type){
+                list[i].prescription_number = list[i].prescription_number + i
+                arr.push(list[i])
+              }
+              
             }
-            this.tableData = list
+            this.tableData = arr
           }
         })
       },
@@ -3643,7 +3649,25 @@
       },
       handleClick() {
         if(this.titleType == "电子处方"){
-          this.getPatientInfo()
+          if(this.radio == 1){
+            this.un_cure_data.map(item => {
+              if(item.id == this.patientid){
+                this.getPatientInfo(item)
+              }
+            })
+          }else if(this.radio == 2){
+            this.cure_data.map(item => {
+              if(item.id == this.patientid){
+                this.getPatientInfo(item)
+              }
+            })
+          }else{
+            this.all_data.map(item => {
+              if(item.id == this.patientid){
+                this.getPatientInfo(item)
+              }
+            })
+          }
         }
 
       },

src/xt_pages/outpatientDoctorStation/prescriptionTemplate.vue

@@ -24,7 +24,7 @@
                               highlight-current-row
                               ref="tab">
                         <el-table-column prop="name" label="姓名">
-                            <template slot-scope="scope">{{scope.row.name}}</template>
+                            <template slot-scope="scope">{{scope.row.name}}（{{ scope.row.dialysis_no }}）</template>
                         </el-table-column>
                     </el-table>
                 </div>

src/xt_pages/outpatientDoctorStation/template/printThree.vue

@@ -35,7 +35,7 @@
               <div class="Rp">Rp:</div>
               <div class="drugsBox" v-for="(it,index) in item.advices.slice(pageIndex * 5,(pageIndex * 5) + item.pageArr[pageIndex])" :key="index">
                   <!-- <div class="drugsOne"><span style="font-weight:bold;">{{ index+1 + '.' }}</span>{{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 class="drugsOne"><span style="font-weight:bold;">{{ index+1 + '.' }}</span>{{it.advice_name?it.advice_name:""}}&nbsp;&nbsp;{{it.drug.drug_spec}}&nbsp;×&nbsp; {{it.prescribing_number}}{{it.prescribing_number_unit}}</div>
+                  <div class="drugsOne"><span style="font-weight:bold;">{{ index+1 + '.' }}</span>{{it.advice_name?it.advice_name:""}}&nbsp;&nbsp;<span v-if="it.drug.min_unit != it.drug.dose_unit">{{it.drug.dose}}{{it.drug.dose_unit}}&nbsp;* &nbsp;</span>{{it.drug.min_number}}{{it.drug.min_unit}}/{{it.drug.max_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}}&nbsp;{{it.delivery_way}}&nbsp;</span>&nbsp;&nbsp;<span>{{it.advice_desc}}</span></div>
               </div>
               <div class="drugsBox" v-for="(it,i) in item.additionalcharge" :key="i">
@@ -43,7 +43,7 @@
                </div>
                
               <div class="drugsBox" v-for="(it,index) in item.project" :key="index">
-                  <div class="drugsOne"><span style="font-weight:bold;">{{ index+1 + '.' }}</span>{{getProjectName(it.project_id)?getProjectName(it.project_id):""}}&nbsp;&nbsp;{{it.single_dose}}{{it.single_dose_unit}}&nbsp;×&nbsp; {{it.count}}{{unit}}</div>
+                  <div class="drugsOne"><span style="font-weight:bold;">{{ index+1 + '.' }}</span>{{ it.type == 2 ? it.project.project_name : it.good_info.good_name }}&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">

src/xt_pages/outpatientDoctorStation/treatTemplate/printTwo.vue

@@ -5,9 +5,9 @@
         <img src="../../../assets/img/bailinTop.jpg" style="width:100%" alt="">
         <div class="printTitle">治疗单</div>
         <div style="display:flex;">
-            <div style="width:33%;display:flex;">费别：<span class="under_line">深圳医保1档</span></div>
-            <div style="width:33%;display:flex;">电脑号：<span class="under_line">1111111</span></div>
-            <div style="width:33%;display:flex;">处方编号：<span class="under_line">8972392771</span></div>
+            <div style="width:33%;display:flex;">费别：<span class="under_line"></span></div>
+            <div style="width:33%;display:flex;">电脑号：<span class="under_line"></span></div>
+            <div style="width:33%;display:flex;">处方编号：<span class="under_line"></span></div>
         </div>
 
 
@@ -72,10 +72,10 @@
               <div class="Rp">Rp:</div>
               <div class="drugsBox" v-for="(it,index) in item.advices" :key="index">
                   <!-- <div class="drugsOne"><span style="font-weight:bold;">{{ index+1 + '.' }}</span>{{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 class="drugsOne"><span style="font-weight:bold;">{{ index+1 + '.' }}</span>{{it.advice_name?it.advice_name:""}}&nbsp;&nbsp;{{it.drug.drug_spec}}&nbsp;×&nbsp; {{it.prescribing_number}}{{it.prescribing_number_unit}}</div>
+                  <div class="drugsOne"><span style="font-weight:bold;">{{ index+1 + '.' }}</span>{{it.advice_name?it.advice_name:""}}&nbsp;&nbsp;<span v-if="it.drug.min_unit != it.drug.dose_unit">{{it.drug.dose}}{{it.drug.dose_unit}}&nbsp;* &nbsp;</span>{{it.drug.min_number}}{{it.drug.min_unit}}/{{it.drug.max_unit}}&nbsp;×&nbsp; {{it.prescribing_number}}{{it.prescribing_number_unit}}</div>
               </div>
               <div class="drugsBox" v-for="(it,index) in item.project" :key="index">
-                  <div class="drugsOne"><span style="font-weight:bold;">{{ index+1 + '.' }}</span>{{getProjectName(it.project_id)?getProjectName(it.project_id):""}}&nbsp;&nbsp;{{it.single_dose}}{{it.single_dose_unit}}&nbsp;×&nbsp; {{it.count}}{{unit}}</div>
+                  <div class="drugsOne"><span style="font-weight:bold;">{{ index+1 + '.' }}</span>{{ it.type == 2 ? it.project.project_name : it.good_info.good_name }}&nbsp;&nbsp;{{it.single_dose}}{{it.single_dose_unit}}&nbsp;×&nbsp; {{it.count}}{{unit}}</div>
               </div>
               <div style="text-align:center;" >(以下空白)</div>
         </div>

src/xt_pages/stock/Dialog/goodInfoDailog.vue

@@ -15,12 +15,6 @@
             <el-form-item label="耗材名称 : " prop="good_name" style="width:100%">
               <el-input v-model="form.good_name" placeholder="" maxlength="30"></el-input>
             </el-form-item>
-            <!-- <el-form-item label="拼音 : " prop="pinyin" style="width:50%">
-              <el-input v-model="form.pinyin" placeholder="" maxlength="30"></el-input>
-            </el-form-item>
-            <el-form-item label="五笔 : " prop="wubi" style="width:50%">
-              <el-input v-model="form.wubi" placeholder="" maxlength="30"></el-input>
-            </el-form-item> -->
             <el-form-item label="耗材种类 : " prop="good_kind">
               <el-select v-model="form.good_kind" style="width:160px;" placeholder="请选择">
                 <el-option
@@ -63,8 +57,8 @@
                 <el-form-item prop="min_number" class="noMargin">
                   <el-input v-model="form.min_number" :disabled="showMinNumber" style="width:100px" type="number" placeholder="拆零"> </el-input>
                 </el-form-item>
-                <!-- <el-form-item prop="min_unit" class="noMargin">
-                  <el-select v-model="form.min_unit" style="width:160px;"  placeholder="拆零单位"  @change="changeMinUnit">
+                <el-form-item prop="packing_unit" class="noMargin">
+                  <el-select v-model="form.packing_unit" style="width:160px;" placeholder="包装单位" @change="changePackingUnit">
                     <el-option
                       v-for="(item,index) in getDataConfig('hemodialysis','units')"
                       :key="index"
@@ -72,18 +66,7 @@
                       :value="item.name">
                     </el-option>
                   </el-select>
-              </el-form-item> -->
-
-              <el-form-item prop="packing_unit" class="noMargin">
-                <el-select v-model="form.packing_unit" style="width:160px;" placeholder="包装单位" @change="changePackingUnit">
-                  <el-option
-                    v-for="(item,index) in getDataConfig('hemodialysis','units')"
-                    :key="index"
-                    :label="item.name"
-                    :value="item.name">
-                  </el-option>
-                </el-select>
-              </el-form-item>
+                </el-form-item>
             </div>
 
             <el-form-item label="生产厂商 : " prop="manufacturer" style="width:100%">
@@ -110,9 +93,9 @@
             <el-form-item label="包装零售价 : " prop="retail_price">
               <el-input v-model="form.packing_price" style="width:160px;" placeholder="" maxlength="30"></el-input>
             </el-form-item>
-            <el-form-item label="拆零零售价 : " prop="retail_price">
+            <!-- <el-form-item label="拆零零售价 : " prop="retail_price">
               <el-input v-model="form.retail_price" style="width:160px;" placeholder="" maxlength="30"></el-input>
-            </el-form-item>
+            </el-form-item> -->
 
             <el-form-item label="进货价 : " prop="buy_price">
               <el-input v-model="form.buy_price" style="width:160px;" placeholder="" maxlength="30"></el-input>
@@ -366,7 +349,7 @@
           statistics_category: '',
           agent: '',
           good_status: '',
-          default_count: '',
+          default_count:1,
           sign: '',
           is_default: '',
           is_charge_use: '',
@@ -406,8 +389,6 @@
             { required: true, message: '请选择生产厂商', trigger: 'blur' }
           ], good_unit: [
             { required: true, message: '请选择单位', trigger: 'blur' }
-          ], retail_price: [
-            { required: true, message: '请输入零价', trigger: 'blur' }
           ], stock_warn_count: [
             { required: true, message: '请输入库存警戒', trigger: 'blur' }
           ],social_security_directory_code:[

src/xt_pages/stock/Dialog/goodTypeDialog.vue

@@ -71,7 +71,7 @@ export default {
       },
        out_stock: '1',
        stock_attribute:"1",
-       showAttribute:false
+       showAttribute:true
     };
   },
   props: {
@@ -89,13 +89,13 @@ export default {
   },
   methods: {
     show:function(val){
-      console.log("val22222222",this.formValue)
-      if(this.formValue.stock_attribute == "1"){
-        this.showAttribute = false
-      }
-      if(this.formValue.stock_attribute == "2" || this.formValue.stock_attribute =="3"){
-        this.showAttribute = true
-      }
+      // console.log("val22222222",this.formValue)
+      // if(this.formValue.stock_attribute == "1"){
+      //   this.showAttribute = false
+      // }
+      // if(this.formValue.stock_attribute == "2" || this.formValue.stock_attribute =="3"){
+      //   this.showAttribute = true
+      // }
    
       this.visibility = true
 

src/xt_pages/stock/drugs/drugStockFlow.vue

@@ -55,60 +55,62 @@
         :data="tableList"
         border
         style="width: 100%">
-        <el-table-column prop="date" label="序号" width="180">
+        <el-table-column prop="date" label="序号" width="180" align="center">
            <template  slot-scope="scope">
               {{scope.$index + 1}}
            </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">
-             <span v-if="scope.row.drug_way == 4">入库</span>
-             <span v-if="scope.row.drug_way == 2">出库</span>
+             <span v-if="scope.row.drug_way == 4">手动入库</span>
+             <span v-if="scope.row.drug_way == 2">手动出库</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">
              <span v-if="scope.row.drug_way == 2"> {{scope.row.warehouse_out_order_number}}</span>
              <span v-if="scope.row.drug_way == 4">{{scope.row.warehousing_order}}</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">
              {{getTime(scope.row.ctime)}}
            </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.drug_way == 4"> {{scope.row.warehouse_out_order_number}}</span>
-             <span v-if="scope.row.drug_way == 2">{{scope.row.warehousing_order}}</span>
+             <span v-if="scope.row.drug_way == 4"> {{scope.row.warehousing_count}}</span>
+             <span v-if="scope.row.drug_way == 2">{{scope.row.count}}</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">
-             <span v-if="scope.row.drug_way == 4"> {{scope.row.stock_max_numbe}}{{scope.row.max_unit}}{{scope.row.stock_min_number}}{{scope.row.min_unit}}</span>
-             <span v-if="scope.row.drug_way == 2">{{scope.row.count}}</span>
+             <!-- <span v-if="scope.row.drug_way == 4"> {{scope.row.stock_max_numbe}}{{scope.row.max_unit}}{{scope.row.stock_min_number}}{{scope.row.min_unit}}</span>
+             <span v-if="scope.row.drug_way == 2">{{scope.row.count}}</span> -->
+              {{getInCount(scope.row.drug_id) - getOutCount(scope.row.drug_id) - getAutoCount(scope.row.drug_id)}}
+             <span></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">
              <span v-if="scope.row.drug_way == 4"> {{scope.row.price}}</span>
              <span v-if="scope.row.drug_way == 2">{{scope.row.price}}</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">
              <span v-if="scope.row.drug_way == 4"> {{getTime(scope.row.expiry_date)}}</span>
              <span v-if="scope.row.drug_way == 2">{{getTime(scope.row.expiry_date)}}</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">
              <span v-if="scope.row.drug_way == 2"> {{scope.row.number}}</span>
              <span v-if="scope.row.drug_way == 4">{{scope.row.number}}</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">
              <span v-if="scope.row.drug_way == 4"> {{getManufacturer(scope.row.manufacturer)}}</span>
              <span v-if="scope.row.drug_way == 2">{{getManufacturer(scope.row.manufacturer)}}</span>
@@ -140,7 +142,7 @@
 <script>
   import { uParseTime } from '@/utils/tools'
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
-  import { getDrugStockFlow,getOutDrugStockFlow } from '@/api/drug/drug_stock'
+  import { getDrugStockFlow,getOutDrugStockFlow,getDrugCountList } from '@/api/drug/drug_stock'
   import SettingDialog from './settingDialog/index'
   import { getDictionaryDataConfig } from "@/utils/data";
   export default {
@@ -151,6 +153,7 @@
       this.drugTypeList = getDictionaryDataConfig('system','drug_type') 
       this.getlist()
       this.getOutList()
+      this.getDrugCountList()
     },
     components: {
       SettingDialog,
@@ -193,10 +196,13 @@
           {id:0,name:"全部"},
           {id:1,name:"手动出库"},
           {id:2,name:"自动出库"},
-          {id:3,name:"入库"},
+          {id:3,name:"手动入库"},
 
         ],
         outList:[],
+        countList:[],
+        outCountList:[],
+        autoCountList:[],
       }
     },
     methods:{
@@ -213,7 +219,7 @@
          getDrugStockFlow(params).then(response=>{
            if(response.data.state == 1){
             var list = response.data.data.list
-            console.log("入库数据",list)
+            console.log("入库数据0000",list)
             for(let i=0;i<list.length;i++){
                list[i].drug_way = 4
                this.tableList.push(list[i])
@@ -244,20 +250,17 @@
                   outList[i].drug_way = 2
                   this.tableList.push(outList[i])
                }
-              // for(let i=0;i<this.tableList.length;i++){
-              //   this.tableList[i].index = i+1
-              // }
               console.log("列表数据",this.tableList)
             }
          })
        },
        handleSizeChange(val) {
         this.limit = val
-        this.GetAllDrugStockQueryList()
+        this.getlist()
       },
       handleCurrentChange(val) {
         this.page = val
-        this.GetAllDrugStockQueryList()
+        this.getlist()
       },
         
     startTimeChange: function(val) {
@@ -267,7 +270,7 @@
         this.$message.error("开始时间不能大于结束时间");
         this.start_time = "";
       } else {
-        this.GetAllDrugStockQueryList();
+        this.getlist();
       }
     },
     endTimeChange: function(val) {
@@ -276,15 +279,14 @@
         this.$message.error("结束时间不能小于开始时间");
         this.end_time = "";
       } else {
-        this.GetAllDrugStockQueryList();
+        this.getlist();
       }
      },
-     changeDrug(){},
      getManufacturer(id){
        var name = ""
        for(let i=0;i<this.manufacturerList.length;i++){
          if(id == this.manufacturerList[i].id){
-            name = this.manufacturerList[i].name
+            name = this.manufacturerList[i].manufacturer_name
          }
        }
        return name
@@ -299,6 +301,78 @@
         return uParseTime(val, '{y}-{m}-{d}')
       }
      },
+    getDrugCountList(){
+         var params = {
+          keyword: this.keywords,
+          start_time:this.start_time,
+          end_time:this.end_time,
+         }
+      getDrugCountList(params).then(response=>{
+          if(response.data.state == 1){
+            var countlist =  response.data.data.countList
+            console.log("入库数据",countlist)
+            this.countList = countlist
+            var outcountlist = response.data.data.outCountList
+            console.log("出库数据",outcountlist)
+            this.outCountList = outcountlist
+            var aucountlist = response.data.data.auCountList
+            console.log("自动数据",aucountlist)
+            this.autoCountList = aucountlist
+          }
+        })
+      },
+      getInCount(id){
+        var count = ""
+        for(let i=0;i<this.countList.length;i++){
+           if(id == this.countList[i].drug_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].drug_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].drug_id){
+            count = this.autoCountList[i].count
+          }
+        }
+        return count
+      },
+      getTimestamp(time) { // 把时间日期转成时间戳
+        return (new Date(time)).getTime() / 1000
+      },
+      changeDrug(val){
+        
+        var arr = []
+        if(val == 3){
+          for(let i=0;i<this.tableList.length;i++){
+            if(this.tableList[i].drug_way == 4){
+
+              arr.push(this.tableList[i])
+            }
+          }
+          this.tableList = arr
+        }
+        if(val == 1){
+          for(let i=0;i<this.tableList.length;i++){
+            if(this.tableList[i].drug_way == 2){
+              arr.push(this.tableList[i])
+            }
+          }
+          this.tableList = arr
+        }
+      }
     }
   }
 </script>

src/xt_pages/stock/drugs/drugStockInOrder.vue

@@ -1,7 +1,6 @@
 <template>
   <div class="main-contain">
     <div class="position">
-      <!--<bread-crumb :crumbs='crumbs'></bread-crumb>-->
       <bread-crumb :crumbs="crumbs"></bread-crumb>
       <el-button
         size="small"
@@ -71,9 +70,8 @@
           @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="drugPrint()">打印</el-button>
       </div>
 
       <el-table
@@ -178,14 +176,91 @@
       <el-pagination
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
-        :page-sizes="[10, 50, 100]"
-        :page-size="10"
+        :page-sizes="[5, 10, 50, 100]"
+        :page-size="5"
         background
-        style="margin-top:20px;float: right"
+        style="margin-top:20px;text-align: right"
         layout="total, sizes, prev, pager, next, jumper"
         :total="total"
       >
       </el-pagination>
+      <el-table
+        v-show="showOne"
+        :data="WarehouseInfo.warehouseInfoDate"
+        :class="signAndWeighBoxPatients"
+        style="width: 100%;margin-top:10px;"
+        border
+        highlight-current-row
+        v-loading="Warehouse.loading"
+        ref="multipleTable"
+        @selection-change="select"
+        :row-style="{ color: '#303133' }"
+        :header-cell-style="{
+          backgroundColor: 'rgb(245, 247, 250)',
+          color: '#606266'
+        }"
+      >
+        <el-table-column label="药品名称" align="center">
+          <template slot-scope="scope">
+             {{scope.row.drug.drug_name}}
+          </template>
+        </el-table-column>
+        <el-table-column label="药品类型" align="center">
+          <template slot-scope="scope">
+              {{getDrugType(scope.row.drug.drug_type)}}
+          </template>
+        </el-table-column>
+        <el-table-column label="规格&单位" align="center">
+          <template slot-scope="scope">
+            {{scope.row.drug.dose}}&nbsp;{{scope.row.drug.dose_unit}}*{{scope.row.drug.min_number}}{{scope.row.drug.min_unit}}/{{scope.row.drug.max_unit}}
+          </template>
+        </el-table-column>
+        <el-table-column label="批号" align="center">
+          <template slot-scope="scope">
+            {{scope.row.number}}
+          </template>
+        </el-table-column>
+        <el-table-column label="入库数量" align="center">
+          <template slot-scope="scope">
+            {{scope.row.warehousing_count}}
+          </template>
+        </el-table-column>
+        <el-table-column label="进货价" align="center">
+          <template slot-scope="scope">
+            {{scope.row.price}}
+          </template>
+        </el-table-column>
+        <el-table-column label="总价" align="center">
+          <template slot-scope="scope">
+            {{scope.row.total_price}}
+          </template>
+        </el-table-column>
+        <el-table-column label="生产厂家" align="center">
+          <template slot-scope="scope">
+            {{getManufacturer(scope.row.drug.manufacturer)}}
+          </template>
+        </el-table-column>
+       <el-table-column label="生产日期" align="center">
+          <template slot-scope="scope">
+             {{getTime(scope.row.product_date)}}
+          </template>
+        </el-table-column>
+        <el-table-column label="有效日期" align="center">
+          <template slot-scope="scope">
+            {{getTime(scope.row.expiry_date)}}
+          </template>
+        </el-table-column>
+        <el-table-column label="批准文号" align="center">
+          <template slot-scope="scope">
+             {{scope.row.number}}
+          </template>
+        </el-table-column>
+        <el-table-column label="备注" align="center">
+          <template slot-scope="scope">
+            {{scope.row.remark}}
+          </template>
+        </el-table-column>
+      </el-table>
     </div>
 
 
@@ -287,104 +362,9 @@
     
 
 
-      <el-table
-        v-show="showOne"
-        :data="WarehouseInfo.warehouseInfoDate"
-        :class="signAndWeighBoxPatients"
-        style="width: 100%"
-        border
-        highlight-current-row
-        v-loading="Warehouse.loading"
-        ref="multipleTable"
-        @selection-change="select"
-        :row-style="{ color: '#303133' }"
-        :header-cell-style="{
-          backgroundColor: 'rgb(245, 247, 250)',
-          color: '#606266'
-        }"
-      >
-        <el-table-column align="center" type="selection" width="55">
-        </el-table-column>
-
-        <el-table-column label="药品名称" align="center">
-          <template slot-scope="scope">
-             {{scope.row.drug.drug_name}}
-          </template>
-        </el-table-column>
-
-        <el-table-column label="药品类型" align="center">
-          <template slot-scope="scope">
-              {{getDrugType(scope.row.drug.drug_type)}}
-          </template>
-        </el-table-column>
-
-        <el-table-column label="规格&单位" align="center">
-          <template slot-scope="scope">
-             {{scope.row.drug.dose}}&nbsp;{{scope.row.drug.dose_unit}}*{{scope.row.drug.min_number}}{{scope.row.drug.min_unit}}/{{scope.row.drug.max_unit}}
-          </template>
-        </el-table-column>
-       
-        <el-table-column label="批号" align="center">
-          <template slot-scope="scope">
-           {{scope.row.number}}
-          </template>
-        </el-table-column>
-        
-        <el-table-column label="入库数量" align="center">
-          <template slot-scope="scope">
-             {{scope.row.warehousing_count}}
-          </template>
-        </el-table-column>
-
-       <el-table-column label="进货价" align="center">
-          <template slot-scope="scope">
-            {{scope.row.price}}
-          </template>
-        </el-table-column>
-
-      
-       <el-table-column label="总价" align="center">
-          <template slot-scope="scope">
-             {{scope.row.total_price}}
-          </template>
-        </el-table-column>
       
 
-       <el-table-column label="生产厂家" align="center">
-          <template slot-scope="scope">
-             {{getManufacturer(scope.row.drug.manufacturer)}}
-          </template>
-        </el-table-column>
-
-
-       <el-table-column label="生产日期" align="center">
-          <template slot-scope="scope">
-             {{getTime(scope.row.product_date)}}
-          </template>
-        </el-table-column>
-       
-
-       <el-table-column label="有效日期" align="center">
-          <template slot-scope="scope">
-             {{getTime(scope.row.expiry_date)}}
-          </template>
-        </el-table-column>
-
-        <el-table-column label="批准文号" align="center">
-          <template slot-scope="scope">
-             {{scope.row.number}}
-          </template>
-        </el-table-column>
-
-
-        <el-table-column label="备注" align="center">
-          <template slot-scope="scope">
-            {{scope.row.remark}}
-          </template>
-        </el-table-column>
-      </el-table>
-
-      <el-pagination
+      <!-- <el-pagination
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
         :page-sizes="[10, 50, 100]"
@@ -394,7 +374,7 @@
         layout="total, sizes, prev, pager, next, jumper"
         :total="total"
       >
-      </el-pagination>
+      </el-pagination> -->
 
   </div>
 </template>
@@ -452,7 +432,7 @@ export default {
       searchKey: "",
       type: 1,
       page: 1,
-      limit: 10,
+      limit: 5,
       checked: false,
       total: 0,
       pageTotal: 0,
@@ -478,7 +458,8 @@ export default {
       dialogVisible:false,
       showOne:false,
       drugTypeList:[],
-      manufacturerList:[]
+      manufacturerList:[],
+      order_id:""
     };
   },
   methods: {
@@ -735,6 +716,8 @@ export default {
       }
     },
     select(selection) {
+      console.log("selection",selection)
+      this.order_id = selection[0].id
       this.selectedTableData = selection;
     },
     batchDelete() {
@@ -823,6 +806,14 @@ export default {
      getDictionaryDataConfig(module, filed_name) {
         return getDictionaryDataConfig(module, filed_name)
       },
+    drugPrint(){
+      if(this.order_id == 0){
+         this.$message.error("请选择入库单")
+      }else{
+        this.$router.push({path:"/stock/drugStockInOrderDetailPrint?id="+this.order_id})
+      }
+      
+    }
   }
 };
 </script>

src/xt_pages/stock/drugs/drugStockInOrderAdd.vue

@@ -87,7 +87,7 @@
                   >
                     <i class="el-icon-search el-input__icon" slot="suffix"></i>
                   <template slot-scope="{ item }">
-                    <div class="name">{{ item.drug_name }}</div>
+                    <div class="name">{{ item.drug_name + item.dose + "*"+ item.dose_unit +item.min_number + item.min_unit +"/" + item.max_unit}}</div>
                   </template>
                  </el-autocomplete>
               </el-form-item>
@@ -98,7 +98,7 @@
               <span>药品类型</span>
             </template>
              <template slot-scope="scope">
-               <el-select 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"
@@ -878,5 +878,8 @@
   .sign-and-weigh-box .sign-and-weigh-box-patients .current-row > td {
     background: #6fb5fa;
   }
+  .el-autocomplete-suggestion{
+    width: 400px !important;
+  }
 
 </style>

src/xt_pages/stock/drugs/drugStockInOrderDetailPrint.vue

@@ -2,7 +2,7 @@
   <div class="main-contain">
     <div class="position">
       <bread-crumb :crumbs='crumbs'></bread-crumb>
-      <el-button :loading="loading" size="small" icon="el-icon-printer" @click="printThisPage" type="primary">打印
+      <el-button  size="small" icon="el-icon-printer" @click="printThisPage" type="primary">打印
       </el-button>
     </div>
     <div class="app-container ">

src/xt_pages/stock/drugs/drugStockInOrderEdit.vue

@@ -128,7 +128,7 @@
                   >
                     <i class="el-icon-search el-input__icon" slot="suffix"></i>
                   <template slot-scope="{ item }">
-                    <div class="name">{{ item.drug_name }}</div>
+                    <div class="name">{{ item.drug_name + item.dose + "*"+ item.dose_unit +item.min_number + item.min_unit +"/" + item.max_unit}}</div>
                   </template>
                  </el-autocomplete>
               </el-form-item>

src/xt_pages/stock/drugs/drugStockOutOrder.vue

@@ -68,9 +68,8 @@
           @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
@@ -119,7 +118,7 @@
           </template>
         </el-table-column>
 
-        <el-table-column label="厂家" align="center">
+        <!-- <el-table-column label="厂家" align="center">
           <template slot-scope="scope">
             {{scope.row.manufacturers ? scope.row.manufacturers.manufacturer_name:''}}
           </template>
@@ -129,7 +128,7 @@
           <template slot-scope="scope">
             {{scope.row.dealers ? scope.row.dealers.dealer_name:''}}
           </template>
-        </el-table-column>
+        </el-table-column> -->
 
 
         <el-table-column label="操作" align="center" width="240">
@@ -185,110 +184,102 @@
       <el-pagination
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
-        :page-sizes="[10, 50, 100]"
-        :page-size="10"
+        :page-sizes="[5, 10, 50, 100]"
+        :page-size="5"
         background
-        style="margin-top:20px;float: right"
+        style="margin-top:20px;text-align: right"
         layout="total, sizes, prev, pager, next, jumper"
         :total="total"
       >
       </el-pagination>
-    </div>
-
-    <div v-show="tableShow" style="margin-bottom:10px">
-      <el-table
-        :data="tableList"
-        :class="signAndWeighBoxPatients"
-        style="width: 100%"
-        border
-        highlight-current-row
-        ref="multipleTable"
-        @selection-change="select"
-        :row-style="{ color: '#303133' }"
-        :header-cell-style="{
-          backgroundColor: 'rgb(245, 247, 250)',
-          color: '#606266'
-        }"
-      >
-        <el-table-column type="selection" width="55" align="center"> </el-table-column>
-
-        <el-table-column label="药品名称" align="center">
-          <template slot-scope="scope">
-             {{scope.row.drug.drug_name}}
-          </template>
-        </el-table-column>
-        <el-table-column label="药品类型" align="center">
-          <template slot-scope="scope">
-              {{getDrugType(scope.row.drug.drug_type)}}
-          </template>
-        </el-table-column>
-         <el-table-column label="规格&单位" align="center">
-          <template slot-scope="scope">
-             {{scope.row.drug.dose}}&nbsp;{{scope.row.drug.dose_unit}}*{{scope.row.drug.min_number}}{{scope.row.drug.min_unit}}/{{scope.row.drug.max_unit}}
-          </template>
-        </el-table-column>
-       
-        <el-table-column label="批号" align="center">
-          <template slot-scope="scope">
-           {{scope.row.number}}
-          </template>
-        </el-table-column>
-        
-        <el-table-column label="出库数量" align="center">
-          <template slot-scope="scope">
-             {{scope.row.count}}
-          </template>
-        </el-table-column>
-
-       <el-table-column label="进货价" align="center">
-          <template slot-scope="scope">
-            {{scope.row.price}}
-          </template>
-        </el-table-column>
-
-      
-       <el-table-column label="总价" align="center">
-          <template slot-scope="scope">
-             {{scope.row.total_price}}
-          </template>
-        </el-table-column>
-      
-
-       <el-table-column label="生产厂家" align="center">
-          <template slot-scope="scope">
-             {{getManufacturerName(scope.row.drug.manufacturer)}}
-          </template>
-        </el-table-column>
-
-
-       <el-table-column label="生产日期" align="center">
-          <template slot-scope="scope">
-             {{getTime(scope.row.product_date)}}
-          </template>
-        </el-table-column>
-       
-
-       <el-table-column label="有效日期" align="center">
-          <template slot-scope="scope">
-             {{getTime(scope.row.expiry_date)}}
-          </template>
-        </el-table-column>
+      <!-- 使用详情 -->
+      <div v-show="tableShow" style="margin-top:10px">
+        <el-table
+          :data="tableList"
+          :class="signAndWeighBoxPatients"
+          style="width: 100%"
+          border
+          highlight-current-row
+          ref="multipleTable"
+          @selection-change="select"
+          :row-style="{ color: '#303133' }"
+          :header-cell-style="{
+            backgroundColor: 'rgb(245, 247, 250)',
+            color: '#606266'
+          }"
+        >
+          <el-table-column label="药品名称" align="center">
+            <template slot-scope="scope">
+              {{scope.row.drug_name}}
+            </template>
+          </el-table-column>
+          <el-table-column label="药品类型" align="center">
+            <template slot-scope="scope">
+                {{getDrugType(scope.row.drug_type)}}
+            </template>
+          </el-table-column>
+          <el-table-column label="规格&单位" align="center">
+            <template slot-scope="scope">
+              {{scope.row.dose}}&nbsp;{{scope.row.dose_unit}}*{{scope.row.min_number}}{{scope.row.min_unit}}/{{scope.row.max_unit}}
+            </template>
+          </el-table-column>
+          <!-- <el-table-column label="批号" align="center">
+            <template slot-scope="scope">
+            {{scope.row.number}}
+            </template>
+          </el-table-column> -->
+          <el-table-column label="出库数量" align="center">
+            <template slot-scope="scope">
+              {{scope.row.count}}
+            </template>
+          </el-table-column>
+          <el-table-column label="进货价" align="center">
+            <template slot-scope="scope">
+              {{scope.row.last_price}}
+            </template>
+          </el-table-column>
+          <el-table-column label="总价" align="center">
+            <template slot-scope="scope">
+              {{scope.row.count * scope.row.last_price}}
+            </template>
+          </el-table-column>
+          <el-table-column label="生产厂家" align="center">
+            <template slot-scope="scope">
+              {{getManufacturerName(scope.row.manufacturer)}}
+            </template>
+          </el-table-column>
+          <el-table-column label="生产日期" align="center">
+            <template slot-scope="scope">
+              {{getTime(scope.row.product_date)}}
+            </template>
+          </el-table-column>
+          <el-table-column label="有效日期" align="center">
+            <template slot-scope="scope">
+              {{getTime(scope.row.expiry_date)}}
+            </template>
+          </el-table-column>
+          <!-- <el-table-column label="批准文号" align="center">
+            <template slot-scope="scope">
+              {{scope.row.number}}
+            </template>
+          </el-table-column> -->
+          <el-table-column label="备注" align="center">
+            <template slot-scope="scope">
+              {{scope.row.remark}}
+            </template>
+          </el-table-column>
+          <el-table-column label="操作" align="center">
+            <template slot-scope="scope">
+              <span style="color: #589ff8" v-if="scope.row.is_sys == 1" @click="toDetail(scope.row)">使用明细</span>
+            </template>
+          </el-table-column>
+        </el-table>
 
-        <el-table-column label="批准文号" align="center">
-          <template slot-scope="scope">
-             {{scope.row.number}}
-          </template>
-        </el-table-column>
+      </div>
+    </div>
 
 
-        <el-table-column label="备注" align="center">
-          <template slot-scope="scope">
-            {{scope.row.remark}}
-          </template>
-        </el-table-column>
-      </el-table>
 
-    </div>
 
 
     <el-dialog
@@ -442,7 +433,63 @@
         <el-button type="primary" @click="dialogVisibleTwo = false">确 定</el-button>
       </span>
     </el-dialog>
-  </div>
+
+
+   
+    <el-dialog
+      title="提示"
+      :visible.sync="drugDialogVisible"
+      width="90%">
+      <span>
+        <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 >{{scope.row.count}}</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.ctime | parseTime('{y}-{m}-{d} {h}:{i}')}} </span>
+              <span  v-if="scope.row.is_total == 1">{{scope.row.total}} </span>
+            </template>
+          </el-table-column>
+
+        </el-table>
+      </span>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="drugDialogVisible = false">取 消</el-button>
+        <el-button type="primary" @click="drugDialogVisible = false">确 定</el-button>
+      </span>
+    </el-dialog>
+   </div>
 </template>
 
 <script>
@@ -455,7 +502,9 @@ import {
   getDrugWarehouseOutList,
   getDrugWarehouseOutInfo,
   getDrugWarehouseOutUser,
-  getDrugAutoMaticList
+  getDrugAutoMaticList,
+  getSinleOrderDetail,
+  getAutoDrugDetail
 } from "@/api/drug/drug_stock";
 import BreadCrumb from "../../components/bread-crumb";
 import { getInitializtion } from '@/api/stock'
@@ -495,7 +544,7 @@ export default {
         { path: false, name: "出库单" }
       ],
       page: 1,
-      limit: 10,
+      limit: 5,
       checked: false,
       total: 0,
       pageTotal: 0,
@@ -527,6 +576,8 @@ export default {
       drugTypeList:[],
       tableShow:false,
       manufacturerList:[],
+      drugDialogVisible:false,
+      order_id:0,
     };
   },
   methods: {
@@ -667,10 +718,11 @@ export default {
     },
 
     handleEdit: function(index, row) {
-      this.$router.push({
-        name: "drugStockOutDetail",
-        query: { id: row.id, type: this.type }
-      });
+      // this.$router.push({
+      //   name: "drugStockOutDetail",
+      //   query: { id: row.id, type: this.type }
+      // });
+      this.$router.push({path:"/drug/out/drugstockoutorderedit?id="+row.id+"&type="+this.type})
     },
     // handleSearch(id,time,warehouse_out_order_number){
     //   this.warehousingOutInfo.warehousingOutData = []
@@ -680,10 +732,12 @@ export default {
     //   this.dialogVisible = true
     // },
     handleSearch(val){
+       console.log("val2222222222",val)
        this.getInitializtion()
-       this.GetOrderDetail(val.id)
+       this.getSinleOrderDetail(val.id)
        this.list = []
        this.getDrugAutoMaticList(val.id,val.time,val.warehouse_out_order_number)
+
     },
     GetOrderDetail(order_id) {
         const params = {
@@ -702,7 +756,7 @@ export default {
               this.tableList.push(response.data.data.list[i])
 
             }
-            console.log("详情",this.tableList)
+            console.log("详情222",this.tableList)
             this.warehousingOutInfo.info = response.data.data.info
             var manulist = response.data.data.manulist
             this.manufacturerList = manulist
@@ -757,6 +811,7 @@ export default {
       }
     },
     select(selection) {
+      this.order_id = selection[0].id
       this.selectedTableData = selection;
     },
     batchDelete() {
@@ -900,6 +955,8 @@ export default {
            var drugList = response.data.data.drugList
            console.log("药品列表",drugList)
            this.drugList = drugList
+           var manulist = response.data.data.manufacturerList
+           this.manufacturerList = manulist
          }
       })
     },
@@ -958,7 +1015,54 @@ export default {
        }
      }
      return name
+   },
+   getSinleOrderDetail(id){
+       var params = {
+         id:id,
+       }
+     getSinleOrderDetail(params).then(response=>{
+        if(response.data.state == 1){
+          this.tableShow = true
+          this.tableList = []
+          var list =  response.data.data.list
+          console.log("list",list)
+          this.tableList = list
+        }
+     })
+   },
+   toDetail(val){
+    
+     console.log("val",val)
+     var params = {
+       drug_id:val.drug_id,
+       record_time:val.sys_record_time,
+     }
+     this.userList = []
+     getAutoDrugDetail(params).then(response=>{
+       if(response.data.state == 1){
+        this.drugDialogVisible = true
+        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,
+        })
+       }
+     })
+   },
+   toPrint(){
+     if(this.order_id == 0){
+        this.$message.error("请选择出库单")
+     }else{
+       this.$router.push({path:"/stock/drugStockOutOrderDetailPrint?id="+this.order_id})
+     }
    }
+    
   }
 };
 </script>

src/xt_pages/stock/drugs/drugStockOutOrderAdd.vue

@@ -25,13 +25,7 @@
     </div>
 
     <div class="app-container">
-    <!---->
-      <!--<stock-in-dialog-->
-        <!--ref="dialog" :propForm="propForm"-->
-        <!--:visibility="isVisibility"-->
-        <!--v-on:dialog-comfirm="comfirm"-->
-        <!--v-on:dialog-cancle="cancle"-->
-      <!--&gt;</stock-in-dialog>-->
+  
 
       <drugs-stock-dialog
         ref="dialog" :propForm="propForm"
@@ -57,7 +51,7 @@
         ></el-date-picker>
       </div>
 
-      <div class="cell clearfix">
+      <!-- <div class="cell clearfix">
         <label class="title"><span class="name">经销商</span> : </label>
         <el-select
           size="small"
@@ -75,9 +69,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
           size="small"
@@ -95,7 +89,7 @@
           >
           </el-option>
         </el-select>
-      </div>
+      </div> -->
 
       <el-form :rules="tableRules" :model="recordInfo" ref="tableForm">
         <el-table
@@ -126,7 +120,7 @@
                   >
                     <i class="el-icon-search el-input__icon" slot="suffix"></i>
                   <template slot-scope="{ item }">
-                    <div class="name">{{ item.drug_name }}</div>
+                    <div class="name">{{ item.drug_name + item.dose + "*"+ item.dose_unit +item.min_number + item.min_unit +"/" + item.max_unit}}</div>
                   </template>
                  </el-autocomplete>
               </el-form-item>
@@ -161,7 +155,7 @@
               </el-form-item>
             </template>
           </el-table-column>
-          <el-table-column align="center" width="150">
+          <!-- <el-table-column align="center" width="150">
             <template slot="header" slot-scope="scope" >
                   <span>批号</span>
               </template>
@@ -173,7 +167,7 @@
                     ></el-input>
                   </el-form-item>
               </template>
-          </el-table-column>
+          </el-table-column> -->
           <el-table-column width="120" align="center">
             <template slot="header" slot-scope="scope">
               <span>出库数量<span style="color: red">*</span></span>
@@ -216,47 +210,12 @@
             </template>
           </el-table-column>
 
-        
-         
-          
-          <!-- <el-table-column width="80" align="center">
-            <template slot="header" slot-scope="scope">
-              <span>单位<span style="color: red">*</span></span>
-            </template>
-            <template slot-scope="scope">
-              <el-select v-model="scope.row.min_unit" style="width:100px;" placeholder="请选择">
-                <el-option
-                  v-for="(item,index) in getDataConfig('hemodialysis','units')"
-                  :key="index"
-                  :label="item.name"
-                  :value="item.name">
-                </el-option>
-              </el-select>
-            </template>
-          </el-table-column>
-          -->
-
-          
-
           <el-table-column label="总价" width="80" align="center">
             <template slot-scope="scope">
               {{ calculate(scope.row.last_price * scope.row.count) }}
             </template>
           </el-table-column>
-
-
-          <!-- <el-table-column label="零售价" align="center" width="150">
-            <template slot-scope="scope">
-              {{ scope.row.retail_price }}
-            </template>
-          </el-table-column>
-
-          <el-table-column label="零价总价" align="center" width="150">
-            <template slot-scope="scope">
-              {{ calculate(scope.row.retail_price * scope.row.count) }}
-            </template>
-          </el-table-column> -->
-          
+   
           <el-table-column label="生产厂家" width="140" align="center">
             <template slot-scope="scope">
                <el-select v-model="scope.row.manufacturer" filterable placeholder="请选择厂商">
@@ -297,7 +256,7 @@
               ></el-date-picker>
             </template>
           </el-table-column>
-        
+<!--         
         <el-table-column align="center" width="150" label="批准文号">
             <template slot-scope="scope">
               <el-form-item style="padding-top: 20px">
@@ -307,7 +266,7 @@
                 ></el-input>
               </el-form-item>
             </template>
-          </el-table-column>
+          </el-table-column> -->
 
           <el-table-column label="备注" width="120" align="center">
             <template slot-scope="scope">
@@ -546,6 +505,9 @@ export default {
       tempObj["retail_price"] = "";
       tempObj["remark"] = "";
       tempObj["min_unit"] = "";
+      tempObj['dose'] = ""
+      tempObj['dose_unit'] = ""
+      tempObj["min_number"] = ""
       this.recordInfo.recordData.push(tempObj);
     },
     handleDelete: function(index, row) {
@@ -654,7 +616,7 @@ export default {
             stockOut: this.recordInfo.recordData
           };
           console.log("params222222",params)
-      
+          
           postDrugWarehouseOut(
             params,
             this.warehouse_out_time,
@@ -730,7 +692,7 @@ export default {
             this.recordInfo.recordData[i].max_unit = val.max_unit
             this.recordInfo.recordData[i].min_number = val.min_number
             this.recordInfo.recordData[i].min_unit = val.min_unit
-            this.recordInfo.recordData[i].packing_unit = val.packing_unit
+         
             this.recordInfo.recordData[i].number = val.number
             this.recordInfo.recordData[i].last_price = val.last_price
             this.recordInfo.recordData[i].manufacturer = val.manufacturer
@@ -816,18 +778,18 @@ export default {
       (nowDay < 10 ? "0" + nowDay : nowDay);
     const tempObj = {};
     tempObj["drug_id"] = 0;
-    tempObj['dosage'] = ''
     tempObj['max_unit'] = ''
-    tempObj['unval'] = ''
     tempObj['min_unit'] = '',
-    tempObj['packing_unit'] = '',
     tempObj["return_count"] = 0;
     tempObj["price"] = "";
     tempObj["remark"] = "";
-    tempObj["min_unit"] = "";
     tempObj['manufacturer'] = ''
     tempObj['batch_number'] = ''
     tempObj['drug_type'] = ''
+    tempObj['dose'] = ""
+    tempObj['dose_unit'] = ""
+    tempObj["min_number"] = ""
+    
     this.recordInfo.recordData.push(tempObj);
     this.GetConfigInfo();
     this.propForm.goodUnit = this.$store.getters.good_unit;
@@ -861,4 +823,7 @@ export default {
 .sign-and-weigh-box .sign-and-weigh-box-patients .current-row > td {
   background: #6fb5fa;
 }
+.el-autocomplete-suggestion{
+  width: 400px !important;
+}
 </style>

src/xt_pages/stock/drugs/drugStockOutOrderEdit.vue

@@ -38,16 +38,16 @@
       >
       </drugs-stock-dialog>
 
-      <div class="cell clearfix">
+      <!-- <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;"
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
                         value-format="yyyy-MM-dd"></el-date-picker>
-      </div>
+      </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="请选择经销商" @change="changeDealer">
           <el-option
@@ -57,9 +57,9 @@
             :value="option.id">
           </el-option>
         </el-select>
-      </div>
-
+      </div> -->
 
+<!-- 
       <div class="cell clearfix">
         <label class="title"><span class="name">厂商</span> : </label>
 
@@ -71,99 +71,183 @@
             :value="option.id">
           </el-option>
         </el-select>
-      </div>
+      </div> -->
 
       <el-form :rules="tableRules" :model="recordInfo" ref="tableForm">
         <el-table :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">
+          <el-table-column align="center" width="150px">
             <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.drug_id"
-                  :value="typeName(scope.row.drug_id)"
-                  @focus="showDialog(scope.$index, scope.row)"
-                ></el-input>
+                 <el-autocomplete
+                    class="checkSearch"
+                    popper-class="my-autocomplete"
+                    v-model="scope.row.drug_name"
+                    :fetch-suggestions="querySearchAsync"
+                    :trigger-on-focus="false"
+                    placeholder="请输入药品名称"
+                    @select="handleSelect"
+                    @input="changeDrugName(scope.$index)"
+                    style="width:160px;"
+                  >
+                    <i class="el-icon-search el-input__icon" slot="suffix"></i>
+                  <template slot-scope="{ item }">
+                    <div class="name">{{ item.drug_name + item.dose + "*"+ item.dose_unit +item.min_number + item.min_unit +"/" + item.max_unit}}</div>
+                  </template>
+                 </el-autocomplete>
               </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 v-model="scope.row.drug_type" filterable placeholder="请选择厂商">
+                <el-option
+                  v-for="(option, index) in drugTypeList"
+                  :key="index"
+                  :label="option.name"
+                  :value="option.id">
+                </el-option>
+               </el-select>
+            </template>
+          </el-table-column>
+          <el-table-column align="center" width="140">
             <template slot="header" slot-scope="scope">
-              <span>规格名称<span style="color: red">*</span></span>
+              <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.drug_id"
-                  :value="specificationName(scope.row.drug_id)"
-                  @focus="showDialog(scope.$index, scope.row)"
+                  :disabled="true"
+                  placeholder="请输入规格&单位"
+                  v-model="scope.row.name"
                 ></el-input>
               </el-form-item>
             </template>
           </el-table-column>
-
-
-          <el-table-column min-width="23" align="center">
+         <!-- <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: 20px">
+                    <el-input
+                      placeholder="请输入批号"
+                      v-model="scope.row.batch_number"
+                    ></el-input>
+                  </el-form-item>
+              </template>
+          </el-table-column> -->
+           <el-table-column width="120" align="center">
             <template slot="header" slot-scope="scope">
-              <span>进价<span style="color: red">*</span></span>
+              <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 type="number" v-model="scope.row.price"></el-input>
+              <el-form-item
+                :prop="'recordData.' + scope.$index + '.count'"
+                :rules="tableRules.count"
+                style="padding-top: 20px"
+              >
+                <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 min-width="23" align="center">
+         <el-table-column width="120" align="center">
             <template slot="header" slot-scope="scope">
-              <span>出库数量<span style="color: red">*</span></span>
+              <span>出货价<span style="color: red">*</span></span>
             </template>
             <template slot-scope="scope">
-              <el-form-item :prop="'recordData.' + scope.$index + '.count'" :rules='tableRules.count'
-                            style="padding-top: 17px">
-                <el-input type="number" v-model="scope.row.count"></el-input>
+            
+              <el-form-item
+                :prop="'recordData.' + scope.$index + '.last_price'"
+                :rules="tableRules.last_price"
+                style="padding-top: 20px"
+              >
+                <el-input
+                  placeholder="请输入出货价"
+                  type="number"
+                  v-model="scope.row.last_price"
+                ></el-input>
               </el-form-item>
             </template>
           </el-table-column>
-
-          <el-table-column label="进价总价" min-width="20" align="center">
+           <el-table-column label="总价" width="80" align="center">
             <template slot-scope="scope">
-              {{calculate(scope.row.price*scope.row.count)}}
+              {{ calculate(scope.row.last_price * scope.row.count) }}
             </template>
           </el-table-column>
-
-
-          <el-table-column label="零价" align="center" width="150">
+          <el-table-column label="生产厂家" width="140" align="center">
             <template slot-scope="scope">
-              {{ scope.row.retail_price }}
+               <el-select v-model="scope.row.manufacturer" filterable placeholder="请选择厂商">
+                <el-option
+                  v-for="(option, index) in manufacturerList"
+                  :key="index"
+                  :label="option.manufacturer_name"
+                  :value="option.id">
+                </el-option>
+               </el-select>
             </template>
           </el-table-column>
-
-          <el-table-column label="零价总价" align="center" width="150">
+            <el-table-column label="生产日期" width="180" align="center">
             <template slot-scope="scope">
-              {{ calculate(scope.row.retail_price * scope.row.count) }}
+              <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="180" 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 align="center" width="150" label="批准文号">
+            <template slot-scope="scope">
+              <el-form-item style="padding-top: 20px">
+                <el-input
+                  placeholder="请输入批准文号"
+                  v-model="scope.row.number"
+                ></el-input>
+              </el-form-item>
+            </template>
+          </el-table-column> -->
 
-
-          <el-table-column label="备注" min-width="20" 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" min-width="20">
+
+          <el-table-column label="操作" align="center" width="150" fixed="right">
             <template slot-scope="scope">
               <el-tooltip class="item" effect="dark" content="新增" placement="top">
 
@@ -200,7 +284,8 @@
   import { deleteDrugWarehouseOutInfo, editDrugWarehouseoutInfo, getDrugSalesReturnConfig, getDrugWarehouseOutInfo,GetAllConfig,GetAllDrugInfoByID } from '@/api/drug/drug_stock'
   import BreadCrumb from '../../components/bread-crumb'
   import DrugsStockDialog from './drugsStockDialog/index'
-
+  import {postSearchDrugList } from "@/api/data"
+  import { getDictionaryDataConfig } from "@/utils/data";
   export default {
     components: { DrugsStockDialog, BreadCrumb},
     name: 'salesReturnEdit',
@@ -264,6 +349,8 @@
         dealer: [],
         goodType: [],
         goodInfo:[],
+        drugTypeList:[],
+        manufacturerList:[]
       }
     },
     methods: {
@@ -461,6 +548,7 @@
             const params = {
               'stockOut': this.recordInfo.recordData
             }
+            console.log("params----",params)
             editDrugWarehouseoutInfo(params, this.warehouse_out_time, this.$route.query.id, this.$route.query.type, this.form.manufacturer, this.form.dealer).then(response => {
               if (response.data.state == 0) {
                 this.$message.error(response.data.msg)
@@ -474,7 +562,8 @@
             return false
           }
         })
-      }, GetOrderDetail: function(order_id) {
+      }, 
+      GetOrderDetail: function(order_id) {
         const params = {
           'id': order_id
         }
@@ -483,12 +572,28 @@
             this.$message.error(response.data.msg)
             return false
           } else {
+             console.log("list222222",response.data.data.list)
+            var manulist = response.data.data.manulist
             for (let i = 0; i < response.data.data.list.length; i++) {
+              response.data.data.list[i].drug_name = response.data.data.list[i].drug.drug_name,
+              response.data.data.list[i].drug_type = response.data.data.list[i].drug.drug_type
+              response.data.data.list[i].name = response.data.data.list[i].drug.dose + response.data.data.list[i].drug.dose_unit +"*"+response.data.data.list[i].drug.min_number+response.data.data.list[i].drug.min_unit + "/" + response.data.data.list[i].drug.max_unit
+              response.data.data.list[i].last_price = response.data.data.list[i].drug.last_price.toString()
+              response.data.data.list[i].number = response.data.data.list[i].drug.number
+              response.data.data.list[i].manufacturer = response.data.data.list[i].drug.manufacturer
               response.data.data.list[i].price = response.data.data.list[i].price.toString()
               response.data.data.list[i].retail_price = response.data.data.list[i].retail_price.toString()
               response.data.data.list[i].count = response.data.data.list[i].count.toString()
               this.recordInfo.recordData.push(response.data.data.list[i])
             }
+             for(let j=0;j<this.recordInfo.recordData.length;j++){
+               for(let i=0;i<manulist.length;i++){
+                  if(this.recordInfo.recordData[j].manufacturer == manulist[i].id){
+                     this.recordInfo.recordData[j].manufacturer = manulist[i].manufacturer_name
+                  }
+               }
+              }
+
             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
@@ -517,9 +622,63 @@
         this.propForm.manufacturer = val
       }, changeDealer(val) {
         this.propForm.dealer = val
-      }
+      },
+      querySearchAsync(keyword, cb) {
+        let key = '';
+        if (keyword != undefined) {
+          key = keyword
+        }
+        let searchArray = [];
+        postSearchDrugList(key).then(response => {
+          if (response.data.state == 1) {
+            searchArray = response.data.data.list;
+            
+             var list = response.data.data.list
+             console.log("猎豹22222222222",list)
+
+             this.drugList = list
+             var manufacturerList = response.data.data.manufacturerList
+             this.manufacturerList = manufacturerList
+             for(let i=0;i<this.drugList.length;i++){
+             
+                for(let j=0;j<this.manufacturerList.length;j++){
+                  if(this.drugList[i].manufacturer == this.manufacturerList[j].id){
+                     this.drugList[i].manufacturer = this.manufacturerList[j].manufacturer_name
+                  }
+                }
+             }
+           
+             cb(this.drugList)
+          } else {
+            cb([])
+          }
+        })
+      },
+     changeDrugName(val){
+        this.currentIndex = val
+      },
+      handleSelect(val){
+         for(let i=0;i<this.recordInfo.recordData.length;i++){
+           if(i == this.currentIndex){
+             this.recordInfo.recordData[i].drug_id  = val.id
+             this.recordInfo.recordData[i].drug_name = val.drug_name
+             this.recordInfo.recordData[i].drug_type = val.drug_type
+             this.recordInfo.recordData[i].name  = val.dose +val.dose_unit+"*"+val.min_number+ val.min_unit+"/"+val.max_unit
+             this.recordInfo.recordData[i].last_price = val.last_price
+             this.recordInfo.recordData[i].manufacturer =  val.manufacturer
+             this.recordInfo.recordData[i].batch_number = val.number
+             this.recordInfo.recordData[i].max_unit = val.max_unit
+             this.recordInfo.recordData[i].min_unit = val.min_unit
+           }
+        }
+        console.log("333333",this.recordInfo.recordData)
+      },
+      getDictionaryDataConfig(module, filed_name) {
+        return getDictionaryDataConfig(module, filed_name)
+      },
     },
     created() {
+      this.drugTypeList = getDictionaryDataConfig('system','drug_type') 
       this.GetConfigInfo()
       this.propForm.goodUnit = this.$store.getters.good_unit
       const order_id = this.$route.query.id

src/xt_pages/stock/drugs/query.vue

@@ -68,7 +68,7 @@
             style="width: 200px;"
             class="filter-item"
             v-model.trim="keywords"
-            placeholder="商品名称/规格名称"
+            placeholder="药品名称"
           />
           <el-button
             size="small"
@@ -111,14 +111,19 @@
              {{getManufacturerList(scope.row.manufacturer)}}
            </template>
         </el-table-column>
+        <el-table-column prop="drug_name" label="入库数量" align="center">
+           <template slot-scope="scope">
+              {{getInCount(scope.row.drug_id)}}
+           </template>
+        </el-table-column>
+        <el-table-column prop="drug_name" label="出库数量" align="center">
+           <template slot-scope="scope">
+             {{getOutCount(scope.row.drug_id) + getAutoCount(scope.row.drug_id)}}
+           </template>
+        </el-table-column>
         <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}}
-              <span v-if="scope.row.stock_min_number!=''">
-                {{scope.row.stock_min_number}}{{scope.row.min_unit}}
-              </span>
-            </span> 
+            {{getInCount(scope.row.drug_id) - getOutCount(scope.row.drug_id) - getAutoCount(scope.row.drug_id)}}
            </template>
         </el-table-column>
         <el-table-column prop="drug_name" label="操作" align="center">
@@ -163,7 +168,7 @@
 <script>
   import { uParseTime } from '@/utils/tools'
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
-  import { getAllDrugStockQueryList,getDrugStockList } from '@/api/drug/drug_stock'
+  import { getAllDrugStockQueryList,getDrugStockList,getDrugCountList } from '@/api/drug/drug_stock'
   import SettingDialog from './settingDialog/index'
   import { getDictionaryDataConfig } from "@/utils/data";
   export default {
@@ -174,6 +179,7 @@
       this.drugTypeList = getDictionaryDataConfig('system','drug_type') 
   
       this.getlist()
+      this.getDrugCountList()
     },
     components: {
       SettingDialog,
@@ -208,7 +214,11 @@
         ],
         drugTypeList:[],
         tableList:[],
-        manufacturerList:[]
+        manufacturerList:[],
+        countList:[],
+        outCountList:[],
+        autoCountList:[],
+        keyword:"",
       }
     },
     methods: {
@@ -396,7 +406,6 @@
       showCancelStockDetailDialog: function() {
       },
       search: function() {
-        // this.GetAllDrugStockQueryList()
         this.getlist()
       }, 
       setting: function() {
@@ -449,7 +458,7 @@
           start_time:this.start_time,
           end_time:this.end_time,
         }
-        
+         
         getDrugStockList(params).then(response=>{
           if(response.data.state == 1){
              var list = response.data.data.list
@@ -489,6 +498,54 @@
       },
       handleBatch(id){
         this.$router.push({path:'/drugstock/in/drugbatchnumber?drug_id='+id})
+      },
+      getDrugCountList(){
+         var params = {
+          keyword: this.keywords,
+          start_time:this.start_time,
+          end_time:this.end_time,
+         }
+        getDrugCountList(params).then(response=>{
+          if(response.data.state == 1){
+            var countlist =  response.data.data.countList
+            console.log("入库数据",countlist)
+            this.countList = countlist
+            var outcountlist = response.data.data.outCountList
+            console.log("出库数据",outcountlist)
+            this.outCountList = outcountlist
+            var aucountlist = response.data.data.auCountList
+            console.log("自动数据",aucountlist)
+            this.autoCountList = aucountlist
+          }
+        })
+      },
+      getInCount(id){
+        var count = ""
+        for(let i=0;i<this.countList.length;i++){
+           if(id == this.countList[i].drug_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].drug_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].drug_id){
+            count = this.autoCountList[i].count
+          }
+        }
+        return count
       }
     }
   }

src/xt_pages/stock/stockBatchNumber.vue

@@ -38,7 +38,7 @@
               @change="endTimeChange"
           ></el-date-picker>
 
-        <span>出入库方式:</span>
+        <!-- <span>出入库方式:</span>
         <el-select v-model="stock_type" style="width:160px;margin-right:10px;" placeholder="请选择" @change="changeDrug">
             <el-option
               v-for="(item,index) in stockType"
@@ -46,7 +46,7 @@
               :label="item.name"
               :value="item.id">
             </el-option>
-        </el-select>
+        </el-select> -->
         
         
       </div>
@@ -79,19 +79,19 @@
         </el-table-column>
          <el-table-column prop="drug_name" label="批号" align="center">
            <template slot-scope="scope" >
-             <span v-if="scope.row.stock_way == 4 && scope.row.stock_count!=0">{{scope.row.stock_count}} </span>
+             <span v-if="scope.row.stock_way == 4">{{scope.row.number}} </span>
            </template>
         </el-table-column>
         <el-table-column prop="drug_name" label="入库数量" align="center">
            <template slot-scope="scope">
-             <span v-if="scope.row.stock_way == 4"> {{scope.row.price}}</span>
-             <span v-if="scope.row.stock_way == 2">{{scope.row.price}}</span>
+             <span v-if="scope.row.stock_way == 4"> {{scope.row.warehousing_count}}</span>
+             <span v-if="scope.row.stock_way == 2">{{scope.row.count}}</span>
            </template>
         </el-table-column>
-         <el-table-column prop="drug_name" label="进货单价" align="center">
+         <el-table-column prop="drug_name" label="进货价" align="center">
            <template slot-scope="scope">
-             <span v-if="scope.row.stock_way == 4"> {{getTime(scope.row.expiry_date)}}</span>
-             <span v-if="scope.row.stock_way == 2">{{getTime(scope.row.expiry_date)}}</span>
+             <span v-if="scope.row.stock_way == 4"> {{scope.row.price}}</span>
+             <span v-if="scope.row.stock_way == 2">{{scope.row.price}}</span>
            </template>
         </el-table-column>
        </el-table>
@@ -114,7 +114,7 @@
 <script>
   import { uParseTime } from '@/utils/tools'
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
-  import {getStockInList,getStockOutList} from "@/api/drug/drug_stock";
+  import {getStockInList} from "@/api/drug/drug_stock";
   export default {
     name: 'stockIn',
     created() {
@@ -166,15 +166,13 @@
       }
     },
     methods:{
-    
-     
        handleSizeChange(val) {
         this.limit = val
-        this.GetAllDrugStockQueryList()
+        this.getlist()
       },
       handleCurrentChange(val) {
         this.page = val
-        this.GetAllDrugStockQueryList()
+        this.getlist()
       },
         
     startTimeChange: function(val) {
@@ -184,7 +182,7 @@
         this.$message.error("开始时间不能大于结束时间");
         this.start_time = "";
       } else {
-        this.GetAllDrugStockQueryList();
+        this.getlist()
       }
     },
     endTimeChange: function(val) {
@@ -193,7 +191,7 @@
         this.$message.error("结束时间不能小于开始时间");
         this.end_time = "";
       } else {
-        this.GetAllDrugStockQueryList();
+       this.getlist()
       }
      },
      changeDrug(){},
@@ -229,35 +227,33 @@
          if(response.data.state == 1){
            var list = response.data.data.list
            console.log("入库数据",list)
+           for(let i=0;i<list.length;i++){
+             list[i].stock_way = 4
+           }
            this.tableList = list
            var total = response.data.data.total
            this.total = total
            console.log("入库数据",this.tableList)
            var manufacturerList = response.data.data.manufacturerList
            this.manufacturerList = manufacturerList
+
+          // var outlist =  response.data.data.outList
+          // console.log("outlist",outlist)
+          // for(let i=0;i<outlist.length;i++){
+          //     outlist[i].stock_way = 2
+          //     this.tableList.push(outlist[i])
+          // }
+          
+           
          }
       })
      },
-    //  getOutList(){
-    //   var params= {
-    //       limit:this.limit,
-    //       page:this.page,
-    //       id:this.$route.query.id,
-    //       start_time:this.start_time,
-    //       end_time:this.end_time, 
-    //     } 
-    //    getStockOutList(params).then(response=>{
-    //       if(response.data.state == 1){
-    //          var outlist = response.data.data.outList
-    //          console.log("出库数据",outlist)
-    //          for(let i=0;i<outlist.length;i++){
-    //            outlist[i].stock_way = 2
-    //            this.tableList.push(outlist[i])
-    //          }
-    //          console.log("hhhhhhhhhhh",this.tableList)
-    //       }
-    //    })  
-    //  }
+     getTimestamp(time) {
+      // 把时间日期转成时间戳
+      return new Date(time).getTime() / 1000;
+     },
+     
+
     }
   }
 </script>

src/xt_pages/stock/stockFlow.vue

@@ -6,8 +6,9 @@
     <div class="app-container ">
       <div class="cell clearfix">
        耗材名称:{{this.$route.query.good_name}}
-       <!-- 库存:
-       厂家: -->
+       库存:{{getInCount(this.$route.query.id)}}
+       <!-- 厂家:{{this.$route.query.manufacturer}}
+       规格: -->
       </div>
       <div class="cell clearfix">
         <span>日期查询:</span>
@@ -38,15 +39,15 @@
               @change="endTimeChange"
           ></el-date-picker>
 
-        <span>出入库方式:</span>
-        <el-select v-model="stock_type" style="width:160px;margin-right:10px;" placeholder="请选择" @change="changeDrug">
+        <!-- <span>出入库方式:</span> -->
+        <!-- <el-select v-model="stock_type" style="width:160px;margin-right:10px;" placeholder="请选择" @change="changeDrug">
             <el-option
               v-for="(item,index) in stockType"
               :key="index"
               :label="item.name"
               :value="item.id">
             </el-option>
-        </el-select>
+        </el-select> -->
         
         
       </div>
@@ -78,15 +79,16 @@
              {{getTime(scope.row.ctime)}}
            </template>
         </el-table-column>
-         <el-table-column prop="drug_name" label="出入库数量"  align="center">
+         <el-table-column prop="drug_name" label="入库数量"  align="center">
            <template slot-scope="scope">
              <span v-if="scope.row.stock_way == 4 && scope.row.warehousing_count!=0"> {{scope.row.warehousing_count}}</span>
              <span v-if="scope.row.stock_way == 2 && scope.row.count!=0">{{scope.row.count}}</span>
            </template>
         </el-table-column>
-         <el-table-column prop="drug_name" label="库存剩余量"  align="center">
+         <el-table-column prop="drug_name" label="剩余库存量"  align="center">
            <template slot-scope="scope">
-             <span v-if="scope.row.stock_way == 4 && scope.row.stock_count!=0">{{scope.row.stock_count}} </span>
+             <!-- <span v-if="scope.row.stock_way == 4 && 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 prop="drug_name" label="进/出货单价"  align="center">
@@ -107,7 +109,7 @@
              <span v-if="scope.row.stock_way == 4">{{scope.row.number}}</span>
            </template>
         </el-table-column>
-        <el-table-column prop="drug_name" label="供应商" align="center">
+        <el-table-column prop="drug_name" label="生产商" align="center">
            <template slot-scope="scope">
              <span v-if="scope.row.stock_way == 4"> {{getManufacturer(scope.row.manufacturer)}}</span>
              <span v-if="scope.row.stock_way == 2">{{getManufacturer(scope.row.manufacturer)}}</span>
@@ -133,15 +135,15 @@
 <script>
   import { uParseTime } from '@/utils/tools'
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
-  import {getStockInList,getStockOutList} from "@/api/drug/drug_stock";
+  import {getStockInList} from "@/api/drug/drug_stock";
+  import {getStockDrugCount} from "@/api/stock"
   export default {
     name: 'stockIn',
     created() {
-    //   var drugCategory = getDictionaryDataConfig('system','drug_category')
-    //   this.drugCategory.push(...drugCategory)
-    //   this.drugTypeList = getDictionaryDataConfig('system','drug_type') 
+     
       this.getlist()
-      this.getOutList()
+      this.getStockDrugCount()
+
     },
     components: {
       BreadCrumb
@@ -184,7 +186,11 @@
           {id:2,name:"自动出库"},
           {id:3,name:"入库"},
         ],
-      
+        countList:[],
+        outCountList:[],
+        autoCountList:[],
+        keywords:"",
+        obj:{},
       }
     },
     methods:{
@@ -192,11 +198,11 @@
      
        handleSizeChange(val) {
         this.limit = val
-        this.GetAllDrugStockQueryList()
+        this.getlist()
       },
       handleCurrentChange(val) {
         this.page = val
-        this.GetAllDrugStockQueryList()
+        this.getlist()
       },
         
     startTimeChange: function(val) {
@@ -206,7 +212,7 @@
         this.$message.error("开始时间不能大于结束时间");
         this.start_time = "";
       } else {
-        this.GetAllDrugStockQueryList();
+        this.getlist()
       }
     },
     endTimeChange: function(val) {
@@ -215,15 +221,14 @@
         this.$message.error("结束时间不能小于开始时间");
         this.end_time = "";
       } else {
-        this.GetAllDrugStockQueryList();
+       this.getlist()
       }
      },
-     changeDrug(){},
      getManufacturer(id){
        var name = ""
        for(let i=0;i<this.manufacturerList.length;i++){
          if(id == this.manufacturerList[i].id){
-            name = this.manufacturerList[i].name
+            name = this.manufacturerList[i].manufacturer_name
          }
        }
        return name
@@ -262,26 +267,58 @@
          }
       })
      },
-    //  getOutList(){
-    //   var params= {
-    //       limit:this.limit,
-    //       page:this.page,
-    //       id:this.$route.query.id,
-    //       start_time:this.start_time,
-    //       end_time:this.end_time, 
-    //     } 
-    //    getStockOutList(params).then(response=>{
-    //       if(response.data.state == 1){
-    //          var outlist = response.data.data.outList
-    //          console.log("出库数据",outlist)
-    //          for(let i=0;i<outlist.length;i++){
-    //            outlist[i].stock_way = 2
-    //            this.tableList.push(outlist[i])
-    //          }
-    //          console.log("hhhhhhhhhhh",this.tableList)
-    //       }
-    //    })  
-    //  }
+    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)
+           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){
+        console.log("id222",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.autoCountList[i].count
+          }
+        }
+        return count
+      },
+     getTimestamp(time) {
+      // 把时间日期转成时间戳
+      return new Date(time).getTime() / 1000;
+     },
     }
   }
 </script>

src/xt_pages/stock/stockInOrder.vue

@@ -113,18 +113,6 @@
           </template>
         </el-table-column>
 
-        <el-table-column label="厂家" align="center">
-          <template slot-scope="scope">
-            {{ getManufactuerName(scope.row.manufacturer) }}
-          </template>
-        </el-table-column>
-
-        <el-table-column label="经销商" align="center">
-          <template slot-scope="scope">
-            {{ getDealerName(scope.row.dealer) }}
-          </template>
-        </el-table-column>
-
         <el-table-column label="操作" align="center" width="260px">
           <template slot-scope="scope">
             <!-- <el-tooltip
@@ -177,112 +165,93 @@
       <el-pagination
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
-        :page-sizes="[10, 50, 100]"
-        :page-size="10"
+        :page-sizes="[5, 10, 50, 100]"
+        :page-size="5"
         background
-        style="margin-top:20px;float: right"
+        style="margin-top:20px;text-align: right"
         layout="total, sizes, prev, pager, next, jumper"
         :total="total"
       >
       </el-pagination>
-    </div>
-
-
-   <div v-show="tableShow" style="margin-top:80px">
-      <el-table
-        :data="tableList"
-        :class="signAndWeighBoxPatients"
-        style="width: 100%"
-        border
-        highlight-current-row
-        v-loading="Warehouse.loading"
-        ref="multipleTable"
-        @selection-change="select"
-        :row-style="{ color: '#303133' }"
-        :header-cell-style="{
-          backgroundColor: 'rgb(245, 247, 250)',
-          color: '#606266'
-        }"
-      >
-       <!-- <el-table-column align="center" type="selection" width="55">
-       </el-table-column> -->
-
-       <el-table-column label="耗材名称" align="center">
+      <div v-show="tableShow" style="margin-top:10px;">
+        <el-table
+          :data="tableList"
+          :class="signAndWeighBoxPatients"
+          style="width: 100%"
+          border
+          highlight-current-row
+          v-loading="Warehouse.loading"
+          ref="multipleTable"
+          @selection-change="select"
+          :row-style="{ color: '#303133' }"
+          :header-cell-style="{
+            backgroundColor: 'rgb(245, 247, 250)',
+            color: '#606266'
+          }"
+        >
+        <el-table-column label="耗材名称" align="center">
           <template slot-scope="scope">
             {{ scope.row.GoodInfo.good_name }}
           </template>
         </el-table-column>
-      
         <el-table-column label="耗材类型" align="center">
           <template slot-scope="scope">
             {{  getTypeName(scope.row.GoodInfo.good_type_id)}}
           </template>
         </el-table-column>
-
-
-       <el-table-column label="规格&单位" align="center">
+        <el-table-column label="规格&单位" align="center">
           <template slot-scope="scope">
             {{ scope.row.GoodInfo.specification_name}} * {{scope.row.GoodInfo.min_number}}{{scope.row.GoodInfo.min_unit}}
           </template>
         </el-table-column>
-
-
-       <el-table-column label="批号" align="center">
+        <el-table-column label="批号" align="center">
           <template slot-scope="scope">
             {{ scope.row.number}}
           </template>
         </el-table-column>
-        
         <el-table-column label="入库数量" align="center">
           <template slot-scope="scope">
             {{ scope.row.warehousing_count}}
           </template>
         </el-table-column>
-
-
         <el-table-column label="进货价" align="center">
           <template slot-scope="scope">
             {{ scope.row.price}}
           </template>
         </el-table-column>
-
-
-       <el-table-column label="总价" align="center">
+        <el-table-column label="总价" align="center">
           <template slot-scope="scope">
             {{ (scope.row.warehousing_count * scope.row.price).toFixed(2)}}
           </template>
         </el-table-column>
-
-
-         <el-table-column label="生产厂家" align="center">
+        <el-table-column label="生产厂家" align="center">
           <template slot-scope="scope">
             {{ getManufactuerName(scope.row.GoodInfo.manufacturer)}}
           </template>
         </el-table-column>
-
         <el-table-column label="生产日期" align="center">
           <template slot-scope="scope">
             {{ getTime(scope.row.product_date)}}
           </template>
         </el-table-column>
-
-
-       <el-table-column label="有效期" align="center">
+        <el-table-column label="有效期" align="center">
           <template slot-scope="scope">
             {{ getTime(scope.row.expiry_date)}}
           </template>
         </el-table-column>
-
         <el-table-column label="备注" align="center">
           <template slot-scope="scope">
             {{ scope.row.remark }}
           </template>
         </el-table-column>
-       
-      </el-table>
+        </el-table>
+      </div>
     </div>
 
 
+   
+
+
     <el-dialog
       title="详情"
       :visible.sync="dialogVisible"
@@ -714,7 +683,7 @@ export default {
       searchKey: "",
       type: 1,
       page: 1,
-      limit: 10,
+      limit: 5,
       checked: false,
       total: 0,
       pageTotal: 0,
@@ -764,7 +733,7 @@ export default {
         dealer:0
       }, 
       warehousing_time: '',
-     warehouse:{},
+      warehouse:{},
       propForm: {
         goods: [],
         goodType: [],
@@ -785,7 +754,7 @@ export default {
       },
         isCreated: 1,
         isVisibility: false,
-       drug_id:1,
+        drug_id:1,
       },
       drug_id:1,
       tableShow:false,

src/xt_pages/stock/stockInOrderAdd.vue

@@ -186,7 +186,18 @@
 
             </template>
           </el-table-column>
-         
+           <el-table-column label="经销商" align="center" width="150">
+             <template slot-scope="scope">
+               <el-select size="small" v-model="scope.row.dealer" filterable placeholder="请选择厂商">
+                <el-option
+                  v-for="(option, index) in dealerList"
+                  :key="index"
+                  :label="option.dealer_name"
+                  :value="option.id">
+                </el-option>
+               </el-select>
+            </template>
+          </el-table-column>
 
           <el-table-column label="备注" align="center" width="150">
             <template slot-scope="scope">
@@ -348,7 +359,7 @@
         },
 
         manufacturer: [],
-        dealer: [],
+        dealerList: [],
         goodType: [],
         manufacturerList:[],
         goodList:[]
@@ -636,7 +647,6 @@
           if (valid) {
             const array = this.recordInfo.recordData
             console.log("array9999999",array)
-           
             for (let i = 0; i < array.length; i++) {
               if (array[i].good_type_id == 0) {
                 this.$message.error('商品类型不能为空')
@@ -649,10 +659,26 @@
               this.$message.success('请添加入库商品')
               return
             }
-          
+            for(let i=0;i<this.recordInfo.recordData.length;i++){
+              for(let j=0;j<this.manufacturerList.length;j++){
+                 if(this.recordInfo.recordData[i].manufacturer == this.manufacturerList[j].manufacturer_name){
+               
+                  this.recordInfo.recordData[i].manufacturer = this.manufacturerList[j].id
+                 }
+              }
+            }
+
+            for(let i=0;i<this.recordInfo.recordData.length;i++){
+              for(let j=0;j<this.dealerList.length;j++){
+                 if(this.recordInfo.recordData[i].dealer == this.dealerList[j].dealer_name){
+                    this.recordInfo.recordData[i].dealer = this.dealerList[j].id
+                 }
+              }
+            }
             const params = {
               'stockIn': this.recordInfo.recordData
             }
+            console.log("stockIn",this.recordInfo.recordData)
            
             postWarehouse(params, this.warehousing_time, this.form.manufacturer, this.form.dealer, this.type).then(response => {
               if (response.data.state == 0) {
@@ -672,7 +698,8 @@
       ,
       changeManufacturer(val) {
 
-      }, changeDealer(val) {
+      }, 
+      changeDealer(val) {
 
       },
       getDataConfig(module, filed_name){
@@ -683,14 +710,16 @@
         if (keyword != undefined) {
           key = keyword
         }
-        console.log("keyrowrd",key)
         postSearchGoodList(key).then(response => {
           if (response.data.state == 1) {
            
              var list = response.data.data.list
+             
              this.goodList = list
              var manufacturerList = response.data.data.manufacturerList
              this.manufacturerList = manufacturerList
+             var dealer =  response.data.data.dealerList
+             this.dealerList = dealer
              for(let i=0;i<this.goodList.length;i++){
                 for(let j=0;j<this.manufacturerList.length;j++){
                   if(this.goodList[i].manufacturer == this.manufacturerList[j].id){
@@ -698,6 +727,14 @@
                   }
                 }
              }
+
+             for(let i=0;i<this.goodList.length;i++){
+               for(let j=0;j<this.dealerList.length;j++){
+                  if(this.goodList[i].dealer == this.dealerList[j].id){
+                    this.goodList[i].dealer = this.dealerList[j].dealer_name
+                  }
+               }
+             }
            
              cb(this.goodList)
           } else {
@@ -715,14 +752,15 @@
               this.recordInfo.recordData[i].good_type_id = val.id
               this.recordInfo.recordData[i].good_name = val.good_name
               this.recordInfo.recordData[i].good_type_id = val.good_type_id
-              this.recordInfo.recordData[i].name = val.specification_name + "*" + val.min_number+val.min_unit
+              this.recordInfo.recordData[i].name = val.specification_name + "*" + val.min_number+val.packing_unit
               this.recordInfo.recordData[i].number =  val.number
               this.recordInfo.recordData[i].manufacturer = val.manufacturer
               this.recordInfo.recordData[i].remark = val.remark
               this.recordInfo.recordData[i].price = val.buy_price
               this.recordInfo.recordData[i].specification_name = val.specification_name
               this.recordInfo.recordData[i].good_id = val.id
-              this.recordInfo.recordData[i].min_unit = val.min_unit
+              this.recordInfo.recordData[i].packing_unit = val.packing_unit
+              this.recordInfo.recordData[i].dealer = val.dealer
            }
          }
       }
@@ -787,6 +825,7 @@
     margin-top: 15px;
     margin-bottom: 15px;
   }
+  
 
 </style>
 
@@ -798,5 +837,9 @@
   .sign-and-weigh-box .sign-and-weigh-box-patients .current-row > td {
     background: #6fb5fa;
   }
+  .el-autocomplete-suggestion{
+    width: 400px !important;
+  }
+  
 
 </style>

src/xt_pages/stock/stockInOrderEdit.vue

@@ -211,6 +211,18 @@
               {{ calculate(scope.row.price * scope.row.warehousing_count) }}
             </template>
           </el-table-column>
+          <el-table-column label="生产厂家" align="center" width="150">
+             <template slot-scope="scope">
+               <el-select size="small" v-model="scope.row.manufacturer" filterable placeholder="请选择厂商">
+                <el-option
+                  v-for="(option, index) in manufacturerList"
+                  :key="index"
+                  :label="option.manufacturer_name"
+                  :value="option.id">
+                </el-option>
+               </el-select>
+            </template>
+          </el-table-column>
 
           <el-table-column align="center" width="150">
             <template slot="header" slot-scope="scope">
@@ -228,7 +240,6 @@
 
           <el-table-column label="生产日期" width="180" align="center">
             <template slot-scope="scope">
-              <!--{{scope.row.product_date | parseTime("{y}-{m}-{d}")}}-->
               <el-date-picker
                 prefix-icon="el-icon-date"
                 style="width: 145px"
@@ -242,7 +253,6 @@
           </el-table-column>
           <el-table-column label="有效日期" width="180" align="center">
             <template slot-scope="scope">
-              <!--{{ scope.row.expiry_date | parseTime("{y}-{m}-{d}")}}-->
               <el-date-picker
                 prefix-icon="el-icon-date"
                 style="width: 145px"
@@ -254,6 +264,18 @@
               ></el-date-picker>
             </template>
           </el-table-column>
+          <el-table-column label="经销商" align="center" width="150">
+             <template slot-scope="scope">
+               <el-select size="small" v-model="scope.row.dealer" filterable placeholder="请选择厂商">
+                <el-option
+                  v-for="(option, index) in dealerList"
+                  :key="index"
+                  :label="option.dealer_name"
+                  :value="option.id">
+                </el-option>
+               </el-select>
+            </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>
@@ -311,9 +333,6 @@ import {
   GetAllConfig,
   getWarehouseInfoList,
   GetAllGoodInfoByID,
-  getWarehouseInfoByOrdeNumber,
-  modifyWarehouseInfo,
-  deleteWarehouseInfo,
   DeleteWarehouseInfoItem,
   EditWarehouse,
   postSearchGoodList
@@ -384,8 +403,9 @@ export default {
       },
       warehouse: {},
       manufacturer: [],
-      dealer: [],
-      goodType: []
+      dealerList: [],
+      goodType: [],
+      manufacturerList:[]
     };
   },
   methods: {
@@ -447,11 +467,13 @@ export default {
           return false;
         } else {
           this.manufacturer = response.data.data.manufacturer;
+          this.manufacturerList = response.data.data.manufacturer
+          this.dealerList = response.data.data.dealer
           this.dealer = response.data.data.dealer;
           this.goodType = response.data.data.goodType;
           this.goodInfo = response.data.data.goodInfo;
-          this.manufacturer.splice(0, 0, { id: 0, manufacturer_name: "全部" });
-          this.dealer.splice(0, 0, { id: 0, dealer_name: "全部" });
+          // this.manufacturer.splice(0, 0, { id: 0, manufacturer_name: "全部" });
+          // this.dealer.splice(0, 0, { id: 0, dealer_name: "全部" });
         }
         loading.close();
       });
@@ -610,10 +632,14 @@ export default {
               return;
             }
           }
-
+          for(let i=0;i<this.recordInfo.recordData.length;i++){
+            this.recordInfo.recordData[i].price = this.recordInfo.recordData[i].price.toString()
+          }
           const params = {
             stockIn: this.recordInfo.recordData
           };
+          console.log("params2222",params)
+       
           EditWarehouse(
             params,
             this.warehousing_time,
@@ -646,6 +672,7 @@ export default {
           return false;
         } else {
           console.log("列表2222222",response.data.data.info)
+         
           for (let i = 0; i < response.data.data.info.length; i++) {
             response.data.data.info[i].product_date = this.getTime(
               response.data.data.info[i].product_date,
@@ -658,15 +685,18 @@ export default {
             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();
             response.data.data.info[i].good_name = response.data.data.info[i].GoodInfo.good_name
-            response.data.data.info[i].name = response.data.data.info[i].GoodInfo.specification_name + "*" + response.data.data.info[i].GoodInfo.min_number+response.data.data.info[i].GoodInfo.min_unit
-            response.data.data.info[i].min_unit = response.data.data.info[i].GoodInfo.min_unit
+            response.data.data.info[i].name = response.data.data.info[i].GoodInfo.specification_name + "*" + response.data.data.info[i].GoodInfo.min_number+response.data.data.info[i].GoodInfo.packing_unit
+            response.data.data.info[i].packing_unit = response.data.data.info[i].GoodInfo.packing_unit
+            
+           
+           
             this.recordInfo.recordData.push(response.data.data.info[i]);
+           
             console.log("列表",this.recordInfo.recordData)
           }
 
           this.warehouse = response.data.data.warehousing;
-          this.form.manufacturer = this.warehouse.manufacturer;
-          this.form.dealer = this.warehouse.dealer;
+        
 
           this.warehousing_time = this.getTime(
             this.warehouse.warehousing_time,
@@ -696,22 +726,28 @@ export default {
         if (keyword != undefined) {
           key = keyword
         }
-        console.log("keyrowrd",key)
         postSearchGoodList(key).then(response => {
           if (response.data.state == 1) {
           
             var list = response.data.data.list
             this.goodList = list
-            var manufacturerList = response.data.data.manufacturerList
-            this.manufacturerList = manufacturerList
-            for(let i=0;i<this.goodList.length;i++){
-                for(let j=0;j<this.manufacturerList.length;j++){
-                  if(this.goodList[i].manufacturer == this.manufacturerList[j].id){
-                    this.goodList[i].manufacturer = this.manufacturerList[j].manufacturer_name
-                  }
-                }
-            }
-          
+            // var manufacturerList = response.data.data.manufacturerList
+            // this.dealerList = response.data.data.dealerList
+            // this.manufacturerList = manufacturerList
+            // for(let i=0;i<this.goodList.length;i++){
+            //     for(let j=0;j<this.manufacturerList.length;j++){
+            //       if(this.goodList[i].manufacturer == this.manufacturerList[j].id){
+            //         this.goodList[i].manufacturer = this.manufacturerList[j].manufacturer_name
+            //       }
+            //     }
+            // }
+            // for(let i=0;i<this.goodList.length;i++){
+            //    for(let j=0;j<this.dealerList.length;j++){
+            //       if(this.goodList[i].dealer == this.dealerList[j].id){
+            //         this.goodList[i].dealer = this.dealerList[j].dealer_name
+            //       }
+            //    }
+            //  }
             cb(this.goodList)
           } else {
             cb([])
@@ -735,7 +771,8 @@ export default {
             this.recordInfo.recordData[i].price = val.buy_price
             this.recordInfo.recordData[i].specification_name = val.specification_name
             this.recordInfo.recordData[i].good_id = val.id
-            this.recordInfo.recordData[i].min_unit = val.min_unit
+            this.recordInfo.recordData[i].packing_unit = val.packing_unit
+            this.recordInfo.recordData[i].dealer = val.dealer
           }
         }
     }

src/xt_pages/stock/stockOutOrder.vue

@@ -69,9 +69,8 @@
           @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
@@ -108,17 +107,7 @@
             {{ getXuserName(scope.row.creater) }}
           </template>
         </el-table-column>
-        <el-table-column label="厂家" align="center">
-          <template slot-scope="scope">
-            {{ getManufactuerName(scope.row.manufacturer) }}
-          </template>
-        </el-table-column>
-
-        <el-table-column label="经销商" align="center">
-          <template slot-scope="scope">
-            {{ getDealerName(scope.row.dealer) }}
-          </template>
-        </el-table-column>
+       
 
         <el-table-column label="操作" align="center" width="300px">
           <template slot-scope="scope">
@@ -173,116 +162,98 @@
       <el-pagination
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
-        :page-sizes="[10, 50, 100]"
-        :page-size="10"
+        :page-sizes="[5, 10, 50, 100]"
+        :page-size="5"
         background
-        style="margin-top:20px;float: right"
+        style="margin-top:20px;text-align: right"
         layout="total, sizes, prev, pager, next, jumper"
         :total="total"
       >
       </el-pagination>
+      <!--  详情 -->
+      <div v-show="tableShow" style="margin-top:10px;">
+        <el-table
+            :data="tableList"
+            :class="signAndWeighBoxPatients"
+            style="width: 100%"
+            border
+            highlight-current-row
+            ref="multipleTable"
+            @selection-change="select"
+            :row-style="{ color: '#303133' }"
+            :header-cell-style="{
+              backgroundColor: 'rgb(245, 247, 250)',
+              color: '#606266'
+            }"
+          >
+          <el-table-column label="耗材名称" align="center">
+            <template slot-scope="scope">
+              {{ scope.row.good_name }}
+            </template>
+          </el-table-column>
+          <el-table-column label="耗材类型" align="center">
+            <template slot-scope="scope">
+              {{  getTypeName(scope.row.good_type_id)}}
+            </template>
+          </el-table-column>
+          <el-table-column label="规格&单位" align="center">
+            <template slot-scope="scope">
+              {{ scope.row.specification_name}} * {{scope.row.min_number}}{{scope.row.min_unit}}
+            </template>
+          </el-table-column>
+          <!-- <el-table-column label="批号" align="center">
+            <template slot-scope="scope">
+              {{ scope.row.number}}
+            </template>
+          </el-table-column> -->
+          <el-table-column label="出库数量" align="center">
+            <template slot-scope="scope">
+              <span v-if="scope.row.is_sys == 0">{{ scope.row.count}}</span> 
+              <span v-if="scope.row.is_sys == 1">{{getOutStockCount(scope.row.good_id)}}</span> 
+            </template>
+          </el-table-column>
+          <el-table-column label="出货价" align="center">
+            <template slot-scope="scope">
+              {{ scope.row.price}}
+            </template>
+          </el-table-column>
+          <el-table-column label="总价" align="center">
+            <template slot-scope="scope">
+              {{ (scope.row.count * scope.row.price).toFixed(2)}}
+            </template>
+          </el-table-column>
+          <el-table-column label="生产厂家" align="center">
+            <template slot-scope="scope">
+              {{ getManufactuerName(scope.row.manufacturer)}}
+            </template>
+          </el-table-column>
+          <!-- <el-table-column label="生产日期" align="center">
+            <template slot-scope="scope">
+              {{ getTime(scope.row.product_date)}}
+            </template>
+          </el-table-column>
+          <el-table-column label="有效期" align="center">
+            <template slot-scope="scope">
+              {{ getTime(scope.row.expiry_date)}}
+            </template>
+          </el-table-column> -->
+          <el-table-column label="备注" align="center">
+            <template slot-scope="scope">
+              {{ 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="GetOrderDetailById(scope.row)">使用明细</span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
     </div>
 
 
 
-   <!--  详情 -->
-  <div v-show="tableShow">
-     <el-table
-        :data="tableList"
-        :class="signAndWeighBoxPatients"
-        style="width: 100%"
-        border
-        highlight-current-row
-        ref="multipleTable"
-        @selection-change="select"
-        :row-style="{ color: '#303133' }"
-        :header-cell-style="{
-          backgroundColor: 'rgb(245, 247, 250)',
-          color: '#606266'
-        }"
-      >
-       <el-table-column align="center" type="selection" width="55">
-       </el-table-column>
-
-       <el-table-column label="耗材名称" align="center">
-          <template slot-scope="scope">
-            {{ scope.row.GoodInfo.good_name }}
-          </template>
-        </el-table-column>
-      
-        <el-table-column label="耗材类型" align="center">
-          <template slot-scope="scope">
-            {{  getTypeName(scope.row.GoodInfo.good_type_id)}}
-          </template>
-        </el-table-column>
-
-
-       <el-table-column label="规格&单位" align="center">
-          <template slot-scope="scope">
-            {{ scope.row.GoodInfo.specification_name}} * {{scope.row.GoodInfo.min_number}}{{scope.row.GoodInfo.min_unit}}
-          </template>
-        </el-table-column>
-
-
-       <el-table-column label="批号" align="center">
-          <template slot-scope="scope">
-            {{ scope.row.number}}
-          </template>
-        </el-table-column>
-        
-        <el-table-column label="出库数量" align="center">
-          <template slot-scope="scope">
-            {{ scope.row.count}}
-          </template>
-        </el-table-column>
-
-
-        <el-table-column label="出货价" align="center">
-          <template slot-scope="scope">
-            {{ scope.row.price}}
-          </template>
-        </el-table-column>
-
-
-       <el-table-column label="总价" align="center">
-          <template slot-scope="scope">
-            {{ (scope.row.count * scope.row.price).toFixed(2)}}
-          </template>
-        </el-table-column>
-
-
-         <el-table-column label="生产厂家" align="center">
-          <template slot-scope="scope">
-            {{ getManufactuerName(scope.row.GoodInfo.manufacturer)}}
-          </template>
-        </el-table-column>
-
-        <el-table-column label="生产日期" align="center">
-          <template slot-scope="scope">
-            {{ getTime(scope.row.product_date)}}
-          </template>
-        </el-table-column>
-
-
-       <el-table-column label="有效期" align="center">
-          <template slot-scope="scope">
-            {{ getTime(scope.row.expiry_date)}}
-          </template>
-        </el-table-column>
-
-        <el-table-column label="备注" align="center">
-          <template slot-scope="scope">
-            {{ 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>
+  
 
 
     <!-- 新增弹窗 -->
@@ -604,7 +575,7 @@
   
     <el-dialog
       title="出库明细"
-      :visible.sync="editdialogVisibleTwo"
+      :visible.sync="editdialogVisibleThree"
       width="60%">
       <span>
          <div class="app-container">
@@ -665,8 +636,8 @@
     </div>
       </span>
       <span slot="footer" class="dialog-footer">
-        <el-button @click="editdialogVisibleTwo = false">取 消</el-button>
-        <el-button type="primary" @click="editdialogVisibleTwo = false">确 定</el-button>
+        <el-button @click="editdialogVisibleThree = false">取 消</el-button>
+        <el-button type="primary" @click="editdialogVisibleThree = false">确 定</el-button>
       </span>
     </el-dialog>
 
@@ -697,6 +668,8 @@ import {
   deleteWarehouseOutInfo,
   GetAllGoodInfoByID,
   editWarehouseoutInfo,
+  getOrderDetailByOrderId,
+  getOrderDetailById
 } from "@/api/stock";
 import BreadCrumb from "../components/bread-crumb";
 import StockInDialog from './Dialog/stockInDialog'
@@ -747,7 +720,7 @@ export default {
         { path: false, name: "出库单" }
       ],
       page: 1,
-      limit: 10,
+      limit: 5,
       checked: false,
       total: 0,
       pageTotal: 0,
@@ -812,7 +785,10 @@ export default {
       tableList:[],
       dialogVisibleTwo:false,
       userList:[],
-      editdialogVisibleTwo:false
+      editdialogVisibleTwo:false,
+      editdialogVisibleThree:false,
+      order_id:0,
+      warehouse_out_time:"",
     };
   },
   methods: {
@@ -1025,6 +1001,9 @@ export default {
       }
     },
     select(selection) {
+      console.log("selection",selection)
+      this.order_id = selection[0].id
+      this.warehouse_out_time = selection[0].warehouse_out_time
       this.selectedTableData = selection;
     },
     batchDelete() {
@@ -1086,33 +1065,49 @@ export default {
 
     handleSearch(val){
       this.tableList = []
+    
+      this.editdialogVisibleThree = false
       this.GetOrderDetailOne(val.id)
       this.GetTotalCount(val.warehouse_out_time)
     },
   
     //获取出库单详情数据
-    GetOrderDetailOne(id) {
+    // GetOrderDetailOne(id) {
+    //     const params = {
+    //       'id': id
+    //     }
+    //     console.log("#3333333",id)
+    //   getWarehouseOutInfo(params).then(response => {
+    //       if (response.data.state == 0) {
+
+    //         this.$message.error(response.data.msg)
+    //         return false
+    //       } else {
+    //         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
+    //       }
+    //     })
+    //  }, 
+     GetOrderDetailOne(id){
         const params = {
           'id': id
         }
-        console.log("#3333333",id)
-      getWarehouseOutInfo(params).then(response => {
-          if (response.data.state == 0) {
-
-            this.$message.error(response.data.msg)
-            return false
-          } else {
-            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
-            // this.handleSpanTempArr()
-          }
+        getOrderDetailByOrderId(params).then(response=>{
+           if(response.data.state == 1){
+             this.tableShow = true
+             var list = response.data.data.list
+             console.log("list22222222",list)
+             for(let i=0;i<list.length;i++){
+               this.tableList.push(list[i])
+             }
+           }
         })
-     }, 
+     },
 
       getTypeName: function(id) {
         let name = ''
@@ -1158,10 +1153,10 @@ export default {
     },
 
      GetOrderDetail: function(order_id) {
+       this.userList = []
         const params = {
           'id': order_id
         }
-      
         getWarehouseOutUser(params).then(response => {
           if (response.data.state == 0) {
             this.$message.error(response.data.msg)
@@ -1183,7 +1178,7 @@ export default {
             // this.type_name = this.userList[0].type.type_name
             // this.specification_name = this.userList[0].info.specification_name
             console.log("详情数据区",this.userList)
-            this.editdialogVisibleTwo = true
+            this.editdialogVisibleThree = true
           }
         })
       },
@@ -1503,8 +1498,42 @@ export default {
         })
       }, 
      
-     
-
+      GetOrderDetailById(val){
+         this.userList =[]
+         var params = {
+           good_id:val.good_id,
+           record_time:val.sys_record_time,
+          }
+         getOrderDetailById(params).then(response=>{
+            if(response.data.state == 1){
+              var total = 0
+              var list = response.data.data.list
+              var arrList =  this.unique(list)
+              for (let i = 0; i < arrList.length; i++) {
+                var obj = arrList[i]
+                obj['is_total'] = 0
+                this.userList.push(obj)
+                total = total + arrList[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.editdialogVisibleThree = true
+            }
+         })
+      },
+      toPrint(){
+        if(this.order_id == 0){
+          this.$message.error("请选择出库单")
+        }else{
+            this.$router.push({path:"/stock/out/detail/print?id="+this.order_id+"&warehouse_out_time="+this.warehouse_out_time})
+        }
+      
+      }
   }
 };
 </script>

src/xt_pages/stock/stockOutOrderAdd.vue

@@ -54,7 +54,7 @@
         ></el-date-picker>
       </div>
 
-      <div class="cell clearfix">
+      <!-- <div class="cell clearfix">
         <label class="title"><span class="name">经销商</span> : </label>
         <el-select
           size="small"
@@ -72,9 +72,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
           size="small"
@@ -92,7 +92,7 @@
           >
           </el-option>
         </el-select>
-      </div>
+      </div> -->
 
       <el-form :rules="tableRules" :model="recordInfo" ref="tableForm">
         <el-table
@@ -159,14 +159,14 @@
             </template>
           </el-table-column>
           
-          <el-table-column  width="150" align="center">
+          <!-- <el-table-column  width="150" align="center">
              <template slot="header" slot-scope="scope">
-              <span>批号<span style="color: red">*</span></span>
+              <span>批号<span style="color: red"></span></span>
             </template>
             <template slot-scope="scope">
                <el-input placeholder="请输入批号" v-model="scope.row.number"></el-input>
             </template>
-          </el-table-column>
+          </el-table-column> -->
 
          <el-table-column  width="150" align="center">
             <template slot="header" slot-scope="scope">
@@ -355,7 +355,7 @@ export default {
       },
       warehouseInfoList: [],
       manufacturer: [],
-      dealer: [],
+      dealerList: [],
       goodType: [],
       goodInfo:[],
       goodList:[],
@@ -579,11 +579,18 @@ export default {
           for(let i=0;i<this.recordInfo.recordData.length;i++){
              this.recordInfo.recordData[i].price = this.recordInfo.recordData[i].price.toString()
           }
+          for(let i=0;i<this.recordInfo.recordData.length;i++){
+            for(let j=0;j<this.manufacturerList.length;j++){
+              if(this.recordInfo.recordData[i].manufacturer == this.manufacturerList[j].manufacturer_name){
+                 this.recordInfo.recordData[i].manufacturer = this.manufacturerList[j].id
+              }
+            }
+          }
           const params = {
             stockOut: this.recordInfo.recordData
           };
           console.log("2323223223",this.recordInfo.recordData);
-          
+        
           postWarehouseOut(
             params,
             this.warehouse_out_time,
@@ -649,7 +656,6 @@ export default {
             this.recordInfo.recordData[i].good_name = val.good_name
             this.recordInfo.recordData[i].good_type_id = val.good_type_id
             this.recordInfo.recordData[i].name = val.specification_name + "*" + val.min_number+val.min_unit +"/"+val.packing_unit
-            // this.recordInfo.recordData[i].number =  val.number
             this.recordInfo.recordData[i].manufacturer = val.manufacturer
             this.recordInfo.recordData[i].remark = val.remark
             this.recordInfo.recordData[i].price = val.buy_price
@@ -712,4 +718,7 @@ export default {
 .sign-and-weigh-box .sign-and-weigh-box-patients .current-row > td {
   background: #6fb5fa;
 }
+.el-autocomplete-suggestion{
+  width: 400px !important;
+}
 </style>

src/xt_pages/stock/stockOutOrderEdit.vue

@@ -32,7 +32,7 @@
       </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="请选择经销商" @change="changeDealer" style="width: 200px;">
           <el-option
@@ -42,10 +42,10 @@
             :value="option.id">
           </el-option>
         </el-select>
-      </div>
+      </div> -->
 
 
-      <div class="cell clearfix">
+      <!-- <div class="cell clearfix">
         <label class="title"><span class="name">厂商</span> : </label>
         <el-select size="small" v-model="form.manufacturer" clearable placeholder="请选择厂商" @change="changeManufacturer" style="width: 200px;">
           <el-option
@@ -55,7 +55,7 @@
             :value="option.id">
           </el-option>
         </el-select>
-      </div>
+      </div> -->
 
       <el-form :rules="tableRules" :model="recordInfo" ref="tableForm">
         <el-table :data="recordInfo.recordData" :class="signAndWeighBoxPatients" style="width: 100%" border
@@ -164,6 +164,18 @@
               {{calculate(scope.row.price*scope.row.count)}}
             </template>
           </el-table-column>
+          <el-table-column label="生产厂商"  width="150" align="center">
+            <template slot-scope="scope">
+               <el-select size="small" v-model="scope.row.manufacturer" filterable placeholder="请选择厂商">
+                <el-option
+                  v-for="(option, index) in manufacturerList"
+                  :key="index"
+                  :label="option.manufacturer_name"
+                  :value="option.id">
+                </el-option>
+               </el-select>
+            </template>   
+          </el-table-column>
           <el-table-column label="备注" min-width="20" align="center">
             <template slot-scope="scope">
               <el-input v-model="scope.row.remark"></el-input>
@@ -311,7 +323,8 @@
         this.propForm.goods = [];
 
         this.propForm.goodType = [];
-      }, GetConfigInfo: function() {
+      }, 
+      GetConfigInfo: function() {
         const loading = this.$loading({
           lock: true,
           text: "Loading",
@@ -323,12 +336,12 @@
             this.$message.error(response.data.msg);
             return false;
           } else {
-            this.manufacturer = response.data.data.manufacturer;
+            this.manufacturerList = response.data.data.manufacturer;
             this.dealer = response.data.data.dealer;
             this.goodType = response.data.data.goodType;
             this.goodInfo = response.data.data.goodInfo;
-            this.manufacturer.splice(0, 0, { id: 0, manufacturer_name: "全部" });
-            this.dealer.splice(0, 0, { id: 0, dealer_name: "全部" });
+            // this.manufacturer.splice(0, 0, { id: 0, manufacturer_name: "全部" });
+            // this.dealer.splice(0, 0, { id: 0, dealer_name: "全部" });
           }
           loading.close();
         });
@@ -471,12 +484,15 @@
                 return
               }
             }
-
+            for(let i=0;i<this.recordInfo.recordData.length;i++){
+               this.recordInfo.recordData[i].price = this.recordInfo.recordData[i].price.toString()
+            }
             const params = {
               'stockOut': this.recordInfo.recordData
             }
-            
            
+            console.log("stockout",params)
+            
             editWarehouseoutInfo(params, this.warehouse_out_time, this.$route.query.id, this.$route.query.type, this.form.manufacturer, this.form.dealer).then(response => {
               if (response.data.state == 0) {
                 this.$message.error(response.data.msg)
@@ -490,7 +506,8 @@
             return false
           }
         })
-      }, GetOrderDetail: function(order_id) {
+      }, 
+      GetOrderDetail: function(order_id) {
         const params = {
           'id': order_id
         }
@@ -505,6 +522,7 @@
               response.data.data.list[i].count = response.data.data.list[i].count.toString()
               response.data.data.list[i].good_name = response.data.data.list[i].GoodInfo.good_name
               response.data.data.list[i].name = response.data.data.list[i].GoodInfo.good_name + "*" + response.data.data.list[i].GoodInfo.specification_name
+
               this.recordInfo.recordData.push(response.data.data.list[i])
             }
             this.warehouseOut = response.data.data.info
@@ -546,15 +564,15 @@
           
             var list = response.data.data.list
             this.goodList = list
-            var manufacturerList = response.data.data.manufacturerList
-            this.manufacturerList = manufacturerList
-            for(let i=0;i<this.goodList.length;i++){
-              for(let j=0;j<this.manufacturerList.length;j++){
-                if(this.goodList[i].manufacturer == this.manufacturerList[j].id){
-                    this.goodList[i].manufacturer = this.manufacturerList[j].manufacturer_name
-                }
-              }
-            }
+            // var manufacturerList = response.data.data.manufacturerList
+            // this.manufacturerList = manufacturerList
+            // for(let i=0;i<this.goodList.length;i++){
+            //   for(let j=0;j<this.manufacturerList.length;j++){
+            //     if(this.goodList[i].manufacturer == this.manufacturerList[j].id){
+            //         this.goodList[i].manufacturer = this.manufacturerList[j].manufacturer_name
+            //     }
+            //   }
+            // }
           
             cb(this.goodList)
         } else {
@@ -579,6 +597,7 @@
             this.recordInfo.recordData[i].price = val.buy_price
             this.recordInfo.recordData[i].specification_name = val.specification_name
             this.recordInfo.recordData[i].good_id = val.id
+
          }
       }
     }

src/xt_pages/stock/stockQuery.vue

@@ -64,96 +64,7 @@
       </div>
 
 
-      <!-- <el-table
-        :row-style="{ color: '#303133' }"
-        :header-cell-style="{
-          backgroundColor: 'rgb(245, 247, 250)',
-          color: '#606266'
-        }"
-        :data="WarehouseInfo.warehouseInfoDate"
-        :class="signAndWeighBoxPatients"
-        border
-        v-loading="WarehouseInfo.loading"
-      >
-        <el-table-column label="商品编码" align="center">
-          <template slot-scope="scope">
-            {{ scope.row.good_code }}
-          </template>
-        </el-table-column>
-        <el-table-column label="耗材名称" align="center">
-          <template slot-scope="scope">
-            {{ scope.row.good_name }}
-          </template>
-        </el-table-column>
-        <el-table-column label="耗材类型" align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.type.type_name }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="规格型号" align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.specification_name }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="单位" align="center">
-          <template slot-scope="scope">
-            <span>{{getUnit(scope.row.good_unit)}}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="进货价" align="center">
-          <template slot-scope="scope">
-            <span v-if="scope.row.query_warehousing_info.length>0">{{scope.row.query_warehousing_info[0].price?scope.row.query_warehousing_info[0].price:""}}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="入库数量" align="center">
-          <template slot-scope="scope">
-            <span
-              @click="showStockInDetailDialog(scope.row.good_id)"
-              >{{ stockInCount(scope.row) }}</span
-            >
-          </template>
-        </el-table-column>
-        <el-table-column label="入库退货" align="center">
-          <template slot-scope="scope">
-            <span
-              @click="showSaleReturnDetailDialog(scope.row)"
-              >{{ salesReturnCount(scope.row) }}</span
-            >
-          </template>
-        </el-table-column>
-        <el-table-column label="实际入库" align="center">
-          <template slot-scope="scope">
-            {{ stockInCount(scope.row) - salesReturnCount(scope.row) }}
-          </template>
-        </el-table-column>
-        <el-table-column label="出库数量" align="center">
-          <template slot-scope="scope">
-            <span
-              @click="showStockOutDetailDialog(scope.row.good_id)"
-              >{{ stockOutCount(scope.row) }}</span
-            >
-          </template>
-        </el-table-column>
-        <el-table-column label="出库退库" align="center">
-          <template slot-scope="scope">
-            <span
-              @click="showCancelStockDetailDialog(scope.row)"
-              >{{ cancelStockCount(scope.row) }}</span
-            >
-          </template>
-        </el-table-column>
-        <el-table-column label="实际出库" align="center">
-          <template slot-scope="scope">
-            {{ stockOutCount(scope.row) - cancelStockCount(scope.row) }}
-          </template>
-        </el-table-column>
 
-        <el-table-column label="剩余库存" align="center">
-          <template slot-scope="scope">
-            <span>{{stockInCount(scope.row)  - stockOutCount(scope.row) }}</span>
-          </template>
-        </el-table-column>
-      </el-table> -->
        <el-table
         :row-style="{ color: '#303133' }"
         :header-cell-style="{
@@ -185,7 +96,7 @@
             {{scope.row.price}}
           </template>
         </el-table-column>
-        <el-table-column label="厂商" align="center">
+        <el-table-column label="生产商" align="center">
           <template slot-scope="scope">
            {{getManufacture(scope.row.manufacturer)}}
           </template>
@@ -197,7 +108,7 @@
        </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>
+           <span>{{getOutCount(scope.row.good_id) + getAutoCount(scope.row.good_id)}}</span>
 
          </template>
        </el-table-column>
@@ -350,7 +261,7 @@ export default {
 
          }
 
-        console.log("数据2222222",this.WarehouseInfo.warehouseInfoDate)
+       
       });
     },
 
@@ -544,7 +455,14 @@ export default {
        return name
     },
     toClick(val){
-      this.$router.push({path:"/stock/in/stockflow?id="+val.good_id+"&good_name="+val.good_name})
+       var manufacturer_name = ""
+       for(let i=0;i<this.manufacturerList.length;i++){
+          if(val.manufacturer == this.manufacturerList[i].id){
+            manufacturer_name = this.manufacturerList[i].manufacturer_name  
+          }
+       }
+      console.log("厂家22222",manufacturer_name)
+      this.$router.push({path:"/stock/in/stockflow?id="+val.good_id+"&good_name="+val.good_name+"&manufacturer="+manufacturer_name})
     },
     toClickOne(val){
       this.$router.push({path:"/stock/in/stockbatchnumber?id="+val.good_id+"&good_name="+val.good_name})
@@ -591,7 +509,7 @@ export default {
      var count= ""
      for(let i=0;i<this.autoCountList.length;i++){
        if(id == this.autoCountList[i].good_id){
-         count = this.outCountList[i].count
+         count = this.autoCountList[i].count
        }
      }
      return count

src/xt_pages/user/courseOfDisease.vue

@@ -335,6 +335,7 @@
           return
         }
         this.uploading_new_record = true
+        
         createCourseOfDiseaseRecord(this.patient_id, this.new_content, this.course_of_disease_time, this.title).then(rs => {
           this.uploading_new_record = false
           var resp = rs.data