数据

config/dev.env.js

@@ -6,9 +6,9 @@
 module.exports = {
   NODE_ENV: '"development"',
   ENV_CONFIG: '"dev"',
-  // BASE_API: '"http://new_mobile.xt.api.sgjyun.com"', // //http://api.xt.test.sgjyun.com http://112.74.16.180:9527,////'"http://localhost:9529"',
-  // BASE_API: '"http://api.xt.test.sgjyun.com"',
-  BASE_API: '"http://localhost:9529"',
+  //BASE_API: '"http://new_mobile.xt.api.sgjyun.com"', // //http://api.xt.test.sgjyun.com http://112.74.16.180:9527,////'"http://localhost:9529"',
+  BASE_API: '"http://api.xt.test.sgjyun.com"',
+  // BASE_API: '"http://localhost:9529"',
   SSO_HOST: '"http://testsso.sgjyun.com"',
   SRCM_HOST: '"http://test1.sgjyun.com"',
   XT_HOST: '"http://xt.test.sgjyun.com"',

config/index.js

@@ -29,8 +29,8 @@ module.exports = {
 
     // host: 'xt.test.sgjyun.com',
     //  host: 'xt.kuyicloud.com',
-    // host: 'xt.test.sgjyun.com',
-   host: 'localhost',
+   host: 'xt.test.sgjyun.com',
+  //  host: 'localhost',
     port: 9528, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     autoOpenBrowser: true,
     errorOverlay: true,

src/api/drug/drug.js

@@ -1,286 +1,397 @@
-import request from "@/utils/request";
+import request from '@/utils/request'
 
-export function getCurrentPatient(params){
-   return request({
-      url:"/api/drug/getcurrentpatient",
-      methods:"get",
-      params:params  
-   })
+export function getCurrentPatient(params) {
+  return request({
+    url: '/api/drug/getcurrentpatient',
+    methods: 'get',
+    params: params
+  })
 }
 
-export function getAllDrugName(params){
-   return request({
-     url:"/api/drug/getalldrugname",
-     methods:"get",
-     params:params
-   })
+export function getAllDrugName(params) {
+  return request({
+    url: '/api/drug/getalldrugname',
+    methods: 'get',
+    params: params
+  })
 }
 
+export function saveDrugName(params) {
+  return request({
+    url: '/api/drug/savedrugname',
+    methods: 'get',
+    params: params
+  })
+}
 
-export function saveDrugName(params){
+export function getdrugNameList(params) {
   return request({
-     url:"/api/drug/savedrugname",
-     methods:"get",
-     params:params
+    url: '/api/drug/getdrugnamelist',
+    methods: 'get',
+    params: params
   })
 }
 
-export function getdrugNameList(params){ 
+export function getRulleName(params) {
   return request({
-     url:"/api/drug/getdrugnamelist",
-     methods:"get",
-     params:params
+    url: '/api/drug/getrullename',
+    methods: 'get',
+    params: params
   })
 }
 
-export function getRulleName(params){
+export function getUnitByBaseId(params) {
   return request({
-     url:"/api/drug/getrullename",
-     methods:"get",
-     params:params 
-   })
+    url: '/api/drug/getunitbybaseid',
+    methods: 'get',
+    params: params
+  })
 }
 
-export function getUnitByBaseId(params){
+export function saveRulleName(params) {
   return request({
-     url:"/api/drug/getunitbybaseid",
-     methods:"get",
-     params:params  
+    url: '/api/drug/saverullename',
+    methods: 'get',
+    params: params
   })
 }
 
-export function saveRulleName(params){
+export function EditRullerName(params) {
   return request({
-     url:"/api/drug/saverullename",
-     methods:"get",
-     params:params
+    url: '/api/drug/editrullername',
+    methods: 'get',
+    params: params
   })
 }
 
-export function EditRullerName(params){
-   return request({
-     url:"/api/drug/editrullername",
-     methods:"get",
-     params:params
-   })
+export function updatedRulleName(params) {
+  return request({
+    url: '/api/drug/updatedrullername',
+    methods: 'get',
+    params: params
+  })
 }
 
+export function getAllDrugNameList(params) {
+  return request({
+    url: '/api/drug/getalldrugnamelist',
+    methods: 'Get',
+    params: params
+  })
+}
 
-export function updatedRulleName(params){
-  
+export function getRullListByDrugName(params) {
   return request({
-    url:"/api/drug/updatedrullername",
-    methods:"get",
-    params:params
+    url: '/api/drug/getrulllistbydrugname',
+    methods: 'Get',
+    params: params
   })
 }
 
-export function getAllDrugNameList(params){
-  
+export function SaveSelfMedicines(data) {
   return request({
-     url:"/api/drug/getalldrugnamelist",
-     methods:"Get",
-     params:params
+    url: '/api/drug/saveselfmedicines',
+    method: 'post',
+    data: data
   })
 }
 
-export function getRullListByDrugName(params){
-  
-   return request({
-       url:"/api/drug/getrulllistbydrugname",
-       methods:"Get",
-       params:params
-    })
+export function getCurrentOrgAllStaff(params) {
+  return request({
+    url: '/api/drug/getcurrentorgallstaff',
+    methods: 'get',
+    params: params
+  })
 }
 
-export function SaveSelfMedicines(data){
-   
-   return request({
-      url:"/api/drug/saveselfmedicines",
-      method:"post",
-      data:data
-   })
+export function saveStock(data, startime, adminuserid, patientid) {
+  return request({
+    url: '/api/drug/savestock?start_time=' + startime + '&admin_user_id=' + adminuserid + '&patient_id=' + patientid,
+    method: 'post',
+    data: data
+  })
 }
 
-export function getCurrentOrgAllStaff(params){
-   return request({
-      url:"/api/drug/getcurrentorgallstaff",
-      methods:"get",
-      params:params
-   })
+export function saveOutStock(data, startime, adminuserid, patientid) {
+  return request({
+    url: '/api/drug/saveoutstock?start_time=' + startime + '&admin_user_id=' + adminuserid + '&patient_id=' + patientid,
+    method: 'post',
+    data: data
+  })
 }
 
+export function DeleteDrugById(params) {
+  return request({
+    url: '/api/drug/deletedrugbyid',
+    method: 'get',
+    params: params
+  })
+}
 
-export function saveStock(data,startime,adminuserid,patientid){
-  
-   return request({
-      url:"/api/drug/savestock?start_time="+startime+"&admin_user_id="+adminuserid+"&patient_id="+patientid,
-      method:"post",
-      data:data
-   })
+export function saveRadio(params) {
+  return request({
+    url: '/api/drug/saveradio',
+    method: 'get',
+    params: params
+  })
+}
 
+export function DeleteDrugStand(id, name) {
+  const params = {
+    id: id,
+    name: name
+  }
+  return request({
+    url: '/api/drug/deletedrugstand',
+    method: 'get',
+    params: params
+  })
 }
 
-export function saveOutStock(data,startime,adminuserid,patientid){
-   return request({
-      url:"/api/drug/saveoutstock?start_time="+startime+"&admin_user_id="+adminuserid+"&patient_id="+patientid,
-      method:"post",
-      data:data
-   })
+export function getStockList(params) {
+  return request({
+    url: '/api/drug/getstocklist',
+    method: 'get',
+    params: params
+  })
 }
 
-export function DeleteDrugById(params){
-   return request({
-      url:"/api/drug/deletedrugbyid",
-      method:"get",
-      params:params
-   })
+export function DeleteDrugName(params) {
+  return request({
+    url: '/api/drug/deletedrugname',
+    method: 'get',
+    params: params
+  })
 }
 
-export function saveRadio(params){
-  
-   return request({
-      url:"/api/drug/saveradio",
-      method:"get",
-      params:params
-   })
+export function getDrugDetail(params) {
+  return request({
+    url: '/api/drug/getdrugdetail',
+    method: 'get',
+    params: params
+  })
 }
 
-export function DeleteDrugStand(id,name){
-    const params = {
-      id:id,
-      name:name
-    }
-   return request({
-      url:"/api/drug/deletedrugstand",
-      method:"get",
-      params:params
-   })
+export function getAllPatientStockList(params) {
+  return request({
+    url: '/api/drug/getallpatientstocklist',
+    method: 'get',
+    params: params
+  })
+}
+
+export function getDrugDataByPatientId(params) {
+  return request({
+    url: '/api/drug/getdrugdatabypatientid',
+    method: 'get',
+    params: params
+  })
+}
+
+export function getSelfMedicalList(params) {
+  return request({
+    url: '/api/drug/getselfmedicallist',
+    methods: 'get',
+    params: params
+  })
 }
 
-export function getStockList(params){
-   
-   return request({
-      url:"/api/drug/getstocklist",
-      method:"get",
-      params:params
-   })
+export function getDrugDescByDrugName(params) {
+  return request({
+    url: '/api/drug/getdrugdescbydrugname',
+    methods: 'get',
+    params: params
+  })
 }
 
-export function DeleteDrugName(params){
-  
-   return request({
-      url:"/api/drug/deletedrugname",
-      method:"get",
-      params:params
-   })
+export function getDrugSet(params) {
+  return request({
+    url: '/api/drug/getdrugset',
+    methods: 'get',
+    params: params
+  })
 }
 
+export function getAllMedicalList(params) {
+  return request({
+    url: '/api/drug/getallmedicallist',
+    methods: 'get',
+    params: params
+  })
+}
 
-export function getDrugDetail(params){
-   return request({
-      url:"/api/drug/getdrugdetail",
-      method:"get",
-      params:params
-   })
-}
-
-export function getAllPatientStockList(params){
-   
-   return request({
-      url:"/api/drug/getallpatientstocklist",
-      method:"get",
-      params:params
-   })
-}
-
-export function getDrugDataByPatientId(params){
-  
-   return request({
-      url:"/api/drug/getdrugdatabypatientid",
-      method:"get",
-      params:params
-   })
+export function getStandName(params) {
+  return request({
+    url: '/api/drug/getstandname',
+    methods: 'get',
+    params: params
+  })
 }
-
-export function getSelfMedicalList(params){
-   
-   return request({
-       url:"/api/drug/getselfmedicallist",
-       methods:"get",
-       params:params
-   })
-}
-
-export function getDrugDescByDrugName(params){
-
-   return request({
-      url:"/api/drug/getdrugdescbydrugname",
-      methods:"get",
-      params:params
-   })
-}
-
-export function getDrugSet(params){
-  
-   return request({
-      url:"/api/drug/getdrugset",
-      methods:"get",
-      params:params
-   })
-}
-
-export function getAllMedicalList(params){
-  
-   return request({
-      url:"/api/drug/getallmedicallist",
-      methods:"get",
-      params:params,
-   })
-}
-
-export function getStandName(params){
-  
-   return request({
-     url:"/api/drug/getstandname",
-     methods:"get",
-     params:params
-   })
-}
-
-export function getRullerList(params){
-  
-   return request({
-      url:"/api/drug/getrullerlist",
-      methods:"get",
-      params:params
-   })
+
+export function getRullerList(params) {
+  return request({
+    url: '/api/drug/getrullerlist',
+    methods: 'get',
+    params: params
+  })
 }
 
+export function DeleteDrugNameById(params) {
+  return request({
+    url: '/api/drug/deleteDrugNamebyid',
+    methods: 'get',
+    params: params
+  })
+}
 
-export function DeleteDrugNameById(params){
-   
-   return request({
-      url:"/api/drug/deleteDrugNamebyid",
-      methods:"get",
-      params:params
-   })
+export function getPatientDetail(id, params) {
+  return request({
+    url: '/api/drug/getpatientdetail?id=' + id,
+    methods: 'Get',
+    params: params
+  })
 }
 
-export function getPatientDetail(id,params){
-
-   return request({
-      url:"/api/drug/getpatientdetail?id="+id,
-      methods:"Get",
-      params:params
-   })
+export function getSelfStockQuery(params) {
+  return request({
+    url: '/api/drug/getselfstockquery',
+    methods: 'get',
+    params: params
+  })
 }
 
-export function getSelfStockQuery(params){
-   
-   return request({
-      url:"/api/drug/getselfstockquery",
-      methods:"get",
-      params:params
-   })
-}
+export function postSearchDrugWarehouseList(params) {
+  return request({
+    url: '/api/drug/postsearchdrugwarehouselist',
+    methods: 'get',
+    params: params
+  })
+}
+
+export function saveDrugPrice(data) {
+  return request({
+    url: '/api/drug/savedrugpriceone',
+    method: 'post',
+    data: data
+  })
+}
+
+export function getDrugPriceList(params) {
+  return request({
+    url: '/api/drug/drugpricelist',
+    methods: 'get',
+    params: params
+  })
+}
+
+export function SaveCheckedDrugPrice(params) {
+  return request({
+    url: '/api/drug/savecheckdrugprice',
+    methods: 'get',
+    params: params
+  })
+}
+
+export function saveDrugDamage(data) {
+  return request({
+    url: '/api/drug/savedrugdamageone',
+    method: 'post',
+    data: data
+  })
+}
+
+export function getDrugDamageList(params) {
+  return request({
+    url: '/api/drug/getdrugdamagelist',
+    methods: 'get',
+    params: params
+  })
+}
+
+export function SaveDrugDamagePrice(params) {
+  return request({
+    url: '/api/drug/savedrugdamageprice',
+    method: 'get',
+    params: params
+  })
+}
+
+export function getDrugModiftyPrice(id, params) {
+  return request({
+    url: '/api/drug/getdrugmodifyprice?id=' + id,
+    method: 'Get',
+    params: params
+  })
+}
+
+export function modifyDrugPrice(params) {
+  return request({
+    url: '/api/drug/modifydrugprice',
+    method: 'Get',
+    params: params
+  })
+}
+
+export function deleteDrugPrice(params) {
+  return request({
+    url: '/api/drug/deletedrugprice',
+    method: 'Get',
+    params: params
+  })
+}
+
+export function getModifyPricePrint(params) {
+  return request({
+    url: '/api/drug/getmodifypriceprint',
+    method: 'Get',
+    params: params
+  })
+}
+
+export function getDrugDamageDetail(id, params) {
+  return request({
+    url: '/api/drug/getdrugdamagedetail?id=' + id,
+    method: 'Get',
+    params: params
+  })
+}
+
+export function modifyDrugDamage(params) {
+  return request({
+    url: '/api/drug/modifydrugdamage',
+    method: 'get',
+    params: params
+  })
+}
+
+export function deleteDrugDamage(params) {
+  return request({
+    url: '/api/drug/deletedrugdamage',
+    method: 'Get',
+    params: params
+  })
+}
+
+export function getDrugDamagePrint(params) {
+  return request({
+    url: '/api/drug/getdrugdamageprint',
+    method: 'get',
+    params: params
+  })
+}
+
+export function getDrugWarehouseInfoList(params) {
+  return request({
+    url: '/api/drug/warehouseinfobyid',
+    method: 'Get',
+    params: params
+  })
+}
+
+export function saveDrugInventory(data) {
+  return request({
+    url: '/api/drug/savedruginventory',
+    method: 'post',
+    data: data
+  })
+}

src/api/stock.js

@@ -810,3 +810,115 @@ export function getInventoryList(params) {
     params: params
   })
 }
+
+export function SaveCheckedInventory(params) {
+  return request({
+    url: '/api/stock/savecheckinventory',
+    method: 'Get',
+    params: params
+  })
+}
+
+export function getModifyPriceDetail(id, params) {
+  return request({
+    url: '/api/stock/getmodifypriceDetail?id=' + id,
+    method: 'get',
+    params: params
+  })
+}
+
+export function updateStockPrice(params) {
+  return request({
+    url: '/api/stock/updatestockprice',
+    method: 'get',
+    params: params
+  })
+}
+
+export function deleteStockPrice(id, params) {
+  return request({
+    url: '/api/stock/deletestockprice?id=' + id,
+    method: 'Get',
+    params: params
+  })
+}
+
+export function getStockDamageDetail(id, params) {
+  return request({
+    url: '/api/stock/getstockdamagedetal?id=' + id,
+    method: 'get',
+    params: params
+  })
+}
+
+export function modifyPrice(params) {
+  return request({
+    url: '/api/sotck/modifyprice',
+    method: 'Get',
+    params: params
+  })
+}
+
+export function deleteStockDamage(params) {
+  return request({
+    url: '/api/stock/deletestockdamage',
+    method: 'get',
+    params: params
+  })
+}
+
+export function getStockDamageById(params) {
+  return request({
+    url: '/api/stock/getstockdamagebyid',
+    method: 'get',
+    params: params
+  })
+}
+
+export function getInventoryDetail(id, params) {
+  return request({
+    url: 'api/sotck/getinventorydetail?id=' + id,
+    method: 'Get',
+    params: params
+  })
+}
+
+export function modifyInventory(params) {
+  return request({
+    url: '/api/stock/modifyinventory',
+    method: 'Get',
+    params: params
+  })
+}
+
+export function deleteInventory(id, params) {
+  return request({
+    url: '/api/stock/deleteinventory?id=' + id,
+    method: 'get',
+    params: params
+  })
+}
+
+export function getInventoryDetailList(params) {
+  return request({
+    url: '/api/stock/getinventorydetaillist',
+    method: 'Get',
+    params: params
+  })
+}
+
+export function getInventoryPrintList(params) {
+  return request({
+    url: '/api/stock/getinventoryprintlist',
+    method: 'Get',
+    params: params
+  })
+}
+
+export function getInventoryDetailPrintList(params) {
+  return request({
+    url: '/api/stock/getinventorydetailprintlist',
+    method: 'Get',
+    params: params
+  })
+}

src/router/modules/drugs.js

@@ -50,6 +50,12 @@ export default {
       name: 'drugDamaged',
       meta: { title: 'drugDamaged', noCache: true }
     },
+    {
+      path: '/stock/drugs/drugDamagePrint',
+      component: () => import('@/xt_pages/stock/drugs/drugDamagePrint'),
+      name: 'drugDamaged',
+      meta: { title: 'drugDamaged', noCache: true }
+    },
     {
       path: '/stock/drugs/drugWarning',
       component: () => import('@/xt_pages/stock/drugs/drugWarning'),

src/router/modules/stock.js

@@ -62,6 +62,14 @@ export default {
       name: 'stockDamaged',
       meta: { title: 'stockDamaged', noCache: true }
     },
+    {
+      path: '/stock/stockDamagePrint',
+      component: () => import('@/xt_pages/stock/stockDamagePrint'),
+      name: 'stockModifyPricePrint',
+      hidden: true,
+      is_menu: false,
+      meta: { title: 'stockModifyPricePrint', noCache: true }
+    },
     {
       path: '/stock/stockWarning',
       component: () => import('@/xt_pages/stock/stockWarning'),
@@ -83,6 +91,15 @@ export default {
       meta: { title: 'inventoryPrint', noCache: true }
     },
 
+    {
+      path: '/stock/inventoryDetailPrint',
+      component: () => import('@/xt_pages/stock/inventoryDetailPrint'),
+      name: 'inventoryPrint',
+      hidden: true,
+      is_menu: false,
+      meta: { title: 'inventoryPrint', noCache: true }
+    },
+
     // {
     //   path: "/stock/",
     //   component: Layout,

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

@@ -1250,6 +1250,7 @@ export default {
       if(predialysis.id > 0){
         this.form.hypopiesia = predialysis.hypopiesia.toString()
       }
+      
 
 
       this.form.leave_office_method = predialysis.leave_office_method
@@ -1269,6 +1270,12 @@ export default {
             }
           }
         }
+        if(last_after.id > 0){
+         this.form.hypertenison = last_after.hypertenison.toString()
+        }
+        if(last_after.id > 0){
+          this.form.hypopiesia = last_after.hypopiesia.toString()
+        }
       }
 
 

src/xt_pages/dialysis/details/index.vue

@@ -1040,6 +1040,12 @@ export default {
           }
           var lastMonitorRecord = resp.data.lastMonitorRecord
           var lastAssessmentAfterDislysis = resp.data.lastAssessmentAfterDislysis
+          // if(lastAssessmentAfterDislysis.hypertenison!=""){
+          //   lastAssessmentAfterDislysis.hypertenison = lastAssessmentAfterDislysis.hypertenison.toString()
+          // }
+          //  if(lastAssessmentAfterDislysis.hypopiesia!=""){
+          //   lastAssessmentAfterDislysis.hypopiesia = lastAssessmentAfterDislysis.hypopiesia.toString()
+          // }
           var lastDialysisPrescribe = resp.data.lastDialysisPrescribe
           var lastDryWeightDislysis = resp.data.lastDryWeightDislysis
 

src/xt_pages/dialysis/template/DialysisPrintOrderThirtyEight.vue

@@ -260,7 +260,7 @@
             </span>
           </div>
       </div>
-      <div class="lineHeight">治疗过程中检测记录：血压检测部位：{{ monitors && monitors[0] ? monitors[0].blood_pressure_monitoring_site : '' }}</div>
+      <div class="lineHeight">治疗过程中检测记录：血压检测部位：{{ monitors && monitors[0] ? getBloodPressureMmonitoringSite(monitors[0].blood_pressure_monitoring_site) : '' }}</div>
       <table class="print-table" border="1">
         <tbody>
           <tr>
@@ -572,7 +572,8 @@ export default {
         url: ""
       },
       displaceLiquiPartOptions: [],
-      complicationList:[]
+      complicationList:[],
+      bloodPressureMmonitoringSite:[]
     };
   },
   methods: {
@@ -586,6 +587,15 @@ export default {
       var gm=(ty-oy)*12+(tm-om); //距今月数
       return gm
     },
+    getBloodPressureMmonitoringSite(id){
+      var name = "";
+      for(let i=0;i<this.bloodPressureMmonitoringSite.length;i++){
+         if(id == this.bloodPressureMmonitoringSite[i].id){
+            name = this.bloodPressureMmonitoringSite[i].name
+         }
+      }
+      return name
+    },
     getComplication(id){
       var name = "";
       for(let i=0;i<this.complicationList.length;i++){
@@ -1298,6 +1308,7 @@ export default {
     this.displaceLiquiPartOptions = this.$store.getters.displace_liqui;
     // this.bloodAccessParOpera = getDataConfig('hemodialysis', 'vascular_access_desc')
     this.complicationList = getDataConfig('hemodialysis','complication')
+    this.bloodPressureMmonitoringSite = getDataConfig('hemodialysis','blood_pressure_monitoring_site');
 
     var bloodAccessParOpera = getDataConfig(
       "hemodialysis",

src/xt_pages/hospitalStation/components/deskPrescription.vue

@@ -472,12 +472,12 @@
         end_time: moment(new Date()).add('year', 0).format('YYYY-MM-DD'),
         register: [
           { value: 11, label: '普通门诊' },
-          { value: 12, label: '门诊挂号' },
-          { value: 13, label: '急诊' },
+          // { value: 12, label: '门诊挂号' },
+          // { value: 13, label: '急诊' },
           { value: 14, label: '门诊特殊病' },
-          { value: 15, label: '门诊统筹' },
-          { value: 16, label: '门诊慢性病' },
-          { value: 21, label: '普通住院' }
+          // { value: 15, label: '门诊统筹' },
+          // { value: 16, label: '门诊慢性病' },
+          // { value: 21, label: '普通住院' }
 
         ],
         isLastOrNextVisible: false,

src/xt_pages/hospitalStation/components/registerDialog.vue

@@ -197,12 +197,12 @@
       return {
         registers: [
           {value: 11, label: "普通门诊"},
-          {value: 12, label: '门诊挂号'},
-          {value: 13, label: "急诊"},
+          // {value: 12, label: '门诊挂号'},
+          // {value: 13, label: "急诊"},
           {value: 14, label: "门诊特殊病"},
-          {value: 15, label: "门诊统筹"},
-          {value: 16, label: "门诊慢性病"},
-          {value: 21, label: "普通住院"},
+          // {value: 15, label: "门诊统筹"},
+          // {value: 16, label: "门诊慢性病"},
+          // {value: 21, label: "普通住院"},
         ],
         medical_care:[
           {value: 11, label: "普通门诊"},

src/xt_pages/hospitalStation/components/registerDialog9504.vue

@@ -186,12 +186,12 @@
         read_loading:false,
         registers: [
           {value: 11, label: "普通门诊"},
-          {value: 12, label: '门诊挂号'},
-          {value: 13, label: "急诊"},
+          // {value: 12, label: '门诊挂号'},
+          // {value: 13, label: "急诊"},
           {value: 14, label: "门诊特殊病"},
-          {value: 15, label: "门诊统筹"},
-          {value: 16, label: "门诊慢性病"},
-          {value: 21, label: "普通住院"},
+          // {value: 15, label: "门诊统筹"},
+          // {value: 16, label: "门诊慢性病"},
+          // {value: 21, label: "普通住院"},
         ],
         medical_care:[
           {value: 11, label: "普通门诊"},

src/xt_pages/hospitalStation/index.vue

@@ -176,12 +176,12 @@
         read_loading: false,
         registers: [
           {value: 11, label: '普通门诊'},
-          {value: 12, label: '门诊挂号'},
-          {value: 13, label: '急诊'},
+          // {value: 12, label: '门诊挂号'},
+          // {value: 13, label: '急诊'},
           {value: 14, label: '门诊特殊病'},
-          {value: 15, label: '门诊统筹'},
-          {value: 16, label: '门诊慢性病'},
-          {value: 21, label: '普通住院'}
+          // {value: 15, label: '门诊统筹'},
+          // {value: 16, label: '门诊慢性病'},
+          // {value: 21, label: '普通住院'}
 
         ],
         sick: [],

src/xt_pages/hospitalStation/outpatientChargesManagement.vue

@@ -402,12 +402,12 @@
       return {
         register: [
           { value: 11, label: '普通门诊' },
-          { value: 12, label: '门诊挂号' },
-          { value: 13, label: '急诊' },
+          // { value: 12, label: '门诊挂号' },
+          // { value: 13, label: '急诊' },
           { value: 14, label: '门诊特殊病' },
-          { value: 15, label: '门诊统筹' },
-          { value: 16, label: '门诊慢性病' },
-          { value: 21, label: '普通住院' }
+          // { value: 15, label: '门诊统筹' },
+          // { value: 16, label: '门诊慢性病' },
+          // { value: 21, label: '普通住院' }
 
         ],
         loading: false,

src/xt_pages/medicalScheduling/index.vue

@@ -425,6 +425,7 @@ export default {
             })
         },
         getDoctorList(){
+
             getDoctorList().then(response=>{
                 if(response.data.state == 1){
                     var list =  response.data.data.list
@@ -1008,8 +1009,10 @@ export default {
         getNextWeekList(){
             const params = {
                 start_time:this.getTimestamp(this.weekDayArr[0]),
-                end_time:this.getTimestamp(this.weekDayArr[6])
+                end_time:this.getTimestamp(this.weekDayArr[6]),
+                doctor_id:parseInt(this.typeValue),
             }
+            console.log("params232323",params)
             getNextWeekList(params).then(response=>{
                 if(response.data.state == 1){
                     var staffList = response.data.data.staffList
@@ -1314,7 +1317,12 @@ export default {
                     obj.user_type = 10
                     obj.list = arr2
                     arr.push(obj)
-
+                    if(parseInt(this.typeValue) == 2){
+                      newNurse =  []
+                    }
+                    if(parseInt(this.typeValue) == 3){
+                      newDoctor =  []
+                    }
                     let data = []
                     data.push(...newNurse)
                     data.push(...newDoctor)

src/xt_pages/outpatientCharges/components/registerDialog.vue

@@ -197,12 +197,12 @@
       return {
         registers: [
           { value: 11, label: '普通门诊' },
-          { value: 12, label: '门诊挂号' },
-          { value: 13, label: '急诊' },
+          // { value: 12, label: '门诊挂号' },
+          // { value: 13, label: '急诊' },
           { value: 14, label: '门诊特殊病' },
-          { value: 15, label: '门诊统筹' },
-          { value: 16, label: '门诊慢性病' },
-          { value: 21, label: '普通住院' }
+          // { value: 15, label: '门诊统筹' },
+          // { value: 16, label: '门诊慢性病' },
+          // { value: 21, label: '普通住院' }
         ],
         medical_care: [
           { value: 11, label: '普通门诊' },

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -589,22 +589,22 @@
 
         register: [
           { value: 11, label: '普通门诊' },
-          { value: 12, label: '门诊挂号' },
-          { value: 13, label: '急诊' },
+          // { value: 12, label: '门诊挂号' },
+          // { value: 13, label: '急诊' },
           { value: 14, label: '门诊特殊病' },
-          { value: 15, label: '门诊统筹' },
-          { value: 16, label: '门诊慢性病' },
-          { value: 21, label: '普通住院' }
+          // { value: 15, label: '门诊统筹' },
+          // { value: 16, label: '门诊慢性病' },
+          // { value: 21, label: '普通住院' }
 
         ],
         register_two: [
           { value: '11', label: '普通门诊' },
-          { value: '12', label: '门诊挂号' },
-          { value: '13', label: '急诊' },
+          // { value: '12', label: '门诊挂号' },
+          // { value: '13', label: '急诊' },
           { value: '14', label: '门诊特殊病' },
-          { value: '15', label: '门诊统筹' },
-          { value: '16', label: '门诊慢性病' },
-          { value: '21', label: '普通住院' }
+          // { value: '15', label: '门诊统筹' },
+          // { value: '16', label: '门诊慢性病' },
+          // { value: '21', label: '普通住院' }
 
         ],
         loading: false,

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -517,12 +517,12 @@
         end_time: moment(new Date()).add('year', 0).format('YYYY-MM-DD'),
         register: [
           { value: 11, label: '普通门诊' },
-          { value: 12, label: '门诊挂号' },
-          { value: 13, label: '急诊' },
+          // { value: 12, label: '门诊挂号' },
+          // { value: 13, label: '急诊' },
           { value: 14, label: '门诊特殊病' },
-          { value: 15, label: '门诊统筹' },
-          { value: 16, label: '门诊慢性病' },
-          { value: 21, label: '普通住院' }
+          // { value: 15, label: '门诊统筹' },
+          // { value: 16, label: '门诊慢性病' },
+          // { value: 21, label: '普通住院' }
 
         ],
         medical_care:[
@@ -2539,10 +2539,10 @@
         console.log(this.curPrescriptions.advices.length)
         console.log(this.curPrescriptions.project.length)
 
-        if(this.curPrescriptions.advices.length > 0 && this.curPrescriptions.project.length == 0){
+       if(this.curPrescriptions.advices.length > 0 && this.curPrescriptions.project.length == 0){
           if(this.$store.getters.xt_user.org_id == 10138) {
             for (let i = 0; i < this.curDrugs.length; i++) {
-              if (this.curPrescriptions.med_type == 13 && this.curDrugs[i].is_special_diseases != 1) {
+              if (this.curPrescriptions.med_type == 14 && this.curDrugs[i].is_special_diseases != 1) {
                 this.$message.error('该处方属于特病类型处方，开非特病类型的药')
                 return
               }
@@ -2555,7 +2555,7 @@
         if(this.curPrescriptions.advices.length == 0 && this.curPrescriptions.project.length == 0){
           if(this.$store.getters.xt_user.org_id == 10138) {
             for (let i = 0; i < this.curDrugs.length; i++) {
-              if (this.curPrescriptions.med_type == 13 && this.curDrugs[i].is_special_diseases != 1) {
+              if (this.curPrescriptions.med_type == 14 && this.curDrugs[i].is_special_diseases != 1) {
                 this.$message.error('该处方属于特病类型处方，开非特病类型的药')
                 return
               }
@@ -2565,7 +2565,6 @@
         }
 
 
-
         // if (this.curPrescriptions.order_status == 2) {
         //   this.$message.error('该处方已经结算，无法继续添加药品或者项目')
         //   this.teamList = []

src/xt_pages/outpatientDoctorStation/prescriptionTemplatedetail.vue

@@ -280,12 +280,12 @@
 
         register: [
           { value: 11, label: '普通门诊' },
-          { value: 12, label: '门诊挂号' },
-          { value: 13, label: '急诊' },
+          // { value: 12, label: '门诊挂号' },
+          // { value: 13, label: '急诊' },
           { value: 14, label: '门诊特殊病' },
-          { value: 15, label: '门诊统筹' },
-          { value: 16, label: '门诊慢性病' },
-          { value: 21, label: '普通住院' }
+          // { value: 15, label: '门诊统筹' },
+          // { value: 16, label: '门诊慢性病' },
+          // { value: 21, label: '普通住院' }
 
         ],
         crumbs: [
@@ -1279,10 +1279,10 @@
         //   this.$refs.multipleTable.clearSelection()
         //   return
         // }
-        if (this.curPrescriptions.advices.length > 0 && this.curPrescriptions.project.length == 0) {
+       if (this.curPrescriptions.advices.length > 0 && this.curPrescriptions.project.length == 0) {
           if (this.$store.getters.xt_user.org_id == 10138) {
             for (let i = 0; i < this.curDrugs.length; i++) {
-              if (this.curPrescriptions.med_type == 13 && this.curDrugs[i].is_special_diseases != 1) {
+              if (this.curPrescriptions.med_type == 14 && this.curDrugs[i].is_special_diseases != 1) {
                 this.$message.error('该处方属于特病类型处方，开非特病类型的药')
                 return
               }
@@ -1294,7 +1294,7 @@
         if (this.curPrescriptions.advices.length == 0 && this.curPrescriptions.project.length == 0) {
           if (this.$store.getters.xt_user.org_id == 10138) {
             for (let i = 0; i < this.curDrugs.length; i++) {
-              if (this.curPrescriptions.med_type == 13 && this.curDrugs[i].is_special_diseases != 1) {
+              if (this.curPrescriptions.med_type == 14 && this.curDrugs[i].is_special_diseases != 1) {
                 this.$message.error('该处方属于特病类型处方，开非特病类型的药')
                 return
               }

src/xt_pages/outpatientRegistration/index.vue

@@ -446,12 +446,12 @@
         read_loading: false,
         registers: [
           { value: 11, label: '普通门诊' },
-          { value: 12, label: '门诊挂号' },
-          { value: 13, label: '急诊' },
+          // { value: 12, label: '门诊挂号' },
+          // { value: 13, label: '急诊' },
           { value: 14, label: '门诊特殊病' },
-          { value: 15, label: '门诊统筹' },
-          { value: 16, label: '门诊慢性病' },
-          { value: 21, label: '普通住院' }
+          // { value: 15, label: '门诊统筹' },
+          // { value: 16, label: '门诊慢性病' },
+          // { value: 21, label: '普通住院' }
 
         ],
         sick: [],

src/xt_pages/stock/drugs/drugDamagePrint.vue

@@ -0,0 +1,136 @@
+<template>
+    <div class="main-contain">
+        <div class="position">
+        <bread-crumb :crumbs="crumbs"></bread-crumb>
+        <el-row style="float:right;">
+            <el-col :span="24">
+            <el-button size="small" icon="el-icon-printer" type="primary" @click="printAction">打印</el-button>
+            </el-col>
+        </el-row>
+        </div>
+        <div class="app-container" style="background-color: white;">
+            <div id="print_content">
+                <div class="printTitle">药品调价登记单</div>
+                <div class="flex">
+                    <div>药库类别：</div>
+                    <div>调价日期：</div>
+                </div>
+                <div class="flex">
+                    <div>单据编号：</div>
+                    <div>打印日期：{{nowtime}}</div>
+                </div>
+                <div class="tableTitle">
+                    <div style="width:8%">货号</div>
+                    <div style="width:8%">药品名称</div>
+                    <div style="width:8%">规格</div>
+                    <div style="width:8%">单位</div>
+                    <div style="width:8%">批次</div>
+                    <div style="width:8%">调价数量</div>
+                    <div style="width:8%">原进货价</div>
+                    <div style="width:8%">新进货价</div>
+                    <div style="width:8%">进货差价</div>
+                    <div style="width:8%">原零售价</div>
+                    <div style="width:8%">新零售价</div>
+                    <div style="width:8%">零售差价</div>
+                </div>
+                <div class="tableTr" v-for="(item,index) in this.tableData" :key="index">
+                    <div style="width:8%"></div>
+                    <div style="width:8%">{{item.drug_name}}</div>
+                    <div style="width:8%"></div>
+                    <div style="width:8%">{{item.warehousing_unit}}</div>
+                    <div style="width:8%">{{item.number}}</div>
+                    <div style="width:8%">{{item.count}}</div>
+                    <div style="width:8%">{{item.retail_price}}</div>
+                    <div style="width:8%">{{item.new_price}}</div>
+                    <div style="width:8%"></div>
+                    <div style="width:8%">{{item.retail_price}}</div>
+                    <div style="width:8%">{{item.new_price}}</div>
+                    <div style="width:8%"></div>
+                </div>
+                <div class="tableBottom">
+                    <div style="width:8%">合计：</div>
+                    <div style="width:8%"></div>
+                    <div style="width:8%"></div>
+                    <div style="width:8%"></div>
+                    <div style="width:8%"></div>
+                    <div style="width:8%"></div>
+                    <div style="width:8%"></div>
+                    <div style="width:8%"></div>
+                    <div style="width:8%"></div>
+                    <div style="width:8%"></div>
+                    <div style="width:8%"></div>
+                    <div style="width:8%"></div>
+                </div>
+                <div style="display:flex;margin-top:1px;float:right;margin-top:10px;">
+                    <div style="width:80px;">审批：</div><div style="width:100px;"></div>
+                    <div style="width:100px;">药材主任：</div><div style="width:60px;"></div>
+                    <div style="width:50px;">会计：</div><div style="width:100px;"></div>
+                    <div style="width:50px;">审核：</div><div style="width:100px;"></div>
+                    <div style="width:70px;">制单人：</div><div style="width:100px;"></div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+import BreadCrumb from '@/xt_pages/components/bread-crumb'
+const moment = require('moment');
+import { uParseTime } from '@/utils/tools'
+import { getDrugDamagePrint } from "@/api/drug/drug"
+export default {
+    components:{
+        BreadCrumb
+    },
+    data(){
+        return{
+          crumbs: [
+            { path: false, name: '库存管理' },
+            { path: false, name: '耗材管理' },
+            { path: false, name: '药品调价打印' },
+          ],
+          ids:"",
+          tableData:[],
+          nowtime: moment(new Date()).format('YYYY-MM-DD'),
+        }
+    },
+    methods:{
+        printAction: function() {
+            const style = '@media print { .printTitle{font-size: 22px;text-align: center;}.flex{display: flex;justify-content: space-between;}.tableTitle{display: flex;border-top:1px solid #000;border-bottom: 1px solid #000;padding: 10px 0;}.tableTr{display: flex;border-bottom: 1px dashed #000;padding: 10px 0;}.tableBottom{display: flex;border-bottom: 1px solid #000;padding: 10px 0;} }';
+            printJS({
+            printable: 'print_content',
+            type: 'html',
+            documentTitle: '  ',
+            style: style,
+            scanStyles: false
+            })
+        },
+        getDrugDamagePrint(ids){
+          var params = {
+            ids:ids,
+          }
+          getDrugDamagePrint(params).then(response=>{
+            if(response.data.state == 1){
+             console.log("hhhhh",response.data.data.list)
+              this.tableData = response.data.data.list
+            }
+          })
+        }
+
+
+    },
+    created(){
+     this.ids = this.$route.query.ids
+     this.getDrugDamagePrint(this.ids)
+    }
+}
+</script>
+
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.printTitle{font-size: 22px;text-align: center;}
+.flex{display: flex;justify-content: space-between;}
+.tableTitle{display: flex;border-top:1px solid #000;border-bottom: 1px solid #000;padding: 10px 0;}
+.tableTr{display: flex;border-bottom: 1px dashed #000;padding: 10px 0;}
+.tableBottom{display: flex;border-bottom: 1px solid #000;padding: 10px 0;}
+</style>

src/xt_pages/stock/drugs/drugDamaged.vue

@@ -23,14 +23,14 @@
                 >
                 <el-date-picker
                 size="small"
-                v-model="value1"
+                v-model="start_time"
                 type="date"
                 style="margin-left:5px;width:140px;"
                 placeholder="选择日期">
                 </el-date-picker>
                 <el-date-picker
                 size="small"
-                v-model="value2"
+                v-model="end_time"
                 type="date"
                 style="margin-left:5px;width:140px;"
                 placeholder="选择日期">
@@ -38,185 +38,390 @@
             </div>
             <div>
                 <el-button size="small" type="primary" @click="dialogVisible = true">新增</el-button>
-                <el-button size="small" type="primary">核对</el-button>
+                <el-button size="small" type="primary" @click="toCheck">核对</el-button>
                 <el-button size="small" type="primary" @click="print">打印</el-button>
                 <el-button size="small" type="primary">导出</el-button>
             </div>
         </div>
-        <el-table :data="tableData" border :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }">
-            <el-table-column
-            prop="date"
-            label="报损编码">
+        <el-table :data="tableList" border :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }"  @selection-change="changePrice">
+            <el-table-column type="selection" width="55" align="center"> </el-table-column>
+            <el-table-column prop="date" label="报损编码" align="center">
+               <template slot-scope="scope">
+                  {{scope.row.warehousing_order}}
+                </template>
             </el-table-column>
-            <el-table-column
-            prop="date"
-            label="报损日期">
+            <el-table-column  prop="date" label="报损日期" align="center">
+               <template slot-scope="scope">
+                  {{getTime(scope.row.start_time)}}
+                </template>
             </el-table-column>
-            <el-table-column
-            prop="name"
-            label="操作人">
+            <el-table-column prop="name" label="报损数量" align="center">
+               <template slot-scope="scope">
+                  {{scope.row.count}}
+                </template>
             </el-table-column>
-            <el-table-column
-            prop="name"
-            label="审核日期">
+            <el-table-column prop="name" label="操作人" align="center">
+               <template slot-scope="scope">
+                  {{getDoctorName(scope.row.creater)}}
+                </template>
             </el-table-column>
-            <el-table-column
-            prop="name"
-            label="核对人">
+            <el-table-column prop="name" label="审核日期" align="center">
+              <template slot-scope="scope">
+                {{getTime(scope.row.checker_time)}}
+               </template>
             </el-table-column>
-            <el-table-column
-            prop="name"
-            label="状态">
+            <el-table-column prop="name" label="核对人" align="center">
+              <template slot-scope="scope">
+                {{getDoctorName(scope.row.checker)}}
+              </template>
             </el-table-column>
-            <el-table-column
-            label="操作">
+            <el-table-column prop="name" label="状态" align="center">
+              <template slot-scope="scope">
+                <span v-if="scope.row.checker_status == 1">已核对</span>
+                <span v-if="scope.row.checker_status == 2">未核对</span>
+              </template>   
+            </el-table-column>
+            <el-table-column label="操作" align="center">
                 <template slot-scope="scope">
-                    <el-button type="text" size="small">删除</el-button>
-                    <el-button type="text" size="small">编辑</el-button>
+                  <el-button type="primary" size="small" @click="moDrugDamage(scope.row.id,scope.row.checker_status)">编辑</el-button>
+                  <el-button type="danger" size="small" @click="deleteDrugDamage(scope.row.id,scope.row.checker_status,scope.$index)">删除</el-button>
                 </template>
             </el-table-column>
         </el-table>
         <el-pagination
             @size-change="handleSizeChange"
             @current-change="handleCurrentChange"
-            :page-sizes="[5, 10, 50, 100]"
-            :page-size="5"
+            :page-sizes="[10, 20, 40, 100]"
+            :page-size="10"
             background
             style="margin-top:20px;text-align: right"
             layout="total, sizes, prev, pager, next, jumper"
-            :total="total"
-        >
+            :total="total">
         </el-pagination>
     </div>
     <el-dialog
         title="库房调价"
         :visible.sync="dialogVisible"
-        width="1200px"
-        :before-close="handleClose">
+        width="1200px">
         <el-form :model="form" class="modifyDialog" label-width="120px">
-            <el-form-item label="耗材ID">
-                <el-input v-model="form.name"></el-input>
+            <el-form-item label="药品ID">
+                <el-input v-model="form.drug_id"></el-input>
             </el-form-item>
             <el-form-item label="药品名称">
-                <el-input v-model="form.name"></el-input>
+            <el-autocomplete
+                class="checkSearch"
+                popper-class="my-autocomplete"
+                v-model="form.drug_name"
+                :fetch-suggestions="querySearchAsync"
+                :trigger-on-focus="true"
+                placeholder="请输入药品名称"
+                @select="handleSelect"
+                @input="changeGoodName(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 + "  "+item.manufacturer}}</div>
+                </template>
+                </el-autocomplete>  
             </el-form-item>
-            <el-form-item label="规格">
+            <!-- <el-form-item label="规格">
                 <el-input v-model="form.name"></el-input>
-            </el-form-item>
+            </el-form-item> -->
             <el-form-item label="单位">
-                <el-input v-model="form.name"></el-input>
+                <el-input v-model="form.warehousing_unit"></el-input>
             </el-form-item>
             <el-form-item label="进货价">
-                <el-input v-model="form.name"></el-input>
+                <el-input v-model="form.last_price"></el-input>
             </el-form-item>
             <el-form-item label="零售价">
-                <el-input v-model="form.name"></el-input>
+                <el-input v-model="form.retail_price"></el-input>
             </el-form-item>
             <el-form-item label="报损数量">
-                <el-input v-model="form.name"></el-input>
+                <el-input v-model="form.count"></el-input>
             </el-form-item>
             <el-form-item label="库存">
-                <el-input v-model="form.name"></el-input>
+                <el-input v-model="form.total"></el-input>
             </el-form-item>
             <el-form-item label="产地">
-                <el-input v-model="form.name"></el-input>
+                <el-input v-model="form.drug_origin_place"></el-input>
             </el-form-item>
             <el-form-item label="批准文号">
-                <el-input v-model="form.name"></el-input>
+                <el-input v-model="form.number"></el-input>
             </el-form-item>
             <el-form-item label="生产厂商">
-                <el-input v-model="form.name"></el-input>
+                <el-input v-model="form.manufacturer"></el-input>
             </el-form-item>
             <el-form-item label="备注">
                 <div style="display:flex;">
-                    <el-input v-model="form.name"></el-input>
-                    <el-button style="margin-left:5px;" type="primary">添加</el-button>
+                    <el-input v-model="form.remark"></el-input>
+                    <el-button style="margin-left:5px;" type="primary" @click="addPrice">添加</el-button>
                 </div>
             </el-form-item>
         </el-form>
         <el-table :data="tableData" border :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }">
-            <el-table-column
-            prop="date"
-            label="耗材ID"
-            width="100">
+            <el-table-column  prop="date" label="药品ID" width="100">
+                <template slot-scope="scope">
+                  {{scope.row.drug_id}}
+                </template>
             </el-table-column>
-            <el-table-column
-            prop="date"
-            label="耗材名称"
-            width="100">
+            <el-table-column prop="date" label="药品名称"  width="100">
+                  <template slot-scope="scope">
+                  {{scope.row.drug_name}}
+                </template>
             </el-table-column>
-            <el-table-column
-            prop="name"
-            label="规格"
-            width="100">
+            <el-table-column prop="name" label="规格" width="100">
+              <template slot-scope="scope">
+                 {{scope.row.dose}}{{scope.row.dose_unit}}*{{scope.row.min_number}}{{scope.row.min_unit}}/{{scope.row.max_unit}}
+              </template>
             </el-table-column>
-            <el-table-column
-            prop="name"
-            label="单位"
-            width="100">
+            <el-table-column prop="name" label="单位" width="100">
+               <template slot-scope="scope">
+                 {{scope.row.warehousing_unit}}
+              </template> 
             </el-table-column>
-            <el-table-column
-            prop="name"
-            label="调价数量"
-            width="100">
+            <el-table-column prop="name" label="报损数量" width="100">
+              <template slot-scope="scope">
+                 {{scope.row.count}}
+              </template> 
             </el-table-column>
-            <el-table-column
-            prop="name"
-            label="原进货价"
-            width="100">
+            <el-table-column prop="name" label="原进货价"  width="100">
+             <template slot-scope="scope">
+                 {{scope.row.last_price}}
+              </template> 
             </el-table-column>
-            <el-table-column
-            prop="name"
-            label="原零售价"
-            width="100">
+            <el-table-column  prop="name" label="原零售价" width="100">
+               <template slot-scope="scope">
+                {{scope.row.retail_price}}
+              </template>
             </el-table-column>
-            <el-table-column
-            prop="name"
-            label="新零售价"
-            width="100">
+            <el-table-column prop="name" label="新零售价" width="100">
+                <template slot-scope="scope">
+                {{scope.row.new_price}}
+               </template>
             </el-table-column>
-            <el-table-column
-            prop="name"
-            label="生产厂商"
-            width="100">
+            <el-table-column  prop="name"  label="生产厂商"  width="100">
+              <template slot-scope="scope">
+                {{scope.row.manufacturer}}
+              </template>
             </el-table-column>
-            <el-table-column
-            prop="name"
-            label="产地"
-            width="100">
+            <el-table-column prop="name" label="产地" width="100">
+              <template slot-scope="scope">
+                {{scope.row.drug_origin_place}}
+              </template>
             </el-table-column>
-            <el-table-column
-            prop="name"
-            label="批准文号"
-            width="100">
+            <el-table-column prop="name" label="批准文号" width="100">
+             <template slot-scope="scope">
+                {{scope.row.number}}
+              </template>
             </el-table-column>
-            <el-table-column
-            prop="name"
-            label="备注"
-            width="100">
+            <el-table-column  prop="name" label="备注"  width="100">
+               <template slot-scope="scope">
+                {{scope.row.remark}}
+              </template>
             </el-table-column>
             <el-table-column
             fixed="right"
             width="100"
             label="操作">
                 <template slot-scope="scope">
-                    <el-button type="text" size="small">删除</el-button>
-                    <el-button type="text" size="small">编辑</el-button>
+                    <el-button type="text" size="small" @click="toDel(scope.$index)">删除</el-button>
+                    <el-button type="text" size="small" @click="toEdit(scope.row)">编辑</el-button>
                 </template>
             </el-table-column>
         </el-table>
         <span slot="footer" class="dialog-footer">
             <el-button @click="dialogVisible = false">取 消</el-button>
-            <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
+            <el-button type="primary" @click="saveDrugDamage">确 定</el-button>
+        </span>
+    </el-dialog>
+   
+
+    <el-dialog
+        title="耗材盘点核对"
+        :visible.sync="checkDialogVisible"
+        width="30%"
+        >
+        <span>
+          <el-form :model="form">
+            <el-row>
+              <el-col>
+                <el-form-item label="核对时间">
+                 <el-date-picker
+                    size="small"
+                    v-model="check_time"
+                    type="date"
+                    style="margin-left:5px;width:140px;"
+                    placeholder="选择日期">
+                  </el-date-picker>
+                </el-form-item>  
+              </el-col>
+            </el-row>  
+             <el-row>
+              <el-col>
+                <el-form-item label="核对人">
+                  <el-select v-model="checker" placeholder="请选择">
+                    <el-option
+                    v-for="item in doctorList"
+                    :key="item.admin_user_id"
+                    :label="item.user_name"
+                    :value="item.admin_user_id">
+                    </el-option>
+                 </el-select>
+                </el-form-item>  
+              </el-col>
+            </el-row>  
+          </el-form>  
+        </span>
+        <span slot="footer" class="dialog-footer">
+            <el-button @click="checkDialogVisible = false">取 消</el-button>
+            <el-button type="primary" @click="SaveDrugDamagePrice">保 存</el-button>
+        </span>
+    </el-dialog>
+
+    
+     <el-dialog
+        title="库房调价"
+        :visible.sync="editDialogVisible"
+        width="1200px">
+        <el-form :model="form" class="modifyDialog" label-width="120px">
+            <el-form-item label="药品ID">
+                <el-input v-model="form.drug_id"></el-input>
+            </el-form-item>
+            <el-form-item label="药品名称">
+            <el-autocomplete
+                class="checkSearch"
+                popper-class="my-autocomplete"
+                v-model="form.drug_name"
+                :fetch-suggestions="querySearchAsync"
+                :trigger-on-focus="true"
+                placeholder="请输入药品名称"
+                @select="handleSelect"
+                @input="changeGoodName(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 + "  "+item.manufacturer}}</div>
+                </template>
+                </el-autocomplete>  
+            </el-form-item>
+            <!-- <el-form-item label="规格">
+                <el-input v-model="form.name"></el-input>
+            </el-form-item> -->
+            <el-form-item label="单位">
+                <el-input v-model="form.warehousing_unit"></el-input>
+            </el-form-item>
+            <el-form-item label="进货价">
+                <el-input v-model="form.last_price"></el-input>
+            </el-form-item>
+            <el-form-item label="零售价">
+                <el-input v-model="form.retail_price"></el-input>
+            </el-form-item>
+            <el-form-item label="报损数量">
+                <el-input v-model="form.count"></el-input>
+            </el-form-item>
+            <el-form-item label="库存">
+                <el-input v-model="form.total"></el-input>
+            </el-form-item>
+            <el-form-item label="产地">
+                <el-input v-model="form.drug_origin_place"></el-input>
+            </el-form-item>
+            <el-form-item label="批准文号">
+                <el-input v-model="form.number"></el-input>
+            </el-form-item>
+            <el-form-item label="生产厂商">
+                <el-input v-model="form.manufacturer"></el-input>
+            </el-form-item>
+            <el-form-item label="备注">
+                <div style="display:flex;">
+                    <el-input v-model="form.remark"></el-input>
+                    <el-button style="margin-left:5px;" type="primary" @click="addPrice">添加</el-button>
+                </div>
+            </el-form-item>
+        </el-form>
+        
+        <span slot="footer" class="dialog-footer">
+            <el-button @click="editDialogVisible = false">取 消</el-button>
+            <el-button type="primary" @click="EditDrugDamage">确 定</el-button>
+        </span>
+    </el-dialog>
+
+
+      <el-dialog
+        title="库房调价"
+        :visible.sync="modifyDialogVisible"
+        width="1200px">
+        <el-form :model="form" class="modifyDialog" label-width="120px">
+            <el-form-item label="药品ID">
+                <el-input v-model="form.drug_id"></el-input>
+            </el-form-item>
+            <el-form-item label="药品名称">
+            <el-autocomplete
+                class="checkSearch"
+                popper-class="my-autocomplete"
+                v-model="form.drug_name"
+                :fetch-suggestions="querySearchAsync"
+                :trigger-on-focus="true"
+                placeholder="请输入药品名称"
+                @select="handleSelect"
+                @input="changeGoodName(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 + "  "+item.manufacturer}}</div>
+                </template>
+                </el-autocomplete>  
+            </el-form-item>
+            <!-- <el-form-item label="规格">
+                <el-input v-model="form.name"></el-input>
+            </el-form-item> -->
+            <el-form-item label="单位">
+                <el-input v-model="form.warehousing_unit"></el-input>
+            </el-form-item>
+            <el-form-item label="进货价">
+                <el-input v-model="form.last_price"></el-input>
+            </el-form-item>
+            <el-form-item label="零售价">
+                <el-input v-model="form.retail_price"></el-input>
+            </el-form-item>
+            <el-form-item label="报损数量">
+                <el-input v-model="form.count"></el-input>
+            </el-form-item>
+            <el-form-item label="库存">
+                <el-input v-model="form.total"></el-input>
+            </el-form-item>
+            <el-form-item label="产地">
+                <el-input v-model="form.drug_origin_place"></el-input>
+            </el-form-item>
+            <el-form-item label="批准文号">
+                <el-input v-model="form.number"></el-input>
+            </el-form-item>
+            <el-form-item label="生产厂商">
+                <el-input v-model="form.manufacturer"></el-input>
+            </el-form-item>
+            <el-form-item label="备注">
+                <div style="display:flex;">
+                    <el-input v-model="form.remark"></el-input>
+                    <el-button style="margin-left:5px;" type="primary" @click="addPrice">添加</el-button>
+                </div>
+            </el-form-item>
+        </el-form>
+        
+        <span slot="footer" class="dialog-footer">
+            <el-button @click="modifyDialogVisible = false">取 消</el-button>
+            <el-button type="primary" @click="modifyDrugDamage">确 定</el-button>
         </span>
     </el-dialog>
-  
+    
   </div>
 </template>
 
 <script>
 import BreadCrumb from "../../components/bread-crumb";
-
+import { postSearchDrugWarehouseList,saveDrugDamage,getDrugDamageList,SaveDrugDamagePrice,getDrugDamageDetail,modifyDrugDamage,deleteDrugDamage } from "@/api/drug/drug"
+import { uParseTime } from '@/utils/tools'
 export default {
     name: "stockModifyPrice",
     components:{
@@ -232,28 +437,54 @@ export default {
             searchKey:'',
             value1:'',
             value2:'',
-            tableData: [{
-                date: '2016-05-02',
-                name: '王小虎',
-                address: '上海市普陀区金沙江路 1518 弄'
-                }, {
-                date: '2016-05-04',
-                name: '王小虎',
-                address: '上海市普陀区金沙江路 1517 弄'
-                }, {
-                date: '2016-05-01',
-                name: '王小虎',
-                address: '上海市普陀区金沙江路 1519 弄'
-                }, {
-                date: '2016-05-03',
-                name: '王小虎',
-                address: '上海市普陀区金沙江路 1516 弄'
-            }],
+            tableData: [],
             dialogVisible:false,
             form: {
-                name: '',
+                id:"",
+                drug_name: '',
+                retail_price :'',
+                new_price:"",
+                count:"",
+                remark:"",
+                warehousing_order:"",
+                manufacturer:"",
+                dealer:"",
+                number:"",
+                warehousing_unit:"",
+                specification_name:"",
+                buy_price:"",
+                drug_id:"",
+                packing_unit:"",
+                drug_origin_place:"",
+                report_count:"",
+                total:"",
+                dose:"",
+                dose_unit:"",
+                min_number:"",
+                min_unit:"",
+                max_unit:"",
+                batch_number:"",
+                last_price:"",
+                batch_number:"",
             },
+            drugList:[],
+            manufacturerList:[],
+            dealerList:[],
+            currentIndex: 0,
+            limit:10,
+            page:1,
+            tableList:[],
             total: 0,
+            start_time:"",
+            end_time:"",
+            doctorList:[],
+            ids:"",
+            checkDialogVisible:false,
+            checker:this.$store.getters.xt_user.user.id,
+            check_time:new Date(),
+            editDialogVisible:false,
+            modifyDialogVisible:false,
+            id:"",
         }
     },
     methods:{
@@ -261,14 +492,307 @@ export default {
 
         },
         print(){
-            this.$router.push({path:'/stock/stockModifyPricePrint'})
+          if(this.ids == ""){
+            this.$message.error("请勾选打印数据")
+            return false
+          }else{
+            this.$router.push({path:'/stock/drugs/drugDamagePrint?ids='+this.ids})
+          }  
+        },
+        handleSizeChange(val){
+          this.limit = val
+          this.getlist()
+        },
+        handleCurrentChange(val){
+          this.page = val
+          this.getlist()
+        },
+          querySearchAsync(keyword, cb) {
+            let key = '';
+            if (keyword != undefined) {
+                key = keyword
+            }
+            postSearchDrugWarehouseList(key).then(response => {
+            if (response.data.state == 1) {
+            
+                var list = response.data.data.list
+                console.log("列表数据",list)
+                this.drugList = 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.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
+                    }
+                    }
+                }
+
+                for(let i=0;i<this.drugList.length;i++){
+                    for(let j=0;j<this.dealerList.length;j++){
+                        if(this.drugList[i].dealer == this.dealerList[j].id){
+                        this.drugList[i].dealer = this.dealerList[j].dealer_name
+                        }
+                    }
+                }
             
+                cb(this.drugList)
+            } else {
+                cb([])
+             }
+          })
+         },
+        
+        changeGoodName(val){
+          this.currentIndex = val
         },
-        handleSizeChange(){},
-        handleCurrentChange(){}
+         handleSelect(val){
+            console.log("val232323223",val)
+            this.form.id = val.id
+            this.form.drug_id = val.drug_id,
+            this.form.drug_name = val.drug_name
+            this.form.retail_price = val.retail_price
+            this.form.warehousing_order = val.warehousing_order
+            this.form.number = val.number
+            this.form.dealer = val.dealer
+            this.form.manufacturer = val.manufacturer
+            this.form.remark = val.remark
+            this.form.warehousing_unit = val.warehouseing_unit  
+            this.form.total = val.total
+            this.form.batch_number = val.batch_number
+            this.form.last_price = val.last_price
+           
+        },
+        getTime(val) {
+         if(val < 0){
+            return ""
+          }
+         if(val == ""){
+            return ""
+          }else {
+            return uParseTime(val, '{y}-{m}-{d}')
+         }
+        },
+        addPrice(){
+          var obj = {
+            drug_id:this.form.drug_id,
+            drug_name:this.form.drug_name,
+            warehousing_unit:this.form.warehousing_unit,
+            count:parseInt(this.form.count),
+            retail_price:this.form.retail_price.toString(),
+            manufacturer:this.form.manufacturer,
+            drug_origin_place:this.form.drug_origin_place,
+            number:this.form.number,
+            remark:this.form.remark,
+            new_price:this.form.new_price.toString(),
+            warehousing_order:this.form.warehousing_order,
+            dealer:this.form.dealer,
+            last_price:this.form.last_price,
+            start_time:this.getTime(new Date()),
+            number:this.form.number,
+            } 
+          this.tableData.push(obj)     
+        },
+        saveDrugDamage(){
+            for(let i=0;i<this.tableData.length;i++){
+            this.tableData[i].retail_price = this.tableData[i].retail_price.toString()
+            this.tableData[i].last_price = this.tableData[i].last_price.toString()
+            this.tableData[i].new_price = this.tableData[i].new_price.toString()
+            this.tableData[i].count =  parseInt(this.tableData[i].count)
+            }
+            var params= {
+            tableData:this.tableData,
+            }
+            console.log("parasm222",params)
+        saveDrugDamage(params).then(response=>{
+            if(response.data.state == 1){
+            var msg =  response.data.data.msg
+            console.log("msg",msg)
+            this.$message.success("保存成功!")
+            this.dialogVisible = false
+            this.getlist()
+          }
+         })  
+      },
+      getlist(){
+        var params = {
+          limit:this.limit,
+          page:this.page, 
+          start_time:this.start_time,
+          end_time:this.end_time,
+        }
+        getDrugDamageList(params).then(response=>{
+           if(response.data.state == 1){
+             this.tableList = response.data.data.list
+             this.total = response.data.data.total
+             this.doctorList = response.data.data.doctorList
+           }
+        })
+      },
+      getDoctorName(id){
+        var user_name = ""
+        for(let i=0;i<this.doctorList.length;i++){
+          if(id == this.doctorList[i].admin_user_id){
+            user_name = this.doctorList[i].user_name
+          }
+        } 
+        return user_name
+     },
+    changePrice(val){  
+       var arr = []
+      
+       for(let i=0;i<val.length;i++){
+         arr.push(val[i].id)
+       }
+      var str = arr.join(",")
+    
+      console.log("str",str)
+      this.ids = str
+     
+     },
+     toCheck(){
+      if(this.ids.length <=0){
+         this.$message.error("请勾选核对数据")
+         return
+       }else{
+         this.checkDialogVisible = true
+       }
+     },
+      SaveDrugDamagePrice(){
+         var params = {
+            ids:this.ids,
+            check_time:this.getTime(this.check_time),
+            checker:this.checker,
+         }
+       console.log("params",params)
+       SaveDrugDamagePrice(params).then(response=>{
+         if(response.data.state == 1){
+           this.$message.success("保存成功")
+           var damage = response.data.data.damage
+           this.checkDialogVisible = false
+           this.getlist()
+         }
+       })
+     },
+     toDel(index){
+       this.tableList.splice(index,1)
+     },
+     toEdit(val){
+       this.form.drug_name = val.drug_name
+       this.form.drug_origin_place = val.drug_origin_place
+       this.form.last_price = val.last_price
+       this.form.drug_id = val.drug_id,
+       this.form.manufacturer = val.manufacturer
+       this.form.new_price = val.new_price
+       this.form.number = val.number
+       this.form.retail_price = val.retail_price
+       this.form.remark = val.remark
+       this.form.id = val.id
+       this.form.count = val.count
+       this.editDialogVisible = true
+     },
+     EditDrugDamage(){
+       for(let i=0;i<this.tableData.length;i++){
+          if(this.form.id == this.tableData[i].id){
+            this.tableData[i].drug_name = this.form.drug_name
+            this.tableData[i].drug_origin_place = this.form.drug_origin_place
+            this.tableData[i].last_price = this.form.last_price
+            this.tableData[i].new_price = this.form.new_price
+            this.tableData[i].number = this.form.number
+            this.tableData[i].retail_price = this.form.retail_price
+            this.tableData[i].remark = this.form.remark
+            this.tableData[i].count = this.form.count
+          }
+       }
+       this.editDialogVisible = false
+       this.form.drug_name = ""
+       this.form.drug_origin_place = ""
+       this.form.last_price = ""
+       this.form.manufacturer = ""
+       this.form.new_price = ""
+       this.form.number = ""
+       this.form.retail_price = ""
+       this.form.remark = ""
+       this.form.count = ""
+     },
+     moDrugDamage(id,checker_status){
+         if(checker_status == 1){
+          this.$message.error("已核对不能编辑")
+          return false
+         }
+       getDrugDamageDetail(id).then(response=>{
+         if(response.data.state ==1){
+           var detail = response.data.data.detail
+           this.form.drug_id = detail.drug_id
+           this.form.drug_name = detail.drug_name
+           this.form.drug_origin_place = detail.drug_origin_place
+           this.form.last_price = detail.last_price
+           this.form.manufacturer = detail.manufacturer
+           this.form.new_price = detail.new_price
+           this.form.number = detail.number
+           this.form.retail_price = detail.retail_price
+           this.form.remark = detail.remark
+           this.form.count = detail.count
+           this.id = detail.id
+           this.form.warehousing_unit = detail.warehouseing_unit
+           this.modifyDialogVisible = true
+         }
+       })
+     },
+     modifyDrugDamage(){
+         var params = {
+           drug_id:this.form.drug_id,
+           drug_name:this.form.drug_name,
+           drug_origin_place:this.form.drug_origin_place,
+           last_price:this.form.last_price,
+           manufacturer:this.form.manufacturer,
+           new_price:this.form.new_price.toString(),
+           number:this.form.number,
+           retail_price:this.form.retail_price,
+           remark:this.form.remark,
+           count:parseInt(this.form.count),
+           warehousing_unit:this.form.warehousing_unit,
+           id:this.id,
+         }
+       modifyDrugDamage(params).then(response=>{
+          if(response.data.state == 1){
+            var damage =  response.data.data.damage
+            this.$message.success("保存成功")
+            this.modifyDialogVisible = false
+            this.getlist()
+          }
+       })
+     },
 
+     deleteDrugDamage(id,checker_status,index){
+       if(checker_status == 1){
+         this.$message.error("已核对不能删除")
+         return false
+       }
+       this.$confirm('是否删除所选内容?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          let params = {
+            id:id,
+          }
+         deleteDrugDamage(params).then(response => {
+            if (response.data.state == 1) {
+              var msg = response.data.data.msg
+              this.$message.success("保存成功")
+              this.tableList.splice(index,1)
+            } 
+          })
+        }).catch(() => {
+          this.loading = false
+        });
+     }
     },
     created(){
+      this.getlist()
     },
     mounted() {
     },

src/xt_pages/stock/drugs/drugModifyPrice.vue

@@ -38,151 +38,342 @@
         </div>
         <div>
             <el-button size="small" type="primary" @click="dialogVisible = true">新增</el-button>
-            <el-button size="small" type="primary">核对</el-button>
+            <el-button size="small" type="primary" @click="toCheck">核对</el-button>
             <el-button size="small" type="primary" @click="print">打印</el-button>
-            <el-button size="small" type="primary">导出</el-button>
+            <el-button size="small" type="primary" @click="toExport">导出</el-button>
         </div>
       </div>
       <div style="margin-top:10px">
-            <el-table :data="tableData" border :height="tableHeight" :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }">
-                <el-table-column
-                prop="date"
-                label="单据编码">
+            <el-table :data="tableList" border :height="tableHeight" :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }"  @selection-change="changePrice">
+                <el-table-column type="selection" width="55" align="center"> </el-table-column>
+                <el-table-column prop="date" label="单据编码" width="200px" align="center">
+                  <template slot-scope="scope">
+                    {{scope.row.warehousing_order}}
+                  </template>
                 </el-table-column>
-                <el-table-column
-                prop="date"
-                label="调价日期">
+                <el-table-column prop="date" label="调价日期" width="200px"  align="center">
+                   <template slot-scope="scope">
+                    {{getTime(scope.row.start_time)}}
+                  </template>  
                 </el-table-column>
-                <el-table-column
-                prop="name"
-                label="操作人">
+                 <el-table-column prop="date" label="现价格" width="200px"  align="center">
+                   <template slot-scope="scope">
+                    {{scope.row.new_price}}
+                  </template>  
                 </el-table-column>
-                <el-table-column
-                prop="name"
-                label="状态">
+                <el-table-column prop="name" label="操作人" width="200px"  align="center">
+                 <template slot-scope="scope">
+                    {{getDoctorName(scope.row.creater)}}
+                  </template>  
                 </el-table-column>
-                <el-table-column
-                prop="name"
-                label="核对人">
+                <el-table-column prop="name" label="状态"  align="center">
+                  <template slot-scope="scope">
+                     <span v-if="scope.row.checker_status == 1">已核对</span>
+                     <span v-if="scope.row.checker_status == 2">未核对</span>
+                  </template>  
                 </el-table-column>
-                <el-table-column
-                label="操作">
+                <el-table-column prop="name" label="核对人"  align="center">
+                  <template slot-scope="scope">
+                    {{getDoctorName(scope.row.checker)}}
+                  </template>  
+                </el-table-column>
+                <el-table-column label="操作" align="center" width="200px">
                     <template slot-scope="scope">
-                        <el-button type="text" size="small">删除</el-button>
-                        <el-button type="text" size="small">编辑</el-button>
+                      <el-button type="primary" size="small" @click="modifty(scope.row.id,scope.row.checker_status)">编辑</el-button>
+                      <el-button type="danger" size="small" @click="deleteDrugPrice(scope.row.id,scope.row.checker_status,scope.$index)">删除</el-button>
                     </template>
                 </el-table-column>
             </el-table>
+
+          <el-pagination
+              @size-change="handleSizeChange"
+              @current-change="handleCurrentChange"
+              :page-sizes="[10, 20, 40, 100]"
+              :page-size="10"
+              background
+              style="margin-top:20px;text-align: right"
+              layout="total, sizes, prev, pager, next, jumper"
+              :total="total">
+            </el-pagination>
         </div>
     </div>
     <el-dialog
         title="库房调价"
         :visible.sync="dialogVisible"
-        width="1200px"
-        :before-close="handleClose">
+        width="1200px">
         <el-form :model="form" class="modifyDialog" label-width="120px">
             <el-form-item label="药品名称">
-                <el-input v-model="form.name"></el-input>
+              
+                 <el-autocomplete
+                    class="checkSearch"
+                    popper-class="my-autocomplete"
+                    v-model="form.drug_name"
+                    :fetch-suggestions="querySearchAsync"
+                    :trigger-on-focus="true"
+                    placeholder="请输入药品名称"
+                    @select="handleSelect"
+                    @input="changeGoodName(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 + "  "+item.manufacturer}}</div>
+                  </template>
+                 </el-autocomplete>  
             </el-form-item>
             <el-form-item label="原价格">
-                <el-input v-model="form.name"></el-input>
+                <el-input v-model="form.retail_price"></el-input>
             </el-form-item>
             <el-form-item label="现价格">
-                <el-input v-model="form.name"></el-input>
+                <el-input v-model="form.new_price"></el-input>
             </el-form-item>
             <el-form-item label="调价数量">
-                <el-input v-model="form.name"></el-input>
+                <el-input v-model="form.count"></el-input>
             </el-form-item>
             <el-form-item label="备注" style="width:66%;">
                 <div style="display:flex;">
-                    <el-input v-model="form.name"></el-input>
-                    <el-button style="margin-left:5px;" type="primary">添加</el-button>
+                    <el-input v-model="form.remark"></el-input>
+                    <el-button style="margin-left:5px;" type="primary" @click="addPrice">添加</el-button>
                 </div>
             </el-form-item>
         </el-form>
         <el-table :data="tableData" border :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }">
-            <el-table-column
-            prop="date"
-            label="单据编号"
-            width="100">
+            <el-table-column prop="date" label="单据编号" width="100">
+               <template slot-scope="scope">
+                 {{scope.row.warehousing_order}}
+                </template>  
             </el-table-column>
-            <el-table-column
-            prop="date"
-            label="药品名称"
-            width="100">
+            <el-table-column prop="date"label="药品名称" width="100">
+              <template slot-scope="scope">
+                 {{scope.row.drug_name}}
+                </template>  
             </el-table-column>
-            <el-table-column
-            prop="name"
-            label="规格"
-            width="100">
+            <el-table-column prop="name"label="规格" width="100">
+              <template slot-scope="scope">
+                  {{scope.row.dose}}{{scope.row.dose_unit}}*{{scope.row.min_number}}{{scope.row.min_unit}}/{{scope.row.max_unit}}
+              </template>
             </el-table-column>
-            <el-table-column
-            prop="name"
-            label="单位"
-            width="100">
+            <el-table-column prop="name" label="单位" width="100">
+              <template slot-scope="scope">
+              {{scope.row.warehousing_unit}}
+              </template>
             </el-table-column>
-            <el-table-column
-            prop="name"
-            label="调价数量"
-            width="100">
+            <el-table-column prop="name" label="调价数量" width="100">
+              <template slot-scope="scope">
+              {{scope.row.count}}
+              </template>
             </el-table-column>
-            <el-table-column
-            prop="name"
-            label="原进货价"
-            width="100">
+            <el-table-column prop="name" label="原进货价" width="100">
+                <template slot-scope="scope">
+                {{scope.row.retail_price}}
+                </template>
             </el-table-column>
-            <el-table-column
-            prop="name"
-            label="原零售价"
-            width="100">
+            <el-table-column prop="name" label="原零售价" width="100">
+                 <template slot-scope="scope">
+                  {{scope.row.retail_price}}
+                </template>
             </el-table-column>
-            <el-table-column
-            prop="name"
-            label="新零售价"
-            width="100">
+            <el-table-column  prop="name" label="新零售价" width="100">
+                <template slot-scope="scope">
+                  {{scope.row.new_price}}
+                </template>  
             </el-table-column>
-            <el-table-column
-            prop="name"
-            label="生产厂商"
-            width="100">
+            <el-table-column prop="name" label="生产厂商" width="100">
+                <template slot-scope="scope">
+                  {{scope.row.manufacturer}}
+                </template>   
             </el-table-column>
-            <el-table-column
-            prop="name"
-            label="批准文号"
-            width="100">
+            <el-table-column prop="name" label="批准文号" width="100">
+                 <template slot-scope="scope">
+                  {{scope.row.number}}
+                </template>    
             </el-table-column>
-            <el-table-column
-            prop="name"
-            label="供应商"
-            width="100">
+            <el-table-column prop="name" label="供应商" width="100">
+                <template slot-scope="scope">
+                  {{scope.row.manufacturer}}
+                </template>    
             </el-table-column>
-            <el-table-column
-            prop="name"
-            label="备注"
-            width="100">
+            <el-table-column prop="name" label="备注"  width="100">
+               <template slot-scope="scope">
+                  {{scope.row.remark}}
+                </template>      
             </el-table-column>
             <el-table-column
             fixed="right"
             width="100"
             label="操作">
                 <template slot-scope="scope">
-                    <el-button type="text" size="small">删除</el-button>
-                    <el-button type="text" size="small">编辑</el-button>
+                    <el-button type="text" size="small" @click="toDel(scope.$index)">删除</el-button>
+                    <el-button type="text" size="small" @click="toEdit(scope.row)">编辑</el-button>
                 </template>
             </el-table-column>
         </el-table>
+
         <span slot="footer" class="dialog-footer">
             <el-button @click="dialogVisible = false">取 消</el-button>
-            <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
+            <el-button type="primary" @click="saveDrugPrice">确 定</el-button>
+        </span>
+    </el-dialog>
+   
+     <el-dialog
+        title="耗材盘点核对"
+        :visible.sync="checkDialogVisible"
+        width="30%"
+        >
+        <span>
+          <el-form :model="form">
+            <el-row>
+              <el-col>
+                <el-form-item label="核对时间">
+                 <el-date-picker
+                    size="small"
+                    v-model="check_time"
+                    type="date"
+                    style="margin-left:5px;width:140px;"
+                    placeholder="选择日期">
+                  </el-date-picker>
+                </el-form-item>  
+              </el-col>
+            </el-row>  
+             <el-row>
+              <el-col>
+                <el-form-item label="核对人">
+                  <el-select v-model="checker" placeholder="请选择">
+                    <el-option
+                    v-for="item in doctorList"
+                    :key="item.admin_user_id"
+                    :label="item.user_name"
+                    :value="item.admin_user_id">
+                    </el-option>
+                 </el-select>
+                </el-form-item>  
+              </el-col>
+            </el-row>  
+          </el-form>  
+        </span>
+        <span slot="footer" class="dialog-footer">
+            <el-button @click="checkDialogVisible = false">取 消</el-button>
+            <el-button type="primary" @click="SaveCheckedDrugPrice">保 存</el-button>
+        </span>
+    </el-dialog>
+
+
+      <!-- 编辑调价 -->
+    <el-dialog
+        title="编辑"
+        :visible.sync="editPriceDialogVisible"
+        width="50%">
+        <span>
+          <el-form  :model="form">
+            <el-row>
+               <el-col>
+                <el-form-item label="药品名称">
+                 <el-autocomplete
+                    class="checkSearch"
+                    popper-class="my-autocomplete"
+                    v-model="form.drug_name"
+                    :fetch-suggestions="querySearchAsync"
+                    :trigger-on-focus="true"
+                    placeholder="请输入药品名称"
+                    @select="handleSelect"
+                    @input="changeGoodName(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 + "  "+item.manufacturer}}</div>
+                  </template>
+                 </el-autocomplete>  
+              </el-form-item>
+               <el-form-item label="原价格：">
+                 <el-input v-model="form.retail_price" style="width:200px"></el-input>
+               </el-form-item>
+               <el-form-item label="现价格：">
+                    <el-input v-model="form.new_price" style="width:200px"></el-input>
+                </el-form-item>
+             </el-col> 
+            </el-row>
+            <el-row>
+             <el-col>
+               <el-form-item label="调价数量：">
+                    <el-input v-model="form.count"  style="width:200px"></el-input>
+                </el-form-item>
+                <el-form-item label="备注：">
+                    <div style="display:flex;">
+                        <el-input v-model="form.remark"  style="width:200px"></el-input>
+                    </div>
+                </el-form-item>
+              </el-col>  
+            </el-row>
+          </el-form>
+        </span>
+        <span slot="footer" class="dialog-footer">
+            <el-button @click="editPriceDialogVisible = false">取 消</el-button>
+            <el-button type="primary" @click="upatePrice">保存</el-button>
+        </span>
+    </el-dialog>
+
+
+      <el-dialog
+        title="编辑"
+        :visible.sync="modifyPriceDialogVisible"
+        width="50%">
+        <span>
+          <el-form  :model="form">
+            <el-row>
+               <el-col>
+                <el-form-item label="药品名称">
+                 <el-autocomplete
+                    class="checkSearch"
+                    popper-class="my-autocomplete"
+                    v-model="form.drug_name"
+                    :fetch-suggestions="querySearchAsync"
+                    :trigger-on-focus="true"
+                    placeholder="请输入药品名称"
+                    @select="handleSelect"
+                    @input="changeGoodName(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 + "  "+item.manufacturer}}</div>
+                  </template>
+                 </el-autocomplete>  
+              </el-form-item>
+               <el-form-item label="原价格：">
+                 <el-input v-model="form.retail_price" style="width:200px"></el-input>
+               </el-form-item>
+               <el-form-item label="现价格：">
+                    <el-input v-model="form.new_price" style="width:200px"></el-input>
+                </el-form-item>
+             </el-col> 
+            </el-row>
+            <el-row>
+             <el-col>
+               <el-form-item label="调价数量：">
+                    <el-input v-model="form.count"  style="width:200px"></el-input>
+                </el-form-item>
+                <el-form-item label="备注：">
+                    <div style="display:flex;">
+                        <el-input v-model="form.remark"  style="width:200px"></el-input>
+                    </div>
+                </el-form-item>
+              </el-col>  
+            </el-row>
+          </el-form>
+        </span>
+        <span slot="footer" class="dialog-footer">
+            <el-button @click="modifyPriceDialogVisible = false">取 消</el-button>
+            <el-button type="primary" @click="modifyDrugPrice">保存</el-button>
         </span>
     </el-dialog>
-  
   </div>
 </template>
 
 <script>
+import { uParseTime } from '@/utils/tools'
 import BreadCrumb from "../../components/bread-crumb";
-
+import {postSearchDrugWarehouseList,saveDrugPrice,getDrugPriceList,SaveCheckedDrugPrice,getDrugModiftyPrice,modifyDrugPrice,deleteDrugPrice} from "@/api/drug/drug"
 export default {
     name: "stockModifyPrice",
     components:{
@@ -200,27 +391,50 @@ export default {
             searchKey:'',
             value1:'',
             value2:'',
-            tableData: [{
-                date: '2016-05-02',
-                name: '王小虎',
-                address: '上海市普陀区金沙江路 1518 弄'
-                }, {
-                date: '2016-05-04',
-                name: '王小虎',
-                address: '上海市普陀区金沙江路 1517 弄'
-                }, {
-                date: '2016-05-01',
-                name: '王小虎',
-                address: '上海市普陀区金沙江路 1519 弄'
-                }, {
-                date: '2016-05-03',
-                name: '王小虎',
-                address: '上海市普陀区金沙江路 1516 弄'
-            }],
+            tableData: [],
             dialogVisible:false,
             form: {
-                name: '',
+                id:"",
+                drug_name: '',
+                retail_price :'',
+                new_price:"",
+                count:"",
+                remark:"",
+                warehousing_order:"",
+                manufacturer:"",
+                dealer:"",
+                license_number:"",
+                warehousing_unit:"",
+                specification_name:"",
+                buy_price:"",
+                drug_id:"",
+                packing_unit:"",
+                drug_origin_place:"",
+                report_count:"",
+                total:"",
+                dose:"",
+                dose_unit:"",
+                min_number:"",
+                min_unit:"",
+                max_unit:"",
+                batch_number:"",
+                last_price:"",
             },
+            drugList:[],
+            manufacturerList:[],
+            dealerList:[],
+            currentIndex: 0,
+            limit:10,
+            page:1,
+            tableList:[],
+            ids:"",
+            checkDialogVisible:false,
+            checker:this.$store.getters.xt_user.user.id,
+            check_time:new Date(),
+            doctorList:[],
+            editPriceDialogVisible:false,
+            modifyPriceDialogVisible:false,
+            id:0,
         }
     },
     methods:{
@@ -228,13 +442,306 @@ export default {
 
         },
         print(){
-            this.$router.push({path:'/stock/drugs/drugModifyPricePrint'})
+           if(this.ids == ""){
+             this.$message.error("请勾选打印数据")
+             return false
+           }else{
+            this.$router.push({path:'/stock/drugs/drugModifyPricePrint?ids='+this.ids})
+           }  
+        },
+        addPrice(){
+          var obj = {
+            drug_id:this.form.drug_id,
+            drug_name:this.form.drug_name,
+            warehousing_unit:this.form.warehousing_unit,
+            count:parseInt(this.form.count),
+            retail_price:this.form.retail_price.toString(),
+            manufacturer:this.form.manufacturer,
+            drug_origin_place:this.form.drug_origin_place,
+            number:this.form.number,
+            remark:this.form.remark,
+            new_price:this.form.new_price.toString(),
+            warehousing_order:this.form.warehousing_order,
+            dealer:this.form.dealer,
+            last_price:this.form.last_price,
+            start_time:this.getTime(new Date()),
+            } 
+          this.tableData.push(obj)     
+        },
+        querySearchAsync(keyword, cb) {
+            let key = '';
+            if (keyword != undefined) {
+                key = keyword
+            }
+            postSearchDrugWarehouseList(key).then(response => {
+            if (response.data.state == 1) {
             
+                var list = response.data.data.list
+                console.log("列表数据",list)
+                this.drugList = 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.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
+                    }
+                    }
+                }
+
+                for(let i=0;i<this.drugList.length;i++){
+                    for(let j=0;j<this.dealerList.length;j++){
+                        if(this.drugList[i].dealer == this.dealerList[j].id){
+                        this.drugList[i].dealer = this.dealerList[j].dealer_name
+                        }
+                    }
+                }
+            
+                cb(this.drugList)
+            } else {
+                cb([])
+             }
+          })
+         },
+        changeGoodName(val){
+          this.currentIndex = val
+        },
+         handleSelect(val){
+            console.log("val232323223",val)
+            this.form.id = val.id
+            this.form.drug_id = val.drug_id,
+            this.form.drug_name = val.drug_name
+            this.form.retail_price = val.retail_price
+            this.form.warehousing_order = val.warehousing_order
+            this.form.number = val.number
+            this.form.dealer = val.dealer
+            this.form.manufacturer = val.manufacturer
+            this.form.remark = val.remark
+            this.form.warehousing_unit = val.warehouseing_unit  
+            this.form.total = val.total
+            this.form.batch_number = val.batch_number
+            this.form.last_price = val.last_price
+        },
+        getTime(val) {
+         if(val < 0){
+            return ""
+          }
+         if(val == ""){
+            return ""
+          }else {
+            return uParseTime(val, '{y}-{m}-{d}')
+         }
+        },
+       saveDrugPrice(){
+         for(let i=0;i<this.tableData.length;i++){
+           this.tableData[i].retail_price = this.tableData[i].retail_price.toString()
+           this.tableData[i].last_price = this.tableData[i].last_price.toString()
+           this.tableData[i].new_price = this.tableData[i].new_price.toString()
+           this.tableData[i].count =  parseInt(this.tableData[i].count)
+           if(this.tableData[i].dealer == 0){
+             this.tableData[i].dealer = ""
+           }
+           if(this.tableData[i].manufacturer == 0){
+             this.tableData[i].manufacturer = ""
+           }
+         }
+         var params= {
+           tableData:this.tableData,
+         }
+        console.log("parasm222",params)
+       saveDrugPrice(params).then(response=>{
+        if(response.data.state == 1){
+          var msg =  response.data.data.msg
+          console.log("msg",msg)
+          this.$message.success("保存成功!")
+          this.dialogVisible = false
+          this.getlist()
+        }
+      })  
+     },
+     getlist(){
+         var params = {
+            keyword:this.searchKey,
+            start_time:"",
+            end_time:"",
+            limit:this.limit,
+            page:this.page,
+         }
+       getDrugPriceList(params).then(response=>{
+          if(response.data.state == 1){
+           var list =  response.data.data.list
+           this.total = response.data.data.total
+           this.tableList = list
+           this.doctorList = response.data.data.doctorList
+          }
+       })   
+     },
+     getDoctorName(id){
+        var user_name = ""
+        for(let i=0;i<this.doctorList.length;i++){
+          if(id == this.doctorList[i].admin_user_id){
+            user_name = this.doctorList[i].user_name
+          }
+        } 
+        return user_name
+     },
+     changePrice(val){  
+       var arr = []
+      
+       for(let i=0;i<val.length;i++){
+         arr.push(val[i].id)
+       }
+      var str = arr.join(",")
+    
+      console.log("str",str)
+      this.ids = str
+     
+     },
+     toCheck(){
+      if(this.ids.length <=0){
+         this.$message.error("请勾选核对数据")
+         return
+       }else{
+         this.checkDialogVisible = true
+       }
+     },
+     SaveCheckedDrugPrice(){
+         var params = {
+            ids:this.ids,
+            check_time:this.getTime(this.check_time),
+            checker:this.checker,
+         }
+       console.log("params",params)
+       SaveCheckedDrugPrice(params).then(response=>{
+         if(response.data.state == 1){
+           this.$message.success("保存成功")
+           var adjustPrice = response.data.data.adjustPrice
+           this.checkDialogVisible = false
+           this.getlist()
+         }
+       })
+     },
+     toDel(index){
+       this.tableData.splice(index,1)
+     },
+     toEdit(row){
+      this.form.drug_name = row.drug_name
+      this.form.retail_price = row.retail_price
+      this.form.new_price = row.new_price
+      this.form.count = row.count
+      this.form.remark = row.remark
+      this.form.id = row.id
+      this.editPriceDialogVisible = true  
+     },
+     upatePrice(){
+       for(let i=0;i<this.tableData.length;i++){
+         if(this.form.id == this.tableData[i].id){
+            this.tableData[i].drug_name = this.form.drug_name
+            this.tableData[i].retail_price = this.form.retail_price
+            this.tableData[i].new_price = this.form.new_price
+            this.tableData[i].count = this.form.count
+            this.tableData[i].remark = this.form.remark
+         }
+       }
+       this.editPriceDialogVisible = false
+       this.form.drug_name = ""
+       this.form.retail_price = ""
+       this.form.new_price = ""
+       this.form.count = ""
+       this.form.remark = ""
+     },
+     modifty(id,checker_status){
+        if(checker_status == 1){
+         this.$message.error("已核对,无法编辑")
+         return false
         }
+       getDrugModiftyPrice(id).then(response=>{
+          if(response.data.state == 1){
+             var detail = response.data.data.detail
+             this.form.drug_name = detail.drug_name
+             this.form.retail_price = detail.retail_price
+             this.form.new_price = detail.new_price
+             this.form.count = detail.count
+             this.form.remark = detail.remark
+             this.id = detail.id
+             this.modifyPriceDialogVisible = true
+          }
+       })
+     },
+     modifyDrugPrice(){
+        var params = {
+          drug_name:this.form.drug_name,
+          retail_price:this.form.retail_price.toString(),
+          new_price:this.form.new_price.toString(),
+          count:parseInt(this.form.count),
+          remark:this.form.remark,
+          id:this.id
+        }
+      modifyDrugPrice(params).then(response=>{
+         if(response.data.state == 1){
+           var adjustPrice = response.data.data.adjustPrice
+           this.$message.success("保存成功")
+           this.modifyPriceDialogVisible = false
+         }
+      })
+     },
+     deleteDrugPrice(id,checker_status,index){
+       if(checker_status == 1){
+         this.$message.error("已核对,无法编辑")
+         return false
+        }
+        this.$confirm('是否删除所选内容?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          let params = {
+            id:id,
+          }
+         deleteDrugPrice(params).then(response => {
+            if (response.data.state == 1) {
+              var msg = response.data.data.msg
+              this.$message.success("保存成功")
+              this.tableList.splice(index,1)
+            } 
+          })
+        }).catch(() => {
+          this.loading = false
+        });
+     },
+     handleSizeChange(val){
+       this.limit = val
+       this.getlist()
+      },
+     handleCurrentChange(val){
+        this.page = val
+        this.getlist()
+      },
+     toExport(){
+      import('@/vendor/Export2Excel').then(excel => {
+        const tHeader = ['药品名称','规格','单位','批次','调价数量','原进货价','新进货价','进货差价','原零售价','新零售价','零售差价',]
+        const filterVal = ['drug_name', '','warehousing_unit','number','count','retail_price','new_price','','new_price','']
+        console.log("table",this.tableList)
+      
+        const data = this.formatJson(filterVal, this.tableList)
+        excel.export_json_to_excel({
+          header: tHeader,
+          data,
+          filename: '药品调价'
+        })
+      this.downloadLoading = false
+     })
+    },
+    formatJson(filterVal, jsonData) {
+      return jsonData.map(v => filterVal.map(j => v[j]));
+     },
     },
     created(){
         let tableHeight = document.body.clientHeight - 200;
         this.tableHeight = tableHeight
+        this.getlist()
     },
     mounted() {
       const that = this;

src/xt_pages/stock/drugs/drugModifyPricePrint.vue

@@ -17,7 +17,7 @@
                 </div>
                 <div class="flex">
                     <div>单据编号：</div>
-                    <div>打印日期：</div>
+                    <div>打印日期：{{nowtime}}</div>
                 </div>
                 <div class="tableTitle">
                     <div style="width:8%">货号</div>
@@ -33,19 +33,19 @@
                     <div style="width:8%">新零售价</div>
                     <div style="width:8%">零售差价</div>
                 </div>
-                <div class="tableTr" v-for="item in 3">
-                    <div style="width:8%">上三</div>
-                    <div style="width:8%">上三名称</div>
-                    <div style="width:8%">上三</div>
-                    <div style="width:8%">上三</div>
-                    <div style="width:8%">上三</div>
-                    <div style="width:8%">上三数量</div>
-                    <div style="width:8%">上三货价</div>
-                    <div style="width:8%">上三货价</div>
-                    <div style="width:8%">上三差价</div>
-                    <div style="width:8%">上三售价</div>
-                    <div style="width:8%">上三售价</div>
-                    <div style="width:8%">上三差价</div>
+                <div class="tableTr" v-for="(item,index) in this.tableData" :key="index">
+                    <div style="width:8%"></div>
+                    <div style="width:8%">{{item.drug_name}}</div>
+                    <div style="width:8%"></div>
+                    <div style="width:8%">{{item.warehousing_unit}}</div>
+                    <div style="width:8%">{{item.number}}</div>
+                    <div style="width:8%">{{item.count}}</div>
+                    <div style="width:8%">{{item.retail_price}}</div>
+                    <div style="width:8%">{{item.new_price}}</div>
+                    <div style="width:8%"></div>
+                    <div style="width:8%">{{item.retail_price}}</div>
+                    <div style="width:8%">{{item.new_price}}</div>
+                    <div style="width:8%"></div>
                 </div>
                 <div class="tableBottom">
                     <div style="width:8%">合计：</div>
@@ -56,10 +56,10 @@
                     <div style="width:8%"></div>
                     <div style="width:8%"></div>
                     <div style="width:8%"></div>
-                    <div style="width:8%">上三差价</div>
                     <div style="width:8%"></div>
                     <div style="width:8%"></div>
-                    <div style="width:8%">上三差价</div>
+                    <div style="width:8%"></div>
+                    <div style="width:8%"></div>
                 </div>
                 <div style="display:flex;margin-top:1px;float:right;margin-top:10px;">
                     <div style="width:80px;">审批：</div><div style="width:100px;"></div>
@@ -77,6 +77,7 @@
 import BreadCrumb from '@/xt_pages/components/bread-crumb'
 const moment = require('moment');
 import { uParseTime } from '@/utils/tools'
+import { getModifyPricePrint } from "@/api/drug/drug"
 export default {
     components:{
         BreadCrumb
@@ -88,6 +89,9 @@ export default {
             { path: false, name: '耗材管理' },
             { path: false, name: '药品调价打印' },
           ],
+          ids:"",
+          tableData:[],
+          nowtime: moment(new Date()).format('YYYY-MM-DD'),
         }
     },
     methods:{
@@ -101,10 +105,23 @@ export default {
             scanStyles: false
             })
         },
+        getModifyPricePrint(ids){
+          var params = {
+            ids:ids,
+          }
+          getModifyPricePrint(params).then(response=>{
+            if(response.data.state == 1){
+             console.log("hhhhh",response.data.data.list)
+              this.tableData = response.data.data.list
+            }
+          })
+        }
 
 
     },
     created(){
+     this.ids = this.$route.query.ids
+     this.getModifyPricePrint(this.ids)
     }
 }
 </script>

src/xt_pages/stock/drugs/inventory.vue

@@ -2,14 +2,14 @@
     <div>
         <div style="display: flex;align-items: center;justify-content: space-between;margin-bottom:10px;">
             <div>
-                <el-select v-model="value" size="small" placeholder="请选择">
+                <!-- <el-select v-model="value" size="small" placeholder="请选择">
                     <el-option
                     v-for="item in options"
                     :key="item.value"
                     :label="item.label"
                     :value="item.value">
                     </el-option>
-                </el-select>
+                </el-select> -->
                 <el-input
                 size="small"
                 style="width: 200px;margin-left:10px;"
@@ -75,8 +75,8 @@
             <el-table-column
             label="操作">
                 <template slot-scope="scope">
-                    <el-button type="text" size="small">删除</el-button>
-                    <el-button type="text" size="small">编辑</el-button>
+                  <el-button type="text" size="small" >编辑</el-button>
+                  <el-button type="text" size="small" >删除</el-button>
                 </template>
             </el-table-column>
         </el-table>
@@ -94,129 +94,210 @@
         <el-dialog
         title="库房调价"
         :visible.sync="dialogVisible"
-        width="1200px"
-        :before-close="handleClose">
+        width="1200px">
             <el-form :model="form" class="modifyDialog" label-width="120px">
                 <el-form-item label="耗材ID">
-                    <el-input v-model="form.name"></el-input>
+                    <el-input v-model="form.drug_id"></el-input>
                 </el-form-item>
                 <el-form-item label="药品名称">
-                    <el-input v-model="form.name"></el-input>
+                  <el-autocomplete
+                    class="checkSearch"
+                    popper-class="my-autocomplete"
+                    v-model="form.drug_name"
+                    :fetch-suggestions="querySearchAsync"
+                    :trigger-on-focus="true"
+                    placeholder="请输入药品名称"
+                    @select="handleSelect"
+                    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 + "  "+item.manufacturer}}</div>
+                  </template>
+                 </el-autocomplete>  
                 </el-form-item>
                 <el-form-item label="规格">
-                    <el-input v-model="form.name"></el-input>
+                    <el-input v-model="form.specification_name" :disabled="true"></el-input>
                 </el-form-item>
                 <el-form-item label="单位">
-                    <el-input v-model="form.name"></el-input>
+                    <el-input v-model="form.warehousing_unit"></el-input>
                 </el-form-item>
                 <el-form-item label="进货价">
-                    <el-input v-model="form.name"></el-input>
+                    <el-input v-model="form.last_price"></el-input>
                 </el-form-item>
                 <el-form-item label="零售价">
-                    <el-input v-model="form.name"></el-input>
+                    <el-input v-model="form.retail_price"></el-input>
                 </el-form-item>
-                <el-form-item label="报损数量">
-                    <el-input v-model="form.name"></el-input>
+                <el-form-item label="盘点数量">
+                    <el-input v-model="form.count"></el-input>
                 </el-form-item>
                 <el-form-item label="库存">
-                    <el-input v-model="form.name"></el-input>
+                    <el-input v-model="form.total" :disabled="true"></el-input>
                 </el-form-item>
                 <el-form-item label="产地">
-                    <el-input v-model="form.name"></el-input>
+                    <el-input v-model="form.drug_origin_place"></el-input>
                 </el-form-item>
                 <el-form-item label="批准文号">
-                    <el-input v-model="form.name"></el-input>
+                    <el-input v-model="form.number"></el-input>
                 </el-form-item>
                 <el-form-item label="生产厂商">
-                    <el-input v-model="form.name"></el-input>
+                    <el-input v-model="form.manufacturer"></el-input>
                 </el-form-item>
                 <el-form-item label="备注">
                     <div style="display:flex;">
                         <el-input v-model="form.name"></el-input>
-                        <el-button style="margin-left:5px;" type="primary">添加</el-button>
+                        <el-button style="margin-left:5px;" type="primary" @click="addInventory">添加</el-button>
                     </div>
                 </el-form-item>
             </el-form>
             <el-table :data="tableData" border :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }">
-                <el-table-column
-                prop="date"
-                label="耗材ID"
-                width="100">
+                <el-table-column prop="date" label="耗材ID" width="100">
+                    <template slot-scope="scope">
+                       {{scope.row.drug_id}}
+                    </template>
                 </el-table-column>
-                <el-table-column
-                prop="date"
-                label="耗材名称"
-                width="100">
+                <el-table-column prop="date" label="耗材名称" width="100">
+                   <template slot-scope="scope">
+                       {{scope.row.drug_name}}
+                    </template>
                 </el-table-column>
-                <el-table-column
-                prop="name"
-                label="规格"
-                width="100">
+                <el-table-column prop="name" label="规格" width="100">
+                   <template slot-scope="scope">
+                       {{scope.row.specification_name}}
+                    </template>
                 </el-table-column>
-                <el-table-column
-                prop="name"
-                label="单位"
-                width="100">
+                <el-table-column prop="name" label="单位" width="100">
+                     <template slot-scope="scope">
+                       {{scope.row.warehousing_unit}}
+                    </template>
                 </el-table-column>
-                <el-table-column
-                prop="name"
-                label="调价数量"
-                width="100">
+                <el-table-column prop="name"  label="盘点数量" width="100">
+                     <template slot-scope="scope">
+                       {{scope.row.count}}
+                    </template>
                 </el-table-column>
-                <el-table-column
-                prop="name"
-                label="原进货价"
-                width="100">
+                <el-table-column prop="name" label="原进货价" width="100">
+                   <template slot-scope="scope">
+                       {{scope.row.last_price}}
+                    </template>
                 </el-table-column>
-                <el-table-column
-                prop="name"
-                label="原零售价"
-                width="100">
+                <el-table-column prop="name" label="原零售价" width="100">
+                    <template slot-scope="scope">
+                       {{scope.row.retail_price}}
+                    </template>
                 </el-table-column>
-                <el-table-column
-                prop="name"
-                label="新零售价"
-                width="100">
+                <el-table-column prop="name" label="新零售价" width="100">
+                     <template slot-scope="scope">
+                       {{scope.row.new_price}}
+                    </template>
                 </el-table-column>
-                <el-table-column
-                prop="name"
-                label="生产厂商"
-                width="100">
+                <el-table-column  prop="name" label="生产厂商" width="100">
+                    <template slot-scope="scope">
+                       {{scope.row.manufacturer}}
+                    </template> 
                 </el-table-column>
-                <el-table-column
-                prop="name"
-                label="产地"
-                width="100">
+                <el-table-column prop="name" label="产地"  width="100">
+                  <template slot-scope="scope">
+                       {{scope.row.drug_origin_place}}
+                  </template> 
                 </el-table-column>
-                <el-table-column
-                prop="name"
-                label="批准文号"
-                width="100">
+                <el-table-column prop="name" label="批准文号" width="100">
+                 <template slot-scope="scope">
+                       {{scope.row.number}}
+                  </template> 
                 </el-table-column>
-                <el-table-column
-                prop="name"
-                label="备注"
-                width="100">
+                <el-table-column prop="name" label="备注" width="100">
+                    <template slot-scope="scope">
+                       {{scope.row.remark}}
+                    </template> 
                 </el-table-column>
                 <el-table-column
                 fixed="right"
                 width="100"
                 label="操作">
                     <template slot-scope="scope">
-                        <el-button type="text" size="small">删除</el-button>
-                        <el-button type="text" size="small">编辑</el-button>
+                        <el-button type="text" size="small" @click="toEdit(scope.row)">编辑</el-button>
+                        <el-button type="text" size="small" @click="toDelete(scope.$index)">删除</el-button>
+                       
                     </template>
                 </el-table-column>
             </el-table>
             <span slot="footer" class="dialog-footer">
                 <el-button @click="dialogVisible = false">取 消</el-button>
-                <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
+                <el-button type="primary" @click="saveDrugInventory">确 定</el-button>
+            </span>
+        </el-dialog>
+
+
+          <el-dialog
+            title="库房调价"
+            :visible.sync="editdialogVisible"
+            width="1200px">
+            <el-form :model="form" class="modifyDialog" label-width="120px">
+                <el-form-item label="耗材ID">
+                    <el-input v-model="form.drug_id"></el-input>
+                </el-form-item>
+                <el-form-item label="药品名称">
+                  <el-autocomplete
+                    class="checkSearch"
+                    popper-class="my-autocomplete"
+                    v-model="form.drug_name"
+                    :fetch-suggestions="querySearchAsync"
+                    :trigger-on-focus="true"
+                    placeholder="请输入药品名称"
+                    @select="handleSelect"
+                    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 + "  "+item.manufacturer}}</div>
+                  </template>
+                 </el-autocomplete>  
+                </el-form-item>
+                <el-form-item label="规格">
+                    <el-input v-model="form.specification_name" :disabled="true"></el-input>
+                </el-form-item>
+                <el-form-item label="单位">
+                    <el-input v-model="form.warehousing_unit"></el-input>
+                </el-form-item>
+                <el-form-item label="进货价">
+                    <el-input v-model="form.last_price"></el-input>
+                </el-form-item>
+                <el-form-item label="零售价">
+                    <el-input v-model="form.retail_price"></el-input>
+                </el-form-item>
+                <el-form-item label="盘点数量">
+                    <el-input v-model="form.count"></el-input>
+                </el-form-item>
+                <el-form-item label="库存">
+                    <el-input v-model="form.total" :disabled="true"></el-input>
+                </el-form-item>
+                <el-form-item label="产地">
+                    <el-input v-model="form.drug_origin_place"></el-input>
+                </el-form-item>
+                <el-form-item label="批准文号">
+                    <el-input v-model="form.number"></el-input>
+                </el-form-item>
+                <el-form-item label="生产厂商">
+                    <el-input v-model="form.manufacturer"></el-input>
+                </el-form-item>
+                <el-form-item label="备注">
+                    <div style="display:flex;">
+                        <el-input v-model="form.remark"></el-input>
+                    </div>
+                </el-form-item>
+            </el-form>
+            <span slot="footer" class="dialog-footer">
+                <el-button @click="editdialogVisible = false">取 消</el-button>
+                <el-button type="primary" @click="saveInventory">确 定</el-button>
             </span>
         </el-dialog>
     </div>
 </template>
 
 <script>
+import { uParseTime } from '@/utils/tools'
+import { postSearchDrugWarehouseList,getDrugWarehouseInfoList,saveDrugInventory} from "@/api/drug/drug"
 export default {
     name: "drugInventory",
     data() {
@@ -224,29 +305,39 @@ export default {
             searchKey:'',
             value1:'',
             value2:'',
-            tableData: [{
-                date: '2016-05-02',
-                name: '王小虎',
-                address: '上海市普陀区金沙江路 1518 弄'
-                }, {
-                date: '2016-05-04',
-                name: '王小虎',
-                address: '上海市普陀区金沙江路 1517 弄'
-                }, {
-                date: '2016-05-01',
-                name: '王小虎',
-                address: '上海市普陀区金沙江路 1519 弄'
-                }, {
-                date: '2016-05-03',
-                name: '王小虎',
-                address: '上海市普陀区金沙江路 1516 弄'
-            }],
+            tableData: [],
             dialogVisible:false,
-            form: {
-                name: '',
+           form: {
+                id:"",
+                drug_name: '',
+                retail_price :'',
+                new_price:"",
+                count:"",
+                remark:"",
+                warehousing_order:"",
+                manufacturer:"",
+                dealer:"",
+                number:"",
+                warehousing_unit:"",
+                specification_name:"",
+                buy_price:"",
+                drug_id:"",
+                packing_unit:"",
+                drug_origin_place:"",
+                report_count:"",
+                total:"",
+                dose:"",
+                dose_unit:"",
+                min_number:"",
+                min_unit:"",
+                max_unit:"",
+                last_price:"",
+                batch_number:"",
+                product_date:"",
+                expiry_date:"",
             },
             total: 0,
-            
+            editdialogVisible:false,
         }
     },
     methods:{
@@ -258,7 +349,218 @@ export default {
             
         },
         handleSizeChange(){},
-        handleCurrentChange(){}
+        handleCurrentChange(){},
+        querySearchAsync(keyword, cb) {
+            let key = '';
+            if (keyword != undefined) {
+                key = keyword
+            }
+            postSearchDrugWarehouseList(key).then(response => {
+            if (response.data.state == 1) {
+            
+                var list = response.data.data.list
+                console.log("列表数据",list)
+                this.drugList = 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.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
+                    }
+                    }
+                }
+
+                for(let i=0;i<this.drugList.length;i++){
+                    for(let j=0;j<this.dealerList.length;j++){
+                        if(this.drugList[i].dealer == this.dealerList[j].id){
+                        this.drugList[i].dealer = this.dealerList[j].dealer_name
+                        }
+                    }
+                }
+            
+                cb(this.drugList)
+            } else {
+                cb([])
+             }
+          })
+         },
+         handleSelect(val){
+            console.log("999999",val)
+            var params = {
+              id:val.drug_id
+            }
+           getDrugWarehouseInfoList(params).then(response=>{
+             if(response.data.state == 1){
+                var list =  response.data.data.list
+                for(let i=0;i<list.length;i++){
+                  list[i].stock_max_number = val.min_number * list[i].stock_max_number
+                }
+                var total = 0
+                for(let i=0;i<list.length;i++){
+                   total += (list[i].stock_max_number+list[i].stock_min_number)
+                }
+                console.log("total",total)
+               
+
+                console.log("库存",list)
+                this.form.id = val.id
+                this.form.drug_id = val.drug_id,
+                this.form.drug_name = val.drug_name
+                this.form.retail_price = val.retail_price
+                this.form.warehousing_order = val.warehousing_order
+                this.form.number = val.number
+                this.form.dealer = val.dealer
+                this.form.manufacturer = val.manufacturer
+                this.form.remark = val.remark
+                this.form.warehousing_unit = val.warehouseing_unit  
+                this.form.total = this.getTotal(total,val.max_unit,val.min_unit,val.min_number)
+                this.form.batch_number = val.batch_number
+                this.form.last_price = val.last_price
+                this.form.specification_name =  val.dose + val.dose_unit +"*"+val.min_number+val.min_unit+"/"+val.max_unit
+                this.form.expiry_date = val.expiry_date
+                this.form.product_date =val.product_date
+             }
+           })
+        },
+        getTime(val) {
+         if(val < 0){
+            return ""
+          }
+         if(val == ""){
+            return ""
+          }else {
+            return uParseTime(val, '{y}-{m}-{d}')
+         }
+        },
+        getTotal(total,max_unit,min_unit,min_number){
+            var str = ""
+            var min_str = ""
+            if(total<min_number){
+            str = ""
+            min_str = total + min_unit
+            }
+            if(total >= min_number){
+            if(parseInt(total/min_number)!=0){
+                str = parseInt(total/min_number)+ max_unit
+            }
+            if((total%min_number)!=0){
+                min_str =  total%min_number + min_unit
+            }
+            }
+        
+            return str + min_str
+        },
+        addInventory(){
+          var obj = {
+            drug_id:this.form.drug_id,
+            drug_name:this.form.drug_name,
+            warehousing_unit:this.form.warehousing_unit,
+            count:this.form.count,
+            retail_price:this.form.retail_price.toString(),
+            manufacturer:this.form.manufacturer,
+            drug_origin_place:this.form.drug_origin_place,
+            number:this.form.number,
+            remark:this.form.remark,
+            new_price:this.form.new_price.toString(),
+            warehousing_order:this.form.warehousing_order,
+            dealer:this.form.dealer,
+            last_price:this.form.last_price,
+            start_time:this.getTime(new Date()),
+            number:this.form.number,  
+            total:this.form.total,
+            specification_name:this.form.specification_name,
+            batch_number:this.form.batch_number,
+            expiry_date:this.form.expiry_date,
+            product_date:this.form.product_date
+         } 
+         this.tableData.push(obj)   
+        },
+        toDelete(index){
+          this.tableData.splice(index,1)
+        },
+        toEdit(val){
+            console.log("val2323223",val)
+           this.form.id= val.id
+           this.form.drug_id = val.drug_id,
+           this.form.drug_name = val.drug_name
+           this.form.retail_price = val.retail_price
+           this.form.warehousing_order = val.warehousing_order
+           this.form.number = val.number
+           this.form.dealer = val.dealer
+           this.form.manufacturer = val.manufacturer
+           this.form.remark = val.remark
+           this.form.warehousing_unit = val.warehouseing_unit  
+           this.form.total = val.total
+           this.form.batch_number = val.batch_number
+           this.form.last_price = val.last_price
+           this.form.specification_name =  val.specification_name
+           this.form.expiry_date = val.expiry_date
+           this.form.product_date =val.product_date  
+           this.form.count = val.count
+           this.editdialogVisible = true
+        },
+        saveInventory(){
+          for(let i=0;i<this.tableData.length;i++){
+             if(this.form.id == this.tableData[i].id){
+               this.tableData[i].drug_id = this.form.drug_id
+               this.tableData[i].drug_name = this.form.drug_name
+               this.tableData[i].retail_price = this.form.retail_price
+               this.tableData[i].warehousing_order = this.form.warehousing_order
+               this.tableData[i].number = this.form.number
+               this.tableData[i].dealer = this.form.dealer
+               this.tableData[i].manufacturer = this.form.manufacturer
+               this.tableData[i].remark = this.form.remark
+               this.tableData[i].warehouseing_unit = this.form.warehousing_unit
+               this.tableData[i].total = this.form.total
+               this.tableData[i].batch_number = this.form.batch_number
+               this.tableData[i].last_price = this.form.last_price
+               this.tableData[i].specification_name = this.form.specification_name
+               this.tableData[i].expiry_date = this.form.expiry_date
+               this.tableData[i].product_date = this.form.product_date
+               this.tableData[i].count =this.form.count
+             }
+          }   
+          this.editdialogVisible = false
+        },
+        saveDrugInventory(){
+           for(let i=0;i<this.tableData.length;i++){
+              this.tableData[i].retail_price = this.tableData[i].retail_price.toString()
+              this.tableData[i].last_price = this.tableData[i].last_price.toString()
+              this.tableData[i].count = parseInt(this.tableData[i].count)
+              if(this.tableData[i].expiry_date == undefined){
+                this.tableData[i].expiry_date  = 0
+              }else{
+               this.tableData[i].expiry_date = this.tableData[i].expiry_date
+              }
+              if( this.tableData[i].product_date  == undefined){
+                this.tableData[i].product_date = 0
+              }else{
+               this.tableData[i].product_date = this.tableData[i].product_date
+              }
+              
+             
+              if(this.tableData[i].dealer == 0){
+                this.tableData[i].dealer = ""
+              }
+               if(this.tableData[i].manufacturer == 0){
+                this.tableData[i].manufacturer = ""
+              }
+           }
+           var params = {
+              tableData:this.tableData
+           }
+           console.log("parasm222",params)
+          saveDrugInventory(params).then(response=>{
+            if(response.data.state == 1){
+              var msg = response.data.data.msg
+              this.$message.success("保存成功")
+              this.editdialogVisible = false
+            }
+          })
+        }
 
     },
     created(){

src/xt_pages/stock/drugs/inventoryDetails.vue

@@ -266,23 +266,7 @@ export default {
             searchKey:'',
             value1:'',
             value2:'',
-            tableData: [{
-                date: '2016-05-02',
-                name: '王小虎',
-                address: '上海市普陀区金沙江路 1518 弄'
-                }, {
-                date: '2016-05-04',
-                name: '王小虎',
-                address: '上海市普陀区金沙江路 1517 弄'
-                }, {
-                date: '2016-05-01',
-                name: '王小虎',
-                address: '上海市普陀区金沙江路 1519 弄'
-                }, {
-                date: '2016-05-03',
-                name: '王小虎',
-                address: '上海市普陀区金沙江路 1516 弄'
-            }],
+            tableData: [],
             dialogVisible:false,
             form: {
                 name: '',

src/xt_pages/stock/inventory.vue

@@ -42,12 +42,13 @@
             </div>
             <div>
                 <el-button size="small" type="primary" @click="dialogVisible = true">新增</el-button>
-                <el-button size="small" type="primary">核对</el-button>
+                <el-button size="small" type="primary" @click="toCheck">核对</el-button>
                 <el-button size="small" type="primary" @click="print">打印</el-button>
-                <el-button size="small" type="primary">导出</el-button>
+                <el-button size="small" type="primary" @click="exportList">导出</el-button>
             </div>
         </div>
-        <el-table :data="tableList" border :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }">
+        <el-table :data="tableList" border :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }"  @selection-change="changePrice">>
+            <el-table-column type="selection" width="55" align="center"> </el-table-column>
             <el-table-column prop="date" label="盘点编号"  align="center">
               <template slot-scope="scope">
                 {{scope.row.warehousing_order}}
@@ -57,6 +58,11 @@
               <template slot-scope="scope" >
                 {{getTime(scope.row.start_time)}}
               </template>  
+            </el-table-column>
+             <el-table-column  prop="date" label="盘点数量" align="center">
+              <template slot-scope="scope" >
+                {{scope.row.count}}
+              </template>  
             </el-table-column>
             <el-table-column prop="name" label="盘点人" align="center">
              <template slot-scope="scope" >
@@ -81,16 +87,16 @@
             </el-table-column>
             <el-table-column label="操作" align="center">
                 <template slot-scope="scope">
-                    <el-button type="text" size="small">删除</el-button>
-                    <el-button type="text" size="small">编辑</el-button>
+                  <el-button type="primary" size="small" @click="getInventoryDetail(scope.row.id,scope.row.checker_status)">编辑</el-button>
+                  <el-button type="danger" size="small" @click="deleteInventory(scope.row.id,scope.row.checker_status,scope.$index)">删除</el-button>
                 </template>
             </el-table-column>
         </el-table>
         <el-pagination
             @size-change="handleSizeChange"
             @current-change="handleCurrentChange"
-            :page-sizes="[5, 10, 50, 100]"
-            :page-size="5"
+            :page-sizes="[10, 20, 40, 100]"
+            :page-size="10"
             background
             style="margin-top:20px;text-align: right"
             layout="total, sizes, prev, pager, next, jumper"
@@ -158,57 +164,57 @@
                 </el-form-item>
             </el-form>
             <el-table :data="tableData" border :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }">
-                <el-table-column prop="date" label="耗材ID" width="100">
+                <el-table-column prop="date" label="耗材ID" width="100" align="center">
                  <template slot-scope="scope">
                    {{scope.row.good_id}}
                  </template>
                 </el-table-column>
-                <el-table-column prop="date" label="耗材名称" width="100">
+                <el-table-column prop="date" label="耗材名称" width="100" align="center">
                  <template slot-scope="scope">
                    {{scope.row.good_name}}
                  </template>
                 </el-table-column>
-                <el-table-column prop="name" label="规格" width="100">
+                <el-table-column prop="name" label="规格" width="100" align="center">
                  <template slot-scope="scope">
                    {{scope.row.specification_name}}
                  </template>
                 </el-table-column>
-                <el-table-column prop="name" label="单位" width="100">
+                <el-table-column prop="name" label="单位" width="100" align="center">
                   <template slot-scope="scope">
                    {{scope.row.warehousing_unit}}
                  </template> 
                 </el-table-column>
-                <el-table-column prop="name" label="盘点数量" width="100">
+                <el-table-column prop="name" label="盘点数量" width="100" align="center">
                   <template slot-scope="scope">
-                   {{scope.row.warehousing_unit}}
+                   {{scope.row.count}}
                  </template> 
                 </el-table-column>
-                <el-table-column prop="name" label="原进货价" width="100">
+                <el-table-column prop="name" label="原进货价" width="100" align="center">
                     <template slot-scope="scope">
                     {{scope.row.buy_price}}
                     </template> 
                 </el-table-column>
-                <el-table-column prop="name" label="原零售价" width="100">
+                <el-table-column prop="name" label="原零售价" width="100" align="center">
                     <template slot-scope="scope">
                     {{scope.row.packing_price}}
                     </template> 
                 </el-table-column>
-                <el-table-column prop="name" label="生产厂商" width="100">
+                <el-table-column prop="name" label="生产厂商" width="100" align="center">
                     <template slot-scope="scope">
                         {{scope.row.manufacturer}}
                      </template> 
                </el-table-column>
-                <el-table-column  prop="name"  label="产地" width="100">
+                <el-table-column  prop="name"  label="产地" width="100" align="center">
                     <template slot-scope="scope">
                     {{scope.row.good_origin_place}}
                     </template> 
                 </el-table-column>
-                <el-table-column prop="name" label="批准文号" width="100">
+                <el-table-column prop="name" label="批准文号" width="100" align="center">
                    <template slot-scope="scope">
                     {{scope.row.license_number}}
                     </template> 
                 </el-table-column>
-                <el-table-column  prop="name" label="备注" width="100">
+                <el-table-column  prop="name" label="备注" width="100" align="center">
                      <template slot-scope="scope">
                       {{scope.row.remark}}
                     </template> 
@@ -218,8 +224,8 @@
                 width="100"
                 label="操作">
                     <template slot-scope="scope">
-                        <el-button type="text" size="small">编辑</el-button>
-                        <el-button type="text" size="small">删除</el-button>
+                        <el-button type="text" size="small" @click="toEdit(scope.row)">编辑</el-button>
+                        <el-button type="text" size="small" @click="toDelete(scope.$index)">删除</el-button>
                     </template>
                 </el-table-column>
             </el-table>
@@ -228,12 +234,134 @@
                 <el-button type="primary" @click="saveInventory">确 定</el-button>
             </span>
         </el-dialog>
+
+      <el-dialog
+        title="耗材盘点核对"
+        :visible.sync="checkDialogVisible"
+        width="30%"
+        >
+        <span>
+          <el-form :model="form">
+            <el-row>
+              <el-col>
+                <el-form-item label="核对时间">
+                 <el-date-picker
+                    size="small"
+                    v-model="check_time"
+                    type="date"
+                    style="margin-left:5px;width:140px;"
+                    placeholder="选择日期">
+                  </el-date-picker>
+                </el-form-item>  
+              </el-col>
+            </el-row>  
+             <el-row>
+              <el-col>
+                <el-form-item label="核对人">
+                  <el-select v-model="checker" placeholder="请选择">
+                    <el-option
+                    v-for="item in doctorList"
+                    :key="item.admin_user_id"
+                    :label="item.user_name"
+                    :value="item.admin_user_id">
+                    </el-option>
+                 </el-select>
+                </el-form-item>  
+              </el-col>
+            </el-row>  
+          </el-form>  
+        </span>
+        <span slot="footer" class="dialog-footer">
+            <el-button @click="checkDialogVisible = false">取 消</el-button>
+            <el-button type="primary" @click="SaveCheckedInventory">保 存</el-button>
+        </span>
+    </el-dialog>
+
+
+     <el-dialog
+        title="编辑"
+        :visible.sync="editPriceDialogVisible"
+        width="50%">
+        <span>
+          <el-form  :model="form">
+            <el-row>
+               <el-col>
+                <el-form-item label="耗材名称:">
+                    <el-autocomplete
+                        class="checkSearch"
+                        popper-class="my-autocomplete"
+                        v-model="form.good_name"
+                        :fetch-suggestions="querySearchAsync"
+                        :trigger-on-focus="true"
+                        placeholder="请输入耗材名称"
+                        @select="handleSelect"
+                        @input="changeGoodName(scope.$index)"
+                        style="width:160px;"
+                    >
+                        <i class="el-icon-search el-input__icon" slot="suffix"></i>
+                    <template slot-scope="{ item }">
+                        <div class="name">{{ item.good_name +"  " +item.specification_name + "  "+item.manufacturer }}</div>
+                    </template>
+                    </el-autocomplete>
+                </el-form-item>
+               <el-form-item label="盘点数量：">
+                 <el-input v-model="form.count" style="width:200px"></el-input>
+               </el-form-item>
+             </el-col> 
+            </el-row>
+            <el-row>
+             <el-col>
+                <el-form-item label="备注：">
+                    <div style="display:flex;">
+                        <el-input v-model="form.remark"  style="width:200px"></el-input>
+                    </div>
+                </el-form-item>
+              </el-col>  
+            </el-row>
+          </el-form>
+        </span>
+        <span slot="footer" class="dialog-footer">
+            <el-button @click="editPriceDialogVisible = false">取 消</el-button>
+            <el-button type="primary" @click="upateInventory">保存</el-button>
+        </span>
+    </el-dialog>
+
+
+       <el-dialog
+        title="编辑"
+        :visible.sync="modefiyePriceDialogVisible"
+        width="50%">
+        <span>
+          <el-form  :model="form">
+            <el-row>
+               <el-col>
+               <el-form-item label="盘点数量：">
+                 <el-input v-model="form.count" style="width:200px"></el-input>
+               </el-form-item>
+             </el-col> 
+            </el-row>
+            <el-row>
+             <el-col>
+                <el-form-item label="备注：">
+                    <div style="display:flex;">
+                        <el-input v-model="form.remark"  style="width:200px"></el-input>
+                    </div>
+                </el-form-item>
+              </el-col>  
+            </el-row>
+          </el-form>
+        </span>
+        <span slot="footer" class="dialog-footer">
+            <el-button @click="modefiyePriceDialogVisible = false">取 消</el-button>
+            <el-button type="primary" @click="modifyInventory">保存</el-button>
+        </span>
+    </el-dialog>
     </div>
 </template>
 
 <script> 
 import { uParseTime } from '@/utils/tools'
-import { postSearchGoodWarehouseList,saveInventory,getInventoryList } from "@/api/stock"
+import { postSearchGoodWarehouseList,saveInventory,getInventoryList,SaveCheckedInventory,getInventoryDetail,modifyInventory,deleteInventory } from "@/api/stock"
 export default {
     name: "inventory",
     data() {
@@ -243,9 +371,6 @@ export default {
             value2:'',
             tableData: [],
             dialogVisible:false,
-            form: {
-                name: '',
-            },
             total: 0,
             inventoryList:[
               {id:0,name:"全部"},
@@ -285,6 +410,13 @@ export default {
          doctorList:[],
          total:0,
          tableList:[],
+         ids:"",
+         checker:this.$store.getters.xt_user.user.id,
+         check_time:new Date(),
+         checkDialogVisible:false,
+         editPriceDialogVisible:false,
+         modefiyePriceDialogVisible:false,
+         id:0,
         }
     },
     methods:{
@@ -349,7 +481,12 @@ export default {
 
         },
         print(){
-            this.$router.push({path:'/stock/stockModifyPricePrint'})   
+          if(this.ids == ""){
+            this.$message.error("请勾选打印数据")
+            return
+          }else{
+           this.$router.push({path:'/stock/inventoryPrint?ids='+this.ids})   
+          } 
         },
        getTime(val) {
          if(val < 0){
@@ -389,6 +526,15 @@ export default {
            this.tableData.push(obj)
         },
       saveInventory(){
+        for(let i=0;i<this.tableData.length;i++){
+          this.tableData[i].count = parseInt(this.tableData[i].count)
+          if(this.tableData[i].manufacturer == 0){
+            this.tableData[i].manufacturer = ""
+          }
+          if(this.tableData[i].dealer == 0){
+            this.tableData[i].dealer = ""
+          }
+        }
         var params = {
          tableData:this.tableData,
         }  
@@ -429,6 +575,153 @@ export default {
        }
        return name
      },
+    toCheck(){
+      if(this.ids.length <=0){
+         this.$message.error("请勾选核对数据")
+         return
+       }else{
+         this.checkDialogVisible = true
+       }
+     },
+    changePrice(val){  
+       var arr = []
+      
+       for(let i=0;i<val.length;i++){
+         arr.push(val[i].id)
+       }
+      var str = arr.join(",")
+    
+      console.log("str",str)
+      this.ids = str
+     
+     },
+     SaveCheckedInventory(){
+         var params = {
+            ids:this.ids,
+            check_time:this.getTime(this.check_time),
+            checker:this.checker,
+         }
+       console.log("params",params)
+       SaveCheckedInventory(params).then(response=>{
+         if(response.data.state == 1){
+           this.$message.success("保存成功")
+           var inventory = response.data.data.inventory
+           this.checkDialogVisible = false
+           this.getlist()
+         }
+       })
+     },
+      toDelete(index){
+       this.tableData.splice(index,1)
+     },
+     toEdit(row){
+      this.form.good_name = row.good_name
+      this.form.count = row.count
+      this.form.remark = row.remark
+      this.form.id = row.id
+      this.editPriceDialogVisible = true  
+     },
+     upateInventory(){
+       for(let i=0;i<this.tableData.length;i++){
+         if(this.form.id == this.tableData[i].id){
+            this.tableData[i].good_name = this.form.good_name
+            // this.tableData[i].packing_price = this.form.packing_price
+            this.tableData[i].count = this.form.count
+            this.tableData[i].remark = this.form.remark
+         }
+       }
+       this.editPriceDialogVisible = false
+       this.form.good_name = ""
+      //  this.form.packing_price = ""
+       this.form.count = ""
+       this.form.remark = ""
+     },
+     getInventoryDetail(id,check_status){
+        if(check_status == 1){
+          this.$message.error("已核对的不能编辑")
+          return
+        }
+       getInventoryDetail(id).then(response=>{
+          if(response.data.state == 1){
+            var detail =  response.data.data.detail
+            console.log("detial",detail)
+            this.form.count = detail.count
+            this.form.remark = detail.remark
+            this.id = detail.id
+            this.modefiyePriceDialogVisible = true
+
+          }
+       })
+     },
+     modifyInventory(){
+         var params = {
+           id:this.id,
+           count:parseInt(this.form.count),
+           remark:this.form.remark,
+         }
+       modifyInventory(params).then(response=>{
+          if(response.data.state == 1){
+            var inventory =  response.data.data.inventory
+            this.$message.success("保存成功")
+            this.modefiyePriceDialogVisible = false
+            this.getlist()
+          }
+       })
+     },
+     deleteInventory(id,check_status,index){
+        if(check_status == 1){
+          this.$message.error("已核对的不能编辑")
+          return
+        }
+        this.$confirm('是否删除所选内容?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          let params = {
+            id:id,
+          }
+       deleteInventory(params).then(response => {
+            if (response.data.state == 1) {
+              var msg = response.data.data.msg
+              this.$message.success("保存成功")
+              this.tableList.splice(index,1)
+            } 
+          })
+        }).catch(() => {
+          this.loading = false
+        });
+     },
+      exportList(){
+       
+         import('@/vendor/Export2Excel').then(excel => {
+         const tHeader = ['盘点编码', '盘点日期', '盘点数量','盘点人','审核日期','核对人','状态']
+         const filterVal = ['warehousing_order', 'start_time', 'count','user_name','check_time','checker','checker_status']
+       
+          for(let i=0;i<this.tableList.length;i++){
+           this.tableList[i].start_time = this.getTime(this.tableList[i].start_time)
+           this.tableList[i].check_time =  this.getTime(this.tableList[i].check_time)
+           this.tableList[i].checker = this.getChecker(this.tableList[i].checker)
+           if(this.tableList[i].checker_status == 1){
+             this.tableList[i].checker_status = "已核对"
+           }
+          if(this.tableList[i].checker_status == 2){
+             this.tableList[i].checker_status = "未核对"
+           }
+         }
+         const data = this.formatJson(filterVal, this.tableList)
+      
+         excel.export_json_to_excel({
+           header: tHeader,
+           data,
+           filename: '耗材盘点'
+         })
+          this.downloadLoading = false
+        })
+       },
+       formatJson(filterVal, jsonData) {
+        return jsonData.map(v => filterVal.map(j => v[j]));
+      },
     },
     created(){
       this.getlist()

src/xt_pages/stock/inventoryDetailPrint.vue

@@ -0,0 +1,125 @@
+<template>
+    <div class="main-contain">
+        <div class="position">
+        <bread-crumb :crumbs="crumbs"></bread-crumb>
+        <el-row style="float:right;">
+            <el-col :span="24">
+            <el-button size="small" icon="el-icon-printer" type="primary" @click="printAction">打印</el-button>
+            </el-col>
+        </el-row>
+        </div>
+        <div class="app-container" style="background-color: white;">
+            <div id="print_content">
+                <div class="printTitle">库存盘点核单数</div>
+                <div style="float:right;">调价日期：{{getTime(this.tableData[0].start_time)}}</div>
+                <table class="printTable" border="1">
+                    <tr>
+                        <td>序号</td>
+                        <td>耗材名称</td>
+                        <td>规格</td>
+                        <td>单位</td>
+                        <td>零售价</td>
+                        <td>当前库存</td>
+                        <td>盘点数</td>
+                        <td>亏损金额</td>
+                    </tr>
+                    <tr v-for="(item,index) in tableData" :key="index">
+                        <td>{{index+1}}</td>
+                        <td>{{item.good_name}}</td>
+                        <td>{{item.specification_name}}</td>
+                        <td>{{item.warehousing_unit}}</td>
+                        <td>{{item.packing_price}}</td>
+                        <td></td>
+                        <td>{{item.count}}</td>
+                        <td></td>
+                    </tr>
+                </table>
+                <div style="margin-top:10px;">
+                    <span>合计：库存金额</span>
+                    <span>    库存盘点金额：亏损总计</span>
+                </div>
+                <div style="display:flex;float:right;margin-top:10px;border-top:1px solid #000;padding-top:10px;width:100%;">
+                    <div style="width:80px;">审批：</div><div style="width:100px;"></div>
+                    <div style="width:100px;">药材主任：</div><div style="width:60px;"></div>
+                    <div style="width:50px;">会计：</div><div style="width:100px;"></div>
+                    <div style="width:50px;">审核：</div><div style="width:100px;"></div>
+                    <div style="width:70px;">制单人：</div><div style="width:100px;"></div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+import BreadCrumb from '@/xt_pages/components/bread-crumb'
+const moment = require('moment');
+import { uParseTime } from '@/utils/tools'
+import { getInventoryDetailPrintList } from "@/api/stock"
+export default {
+    components:{
+        BreadCrumb
+    },
+    data(){
+        return{
+          crumbs: [
+            { path: false, name: '库存管理' },
+            { path: false, name: '耗材管理' },
+            { path: false, name: '耗材盘点打印' },
+          ],
+          ids:"",
+          tableData:[],
+        }
+    },
+    methods:{
+        printAction: function() {
+            const style = '@media print { .printTitle{font-size: 22px;text-align: center;}.flex{display: flex;justify-content: space-between;}.tableTitle{display: flex;border-top:1px solid #000;border-bottom: 1px solid #000;padding: 10px 0;}.tableTr{display: flex;border-bottom: 1px dashed #000;padding: 10px 0;}.tableBottom{display: flex;border-bottom: 1px solid #000;padding: 10px 0;}.printTable td{padding:5px;} }';
+            printJS({
+            printable: 'print_content',
+            type: 'html',
+            documentTitle: '  ',
+            style: style,
+            scanStyles: false
+            })
+        },
+        
+        getInventoryDetailPrintList(){
+            var params = {
+                ids:this.ids,
+            }
+         getInventoryDetailPrintList(params).then(response=>{
+           if(response.data.state == 1){
+             var list = response.data.data.list
+             console.log("list",list)
+             this.tableData = list
+           }
+         })
+        },
+        getTime(val) {
+         if(val < 0){
+            return ""
+          }
+         if(val == ""){
+            return ""
+          }else {
+            return uParseTime(val, '{y}-{m}-{d}')
+         }
+        },
+
+    },
+    created(){
+      this.ids = this.$route.query.ids
+      this.getInventoryDetailPrintList()
+    }
+}
+</script>
+
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.printTitle{font-size: 22px;text-align: center;}
+.flex{display: flex;justify-content: space-between;}
+.tableTitle{display: flex;border-top:1px solid #000;border-bottom: 1px solid #000;padding: 10px 0;}
+.tableTr{display: flex;border-bottom: 1px dashed #000;padding: 10px 0;}
+.tableBottom{display: flex;border-bottom: 1px solid #000;padding: 10px 0;}
+.printTable{width:100%;border-collapse: collapse;}
+.printTable td{padding:5px;}
+</style>

src/xt_pages/stock/inventoryDetails.vue

@@ -2,7 +2,7 @@
     <div>
         <div style="display: flex;align-items: center;justify-content: space-between;margin-bottom:10px;">
             <div>
-                耗材类别：
+                <!-- 耗材类别：
                 <el-select v-model="value" size="small" placeholder="请选择">
                     <el-option
                     v-for="item in options"
@@ -10,8 +10,8 @@
                     :label="item.label"
                     :value="item.value">
                     </el-option>
-                </el-select>
-                停用状态：
+                </el-select> -->
+                <!-- 停用状态：
                 <el-select v-model="value" size="small" placeholder="请选择">
                     <el-option
                     v-for="item in options"
@@ -19,7 +19,7 @@
                     :label="item.label"
                     :value="item.value">
                     </el-option>
-                </el-select>
+                </el-select> -->
                 <el-input
                 size="small"
                 style="width: 200px;margin-left:10px;"
@@ -38,227 +38,84 @@
             </div>
             <div>
                 <el-button size="small" type="primary" @click="print">打印</el-button>
-                <el-button size="small" type="primary">导出</el-button>
+                <el-button size="small" type="primary" @click="exportList">导出</el-button>
             </div>
         </div>
-        <el-table :data="tableData" border :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }">
-            <el-table-column
-            prop="date"
-            label="耗材名称"
-            width="100">
-            </el-table-column>
-            <el-table-column
-            prop="date"
-            label="类别"
-            width="100">
-            </el-table-column>
-            <el-table-column
-            prop="name"
-            label="规格"
-            width="100">
-            </el-table-column>
-            <el-table-column
-            prop="name"
-            label="单位"
-            width="100">
+        <el-table :data="tableData" border :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }" @selection-change="changePrice">
+            <el-table-column type="selection" width="55" align="center"> </el-table-column>
+            <el-table-column prop="date" label="耗材名称"  width="100" align="center">
+                <template slot-scope="scope">
+                  {{scope.row.good_name}}
+                </template>
             </el-table-column>
-            <el-table-column
-            prop="name"
-            label="库存数量"
-            width="100">
+            <!-- <el-table-column prop="date" label="类别" width="100">
+            </el-table-column> -->
+            <el-table-column prop="name" label="规格" width="100" align="center">
+               <template slot-scope="scope">
+                  {{scope.row.specification_name}}
+                </template>
             </el-table-column>
-            <el-table-column
-            prop="name"
-            label="进价"
-            width="100">
+            <el-table-column prop="name" label="单位" width="100" align="center">
+                <template slot-scope="scope">
+                  {{scope.row.warehousing_unit}}
+                </template>
             </el-table-column>
-            <el-table-column
-            prop="name"
-            label="零售价"
-            width="100">
+            <el-table-column prop="name" label="库存数量" width="100" align="center">
+              <template slot-scope="scope">
+                  {{scope.row.total}}
+                </template>
             </el-table-column>
-            <el-table-column
-            prop="name"
-            label="零售总价"
-            width="100">
+            <el-table-column prop="name" label="进价" width="100" align="center">
+              <template slot-scope="scope">
+                {{scope.row.buy_price}}
+             </template>
             </el-table-column>
-            <el-table-column
-            prop="name"
-            label="产地"
-            width="100">
+            <el-table-column prop="name" label="零售价" width="100" align="center">
+                <template slot-scope="scope">
+                 {{scope.row.packing_price}}
+                </template>
             </el-table-column>
-            <el-table-column
-            prop="name"
-            label="生产厂商"
-            width="100">
+            <el-table-column prop="name"  label="零售总价"  width="100" align="center">
+                <template slot-scope="scope">
+                  {{scope.row.total * scope.row.packing_price}}
+                </template>
             </el-table-column>
-            <el-table-column
-            prop="name"
-            label="实盘点"
-            width="100">
+            <!-- <el-table-column prop="name" label="产地"  width="100">
+              {{scope.row.now_g}}
+            </el-table-column> -->
+            <el-table-column  prop="name" label="生产厂商" width="100" align="center">
+              <template slot-scope="scope">
+                {{scope.row.manufacturer}}
+             </template>
             </el-table-column>
-            <el-table-column
-            prop="name"
-            label="亏损价格"
-            width="100">
+            <el-table-column prop="name" label="实盘点"  width="100" align="center">
+                <template slot-scope="scope">
+                    {{scope.row.count}}
+                </template>
             </el-table-column>
-            <el-table-column
-            prop="name"
-            label="生产日期"
-            width="100">
+            <el-table-column  prop="name" label="亏损价格" width="100" align="center">
             </el-table-column>
-            <el-table-column
-            prop="name"
-            label="有效日期"
-            width="100">
+            <el-table-column prop="name" label="生产日期" width="100" align="center">
             </el-table-column>
-            <el-table-column
-            fixed="right"
-            width="100"
-            label="操作">
-                <template slot-scope="scope">
-                    <el-button type="text" size="small">删除</el-button>
-                    <el-button type="text" size="small">编辑</el-button>
-                </template>
+            <el-table-column  prop="name" label="有效日期" width="100" align="center">
             </el-table-column>
         </el-table>
         <el-pagination
             @size-change="handleSizeChange"
             @current-change="handleCurrentChange"
-            :page-sizes="[5, 10, 50, 100]"
-            :page-size="5"
+            :page-sizes="[10, 20, 40, 100]"
+            :page-size="10"
             background
             style="margin-top:20px;text-align: right"
             layout="total, sizes, prev, pager, next, jumper"
             :total="total"
         >
         </el-pagination>
-        <el-dialog
-        title="库房调价"
-        :visible.sync="dialogVisible"
-        width="1200px"
-        :before-close="handleClose">
-            <el-form :model="form" class="modifyDialog" label-width="120px">
-                <el-form-item label="耗材ID">
-                    <el-input v-model="form.name"></el-input>
-                </el-form-item>
-                <el-form-item label="药品名称">
-                    <el-input v-model="form.name"></el-input>
-                </el-form-item>
-                <el-form-item label="规格">
-                    <el-input v-model="form.name"></el-input>
-                </el-form-item>
-                <el-form-item label="单位">
-                    <el-input v-model="form.name"></el-input>
-                </el-form-item>
-                <el-form-item label="进货价">
-                    <el-input v-model="form.name"></el-input>
-                </el-form-item>
-                <el-form-item label="零售价">
-                    <el-input v-model="form.name"></el-input>
-                </el-form-item>
-                <el-form-item label="报损数量">
-                    <el-input v-model="form.name"></el-input>
-                </el-form-item>
-                <el-form-item label="库存">
-                    <el-input v-model="form.name"></el-input>
-                </el-form-item>
-                <el-form-item label="产地">
-                    <el-input v-model="form.name"></el-input>
-                </el-form-item>
-                <el-form-item label="批准文号">
-                    <el-input v-model="form.name"></el-input>
-                </el-form-item>
-                <el-form-item label="生产厂商">
-                    <el-input v-model="form.name"></el-input>
-                </el-form-item>
-                <el-form-item label="备注">
-                    <div style="display:flex;">
-                        <el-input v-model="form.name"></el-input>
-                        <el-button style="margin-left:5px;" type="primary">添加</el-button>
-                    </div>
-                </el-form-item>
-            </el-form>
-            <el-table :data="tableData" border :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }">
-                <el-table-column
-                prop="date"
-                label="耗材ID"
-                width="100">
-                </el-table-column>
-                <el-table-column
-                prop="date"
-                label="耗材名称"
-                width="100">
-                </el-table-column>
-                <el-table-column
-                prop="name"
-                label="规格"
-                width="100">
-                </el-table-column>
-                <el-table-column
-                prop="name"
-                label="单位"
-                width="100">
-                </el-table-column>
-                <el-table-column
-                prop="name"
-                label="调价数量"
-                width="100">
-                </el-table-column>
-                <el-table-column
-                prop="name"
-                label="原进货价"
-                width="100">
-                </el-table-column>
-                <el-table-column
-                prop="name"
-                label="原零售价"
-                width="100">
-                </el-table-column>
-                <el-table-column
-                prop="name"
-                label="新零售价"
-                width="100">
-                </el-table-column>
-                <el-table-column
-                prop="name"
-                label="生产厂商"
-                width="100">
-                </el-table-column>
-                <el-table-column
-                prop="name"
-                label="产地"
-                width="100">
-                </el-table-column>
-                <el-table-column
-                prop="name"
-                label="批准文号"
-                width="100">
-                </el-table-column>
-                <el-table-column
-                prop="name"
-                label="备注"
-                width="100">
-                </el-table-column>
-                <el-table-column
-                fixed="right"
-                width="100"
-                label="操作">
-                    <template slot-scope="scope">
-                        <el-button type="text" size="small">删除</el-button>
-                        <el-button type="text" size="small">编辑</el-button>
-                    </template>
-                </el-table-column>
-            </el-table>
-            <span slot="footer" class="dialog-footer">
-                <el-button @click="dialogVisible = false">取 消</el-button>
-                <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
-            </span>
-        </el-dialog>
     </div>
 </template>
 
 <script>
+import { getInventoryDetailList } from "@/api/stock"
 export default {
     name: "inventory",
     data() {
@@ -266,44 +123,76 @@ export default {
             searchKey:'',
             value1:'',
             value2:'',
-            tableData: [{
-                date: '2016-05-02',
-                name: '王小虎',
-                address: '上海市普陀区金沙江路 1518 弄'
-                }, {
-                date: '2016-05-04',
-                name: '王小虎',
-                address: '上海市普陀区金沙江路 1517 弄'
-                }, {
-                date: '2016-05-01',
-                name: '王小虎',
-                address: '上海市普陀区金沙江路 1519 弄'
-                }, {
-                date: '2016-05-03',
-                name: '王小虎',
-                address: '上海市普陀区金沙江路 1516 弄'
-            }],
+            tableData: [],
             dialogVisible:false,
             form: {
                 name: '',
             },
             total: 0,
-            
-        }
+            limit:10,
+            page:1,
+            ids:"",
+         }
     },
     methods:{
         search(){
 
         },
         print(){
-            this.$router.push({path:'/stock/inventoryPrint'})
-            
+           if(this.ids == ""){
+             this.$message.error("请勾选打印数据")
+             return false
+           }
+          this.$router.push({path:'/stock/inventoryDetailPrint?ids='+this.ids})
         },
         handleSizeChange(){},
-        handleCurrentChange(){}
-
+        handleCurrentChange(){},
+        getlist(){
+         var params = {
+            keyword:this.searchKey,
+            limit:this.limit,
+            page:this.page,
+          }
+          getInventoryDetailList(params).then(response=>{
+             if(response.data.state == 1){
+               var list =  response.data.data.list
+               this.tableData = list
+               this.total = response.data.data.total
+             }
+          })
+        },
+      changePrice(val){  
+        console.log("val2323323322323",val)
+        var arr = []
+        for(let i=0;i<val.length;i++){
+            arr.push(val[i].id)
+        }
+        var str = arr.join(",")
+        
+        console.log("str",str)
+        this.ids = str  
+     },
+      exportList(){
+       
+         import('@/vendor/Export2Excel').then(excel => {
+         const tHeader = ['耗材名称', '规格', '单位','零售价','当前库存','盘点数','亏损金额']
+         const filterVal = ['good_name', 'specification_name', 'warehousing_unit','packing_price','total','count','']
+         const data = this.formatJson(filterVal, this.tableData)
+      
+         excel.export_json_to_excel({
+           header: tHeader,
+           data,
+           filename: '耗材盘点明细'
+         })
+          this.downloadLoading = false
+        })
+       },
+       formatJson(filterVal, jsonData) {
+        return jsonData.map(v => filterVal.map(j => v[j]));
+      },
     },
     created(){
+      this.getlist()
     },
     mounted() {
     },

src/xt_pages/stock/inventoryPrint.vue

@@ -11,7 +11,7 @@
         <div class="app-container" style="background-color: white;">
             <div id="print_content">
                 <div class="printTitle">库存盘点核单数</div>
-                <div style="float:right;">调价日期：</div>
+                <div style="float:right;">调价日期：{{getTime(this.tableData[0].start_time)}}</div>
                 <table class="printTable" border="1">
                     <tr>
                         <td>序号</td>
@@ -23,14 +23,14 @@
                         <td>盘点数</td>
                         <td>亏损金额</td>
                     </tr>
-                    <tr v-for="item in 3">
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
+                    <tr v-for="(item,index) in tableData" :key="index">
+                        <td>{{index+1}}</td>
+                        <td>{{item.good_name}}</td>
+                        <td>{{item.specification_name}}</td>
+                        <td>{{item.warehousing_unit}}</td>
+                        <td>{{item.packing_price}}</td>
                         <td></td>
+                        <td>{{item.count}}</td>
                         <td></td>
                     </tr>
                 </table>
@@ -54,6 +54,7 @@
 import BreadCrumb from '@/xt_pages/components/bread-crumb'
 const moment = require('moment');
 import { uParseTime } from '@/utils/tools'
+import { getInventoryPrintList } from "@/api/stock"
 export default {
     components:{
         BreadCrumb
@@ -65,6 +66,8 @@ export default {
             { path: false, name: '耗材管理' },
             { path: false, name: '耗材盘点打印' },
           ],
+          ids:"",
+          tableData:[],
         }
     },
     methods:{
@@ -78,10 +81,33 @@ export default {
             scanStyles: false
             })
         },
-
+        
+        getInventoryPrintList(){
+            var params = {
+                ids:this.ids,
+            }
+         getInventoryPrintList(params).then(response=>{
+           if(response.data.state == 1){
+             var list = response.data.data.list
+             this.tableData = list
+           }
+         })
+        },
+        getTime(val) {
+         if(val < 0){
+            return ""
+          }
+         if(val == ""){
+            return ""
+          }else {
+            return uParseTime(val, '{y}-{m}-{d}')
+         }
+        },
 
     },
     created(){
+      this.ids  = this.$route.query.ids
+      this.getInventoryPrintList()
     }
 }
 </script>

src/xt_pages/stock/stockDamagePrint.vue

@@ -0,0 +1,143 @@
+<template>
+    <div class="main-contain">
+        <div class="position">
+        <bread-crumb :crumbs="crumbs"></bread-crumb>
+        <el-row style="float:right;">
+            <el-col :span="24">
+            <el-button size="small" icon="el-icon-printer" type="primary" @click="printAction">打印</el-button>
+            </el-col>
+        </el-row>
+        </div>
+        <div class="app-container" style="background-color: white;" v-for="(item,index) in tableList">
+            <div id="print_content">
+                <div class="printTitle">耗材报损登记单</div>
+                <div class="flex">
+                    <div>药库类别：</div>
+                    <div>报损日期：{{getTime(item.start_time)}}</div>
+                </div>
+                <div class="flex">
+                    <div>单据编号：{{item.warehousing_order}}</div>
+                    <div>打印日期：{{nowtime}}</div>
+                </div>
+                <div class="tableTitle">
+                    <div style="width:8%">货号</div>
+                    <div style="width:8%">耗材名称</div>
+                    <div style="width:8%">规格</div>
+                    <div style="width:8%">单位</div>
+                    <div style="width:8%">批次</div>
+                    <div style="width:8%">报损数量</div>
+                    <div style="width:8%">进货价</div>
+                    <div style="width:8%">进货金额</div>
+                    <div style="width:8%">零售价</div>
+                    <div style="width:8%">零售金额</div>
+                </div>
+                <div class="tableTr">
+                    <div style="width:8%"></div>
+                    <div style="width:8%">{{item.good_name}}</div>
+                    <div style="width:8%">{{item.specification_name}}</div>
+                    <div style="width:8%">{{item.warehousing_unit}}</div>
+                    <div style="width:8%">{{item.license_number}}</div>
+                    <div style="width:8%">{{item.count}}</div>
+                    <div style="width:8%">{{item.buy_price}}</div>
+                    <div style="width:8%">{{item.buy_price}}</div>
+                    <div style="width:8%">{{item.packing_price}}</div>
+                    <div style="width:8%">{{item.packing_price}}</div>
+                </div>
+                <div class="tableBottom">
+                    <div style="width:8%">合计：</div>
+                    <div style="width:8%"></div>
+                    <div style="width:8%"></div>
+                    <div style="width:8%"></div>
+                    <div style="width:8%"></div>
+                    <div style="width:8%"></div>
+                    <div style="width:8%"></div>
+                    <div style="width:8%"></div>
+                    <div style="width:8%">{{item.buy_price}}</div>
+                    <div style="width:8%"></div>
+                    <div style="width:8%"></div>
+                    <div style="width:8%">{{item.buy_price *item.count}}</div>
+                </div>
+                <div style="display:flex;margin-top:1px;float:right;margin-top:10px;">
+                    <div style="width:80px;">审批：</div><div style="width:100px;"></div>
+                    <div style="width:100px;">药材主任：</div><div style="width:60px;"></div>
+                    <div style="width:50px;">会计：</div><div style="width:100px;"></div>
+                    <div style="width:50px;">审核：</div><div style="width:100px;"></div>
+                    <div style="width:70px;">制单人：</div><div style="width:100px;"></div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+import BreadCrumb from '@/xt_pages/components/bread-crumb'
+const moment = require('moment');
+import { uParseTime } from '@/utils/tools'
+import { getStockDamageById} from "@/api/stock"
+
+export default {
+    components:{
+        BreadCrumb
+    },
+    data(){
+        return{
+          crumbs: [
+            { path: false, name: '库存管理' },
+            { path: false, name: '耗材管理' },
+            { path: false, name: '耗材调价打印' },
+          ],
+          tableList:[],
+          nowtime: moment(new Date()).format('YYYY-MM-DD'),
+        }
+    },
+    methods:{
+        printAction: function() {
+            const style = '@media print { .printTitle{font-size: 22px;text-align: center;}.flex{display: flex;justify-content: space-between;}.tableTitle{display: flex;border-top:1px solid #000;border-bottom: 1px solid #000;padding: 10px 0;}.tableTr{display: flex;border-bottom: 1px dashed #000;padding: 10px 0;}.tableBottom{display: flex;border-bottom: 1px solid #000;padding: 10px 0;} }';
+            printJS({
+            printable: 'print_content',
+            type: 'html',
+            documentTitle: '  ',
+            style: style,
+            scanStyles: false
+            })
+        },
+       getStockDamageById(ids){
+           var params = {
+            ids:ids,
+           }
+         getStockDamageById(params).then(response=>{
+           if(response.data.state == 1){
+             var list = response.data.data.list
+             console.log("打印列表",list)
+             this.tableList = list
+           }
+         })
+       },
+       getTime(val) {
+         if(val < 0){
+           return ""
+         }
+         if(val == ""){
+          return ""
+         }else {
+          return uParseTime(val, '{y}-{m}-{d}')
+         }
+      },
+
+    },
+    created(){
+      var ids = this.$route.query.ids
+      console.log("ids",ids)
+      this.getStockDamageById(ids)
+    }
+}
+</script>
+
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.printTitle{font-size: 22px;text-align: center;}
+.flex{display: flex;justify-content: space-between;}
+.tableTitle{display: flex;border-top:1px solid #000;border-bottom: 1px solid #000;padding: 10px 0;}
+.tableTr{display: flex;border-bottom: 1px dashed #000;padding: 10px 0;}
+.tableBottom{display: flex;border-bottom: 1px solid #000;padding: 10px 0;}
+</style>

src/xt_pages/stock/stockDamaged.vue

@@ -19,8 +19,7 @@
                 type="primary"
                 icon="el-icon-search"
                 @click="search"
-                >搜索</el-button
-                >
+                placeholder="请输入单据编号或操作人姓名">搜索</el-button>
                 <el-date-picker
                 size="small"
                 v-model="start_time"
@@ -40,54 +39,59 @@
                 <el-button size="small" type="primary" @click="dialogVisible = true">新增</el-button>
                 <el-button size="small" type="primary" @click="toCheck">核对</el-button>
                 <el-button size="small" type="primary" @click="print">打印</el-button>
-                <el-button size="small" type="primary">导出</el-button>
+                <el-button size="small" type="primary" @click="exportList">导出</el-button>
             </div>
         </div>
-        <el-table :data="tableData" border :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }" @selection-change="changePrice">
+        <el-table :data="tableList" border :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }" @selection-change="changePrice">
             <el-table-column type="selection" width="55" align="center"> </el-table-column>
-            <el-table-column prop="date" label="报损编码">
+            <el-table-column prop="date" label="报损编码" align="center">
                <template  slot-scope="scope">
                 {{scope.row.warehousing_order}}
                </template>    
             </el-table-column>
-            <el-table-column prop="date" label="报损日期">
+            <el-table-column prop="date" label="报损日期"  align="center">
               <template  slot-scope="scope">
                 {{getTime(scope.row.start_time)}}
                </template>    
             </el-table-column>
-            <el-table-column prop="name" label="操作人">
+             <el-table-column prop="date" label="报损数量"  align="center">
+              <template  slot-scope="scope">
+                {{scope.row.count}}
+               </template>    
+            </el-table-column>
+            <el-table-column prop="name" label="操作人"  align="center">
               <template  slot-scope="scope">
                 {{scope.row.user_name}}
                </template>     
             </el-table-column>
-            <el-table-column prop="name" label="审核日期">
+            <el-table-column prop="name" label="审核日期"  align="center">
               <template  slot-scope="scope">
                 {{getTime(scope.row.checker_time)}}
              </template>
             </el-table-column>
-            <el-table-column prop="name" label="核对人">
+            <el-table-column prop="name" label="核对人"  align="center">
               <template slot-scope="scope">
                 {{getChecker(scope.row.checker)}}
               </template>
             </el-table-column>
-            <el-table-column prop="name" label="状态">
+            <el-table-column prop="name" label="状态"  align="center">
              <template slot-scope="scope">
                 <span v-if="scope.row.checker_status == 1">已核对</span>
                 <span v-if="scope.row.checker_status == 2">未核对</span>
               </template>
             </el-table-column>
-            <el-table-column label="操作">
+            <el-table-column label="操作"  align="center">
                 <template slot-scope="scope">
-                <el-button type="primary" size="small">编辑</el-button>
-                <el-button type="primary" size="small">删除</el-button>
+                <el-button type="primary" size="small" @click="editStockDamage(scope.row.id,scope.row.checker_status)">编辑</el-button>
+                <el-button type="danger" size="small" @click="deleteStockDamage(scope.row.id,scope.row.checker_status,scope.$index)">删除</el-button>
                 </template>
             </el-table-column>
         </el-table>
         <el-pagination
             @size-change="handleSizeChange"
             @current-change="handleCurrentChange"
-            :page-sizes="[5, 10, 50, 100]"
-            :page-size="5"
+            :page-sizes="[10, 20, 40, 100]"
+            :page-size="10"
             background
             style="margin-top:20px;text-align: right"
             layout="total, sizes, prev, pager, next, jumper"
@@ -135,9 +139,9 @@
             <el-form-item label="零售价">
                 <el-input v-model="form.packing_price"></el-input>
             </el-form-item>
-            <el-form-item label="新零售价">
+            <!-- <el-form-item label="新零售价">
                 <el-input v-model="form.new_price"></el-input>
-            </el-form-item>
+            </el-form-item> -->
             <el-form-item label="报损数量">
                 <el-input v-model="form.count"></el-input>
             </el-form-item>
@@ -196,11 +200,11 @@
                 {{scope.row.packing_price}}
                </template>
             </el-table-column>
-            <el-table-column prop="name" label="新零售价" width="100">
+            <!-- <el-table-column prop="name" label="新零售价" width="100">
                <template  slot-scope="scope">
                 {{scope.row.new_price}}
                </template>
-            </el-table-column>
+            </el-table-column> -->
             <el-table-column prop="name" label="生产厂商" width="100">
               <template  slot-scope="scope">
                 {{scope.row.manufacturer}}
@@ -223,8 +227,8 @@
             </el-table-column>
             <el-table-column fixed="right" width="100" label="操作">
                 <template  slot-scope="scope">
-                    <el-button type="text" size="small">删除</el-button>
-                    <el-button type="text" size="small">编辑</el-button>
+                    <el-button type="text" size="small" @click="toDelete(scope.row.$index)">删除</el-button>
+                    <el-button type="text" size="small" @click="toEdit(scope.row)">编辑</el-button>
                 </template>
             </el-table-column>
         </el-table>
@@ -274,13 +278,93 @@
             <el-button type="primary" @click="SaveCheckedDamage">保 存</el-button>
         </span>
     </el-dialog>
+
+<!-- 编辑 -->
+      <el-dialog
+        title="编辑"
+        :visible.sync="editPriceDialogVisible"
+        width="50%">
+        <span>
+          <el-form  :model="form">
+            <el-row>
+               <el-col>
+                <el-form-item label="耗材名称:">
+                    <el-autocomplete
+                        class="checkSearch"
+                        popper-class="my-autocomplete"
+                        v-model="form.good_name"
+                        :fetch-suggestions="querySearchAsync"
+                        :trigger-on-focus="true"
+                        placeholder="请输入耗材名称"
+                        @select="handleSelect"
+                        @input="changeGoodName(scope.$index)"
+                        style="width:160px;"
+                    >
+                        <i class="el-icon-search el-input__icon" slot="suffix"></i>
+                    <template slot-scope="{ item }">
+                        <div class="name">{{ item.good_name +"  " +item.specification_name + "  "+item.manufacturer }}</div>
+                    </template>
+                    </el-autocomplete>
+                </el-form-item>
+               <el-form-item label="报损数量：">
+                 <el-input v-model="form.count" style="width:200px"></el-input>
+               </el-form-item>
+             </el-col> 
+            </el-row>
+            <el-row>
+             <el-col>
+                <el-form-item label="备注：">
+                    <div style="display:flex;">
+                        <el-input v-model="form.remark"  style="width:200px"></el-input>
+                    </div>
+                </el-form-item>
+              </el-col>  
+            </el-row>
+          </el-form>
+        </span>
+        <span slot="footer" class="dialog-footer">
+            <el-button @click="editPriceDialogVisible = false">取 消</el-button>
+            <el-button type="primary" @click="upatePrice">保存</el-button>
+        </span>
+    </el-dialog>
+
+
+     <el-dialog
+        title="编辑"
+        :visible.sync="modifyPriceDialogVisible"
+        width="50%">
+        <span>
+          <el-form  :model="form">
+            <el-row>
+               <el-col>
+               <el-form-item label="报损数量：">
+                 <el-input v-model="form.count" style="width:200px"></el-input>
+               </el-form-item>
+             </el-col> 
+            </el-row>
+            <el-row>
+             <el-col>
+                <el-form-item label="备注：">
+                    <div style="display:flex;">
+                        <el-input v-model="form.remark"  style="width:200px"></el-input>
+                    </div>
+                </el-form-item>
+              </el-col>  
+            </el-row>
+          </el-form>
+        </span>
+        <span slot="footer" class="dialog-footer">
+            <el-button @click="modifyPriceDialogVisible = false">取 消</el-button>
+            <el-button type="primary" @click="modifyPrice">保存</el-button>
+        </span>
+    </el-dialog>
   </div>
 </template>
 
 <script>
 import BreadCrumb from "../components/bread-crumb";
 import { uParseTime } from '@/utils/tools'
-import { postSearchGoodWarehouseList,saveReportStock,getReportStockList,SaveCheckedDamage} from "@/api/stock"
+import { postSearchGoodWarehouseList,saveReportStock,getReportStockList,SaveCheckedDamage,getStockDamageDetail,modifyPrice,deleteStockDamage} from "@/api/stock"
 export default {
     name: "stockModifyPrice",
     components:{
@@ -318,7 +402,6 @@ export default {
                 report_count:"",
                 total:"",
             },
-            total: 0,
             currentIndex: 0,
             manufacturerList:[],
             dealerList:[],
@@ -333,6 +416,10 @@ export default {
             doctorList:[],
             checker:this.$store.getters.xt_user.user.id,
             check_time:new Date(),
+            tableList:[],
+            editPriceDialogVisible:false,
+            modifyPriceDialogVisible:false,
+            id:0,
         }
     },
     methods:{
@@ -340,8 +427,13 @@ export default {
 
         },
         print(){
-            this.$router.push({path:'/stock/stockModifyPricePrint'})
-            
+          if(this.ids == ""){
+            this.$message.error("请勾选打印数据")
+            return false
+          }else{
+            this.$router.push({path:'/stock/stockDamagePrint?ids='+this.ids})
+          }
+         
         },
         handleSizeChange(val){
           this.limit = val
@@ -373,7 +465,7 @@ export default {
                 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
-                }
+                 }
                 }
             }
 
@@ -421,7 +513,7 @@ export default {
           good_origin_place:this.form.good_origin_place,
           license_number:this.form.license_number,
           remark:this.form.remark,
-          new_price:this.form.new_price.toString(),
+          // new_price:this.form.new_price.toString(),
           warehousing_order:this.form.warehousing_order,
           dealer:this.form.dealer,
           start_time:this.getTime(new Date()),
@@ -429,6 +521,14 @@ export default {
         this.tableData.push(obj)
       },
       saveReportStock(){
+         for(let i = 0;i<this.tableData.length;i++){
+           if(this.tableData[i].manufacturer == 0){
+              this.tableData[i].manufacturer = ""   
+           }
+           if(this.tableData[i].dealer == 0){
+              this.tableData[i].dealer = ""   
+           }
+         }
           var params = {
             tableData:this.tableData,
           }
@@ -438,6 +538,19 @@ export default {
              var msg = response.data.data.msg
              this.$message.success("保存成功")
              this.dialogVisible = false
+             this.getlist()
+            this.form.good_name = ""
+            this.form.packing_price = ""
+            this.form.warehousing_order = ""
+            this.form.license_number = ""
+            this.form.dealer = ""
+            this.form.manufacturer = ""
+            this.form.specification_name = ""
+            this.form.remark =""
+            this.form.buy_price = ""
+            this.form.warehousing_unit = ""
+            this.form.total = ""
+           
            }
         })
       },
@@ -465,7 +578,7 @@ export default {
             var list = response.data.data.list
             console.log("list",list)
             this.total = response.data.data.total
-            this.tableData = list
+            this.tableList = list
            var doctorlist = response.data.data.doctorlist
            this.doctorList = doctorlist
           }
@@ -518,6 +631,117 @@ export default {
        }
        return name
      },
+     toDelete(index){
+       this.tableData.splice(index,1)
+     },
+     toEdit(row){
+      this.form.good_name = row.good_name
+      this.form.packing_unit = row.packing_unit
+      this.form.packing_price = row.packing_price
+      this.form.count = row.count
+      this.form.remark = row.remark
+      this.form.id = row.id
+      this.editPriceDialogVisible = true  
+     },
+     upatePrice(){
+       for(let i=0;i<this.tableData.length;i++){
+         if(this.form.id == this.tableData[i].id){
+            this.tableData[i].good_name = this.form.good_name
+            this.tableData[i].packing_price = this.form.packing_price
+            this.tableData[i].count = this.form.count
+            this.tableData[i].remark = this.form.remark
+         }
+       }
+       this.editPriceDialogVisible = false
+       this.form.good_name = ""
+       this.form.packing_price = ""
+       this.form.count = ""
+       this.form.remark = ""
+     },
+     editStockDamage(id,check_status){
+        if(check_status == 1){
+          this.$message.error("已核对,不能编辑")
+          return
+        }
+       getStockDamageDetail(id).then(response=>{
+         if(response.data.state == 1){
+           var detail = response.data.data.detail
+           this.form.count = detail.count
+           this.id = detail.id
+           this.modifyPriceDialogVisible = true
+         }
+       })
+     },
+     modifyPrice(){
+        var params = {
+          count:parseInt(this.form.count),
+          id:this.id,
+        }
+        console.log("param2323",params)
+       modifyPrice(params).then(response=>{
+         if(response.data.state ==1){
+           var adjust = response.data.data.adjust
+
+           this.modifyPriceDialogVisible = false
+           this.$message.success("保存成功")
+           this.getlist()
+         }
+       })
+     },
+     deleteStockDamage(id,check_status,index){
+       if(check_status == 1){
+         this.$message.error("已核对不能编辑")
+         return
+       }
+        this.$confirm('是否删除所选内容?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          let params = {
+            id:id,
+          }
+          deleteStockDamage(params).then(response => {
+            if (response.data.state == 1) {
+              var msg = response.data.data.msg
+              this.$message.success("保存成功")
+              this.tableList.splice(index,1)
+            } 
+          })
+        }).catch(() => {
+          this.loading = false
+        });
+     },
+     exportList(){
+       
+         import('@/vendor/Export2Excel').then(excel => {
+         const tHeader = ['报损编码', '报损日期', '报损数量','操作人','审核日期','核对人','状态']
+         const filterVal = ['warehousing_order', 'start_time', 'count','user_name','check_time','checker','checker_status']
+       
+          for(let i=0;i<this.tableList.length;i++){
+           this.tableList[i].start_time = this.getTime(this.tableList[i].start_time)
+           this.tableList[i].check_time =  this.getTime(this.tableList[i].check_time)
+           this.tableList[i].checker = this.getChecker(this.tableList[i].checker)
+           if(this.tableList[i].checker_status == 1){
+             this.tableList[i].checker_status = "已核对"
+           }
+          if(this.tableList[i].checker_status == 2){
+             this.tableList[i].checker_status = "未核对"
+           }
+         }
+         const data = this.formatJson(filterVal, this.tableList)
+      
+         excel.export_json_to_excel({
+           header: tHeader,
+           data,
+           filename: '耗材报损'
+         })
+          this.downloadLoading = false
+        })
+       },
+       formatJson(filterVal, jsonData) {
+        return jsonData.map(v => filterVal.map(j => v[j]));
+      },
     },
     created(){
         // var nowDate = new Date();

src/xt_pages/stock/stockModifyPrice.vue

@@ -11,7 +11,7 @@
             style="width: 200px;"
             class="filter-item"
             v-model.trim="searchKey"
-            placeholder=""
+            placeholder="请输入单据编号或操作人姓名"
             />
             <el-button
             size="small"
@@ -19,7 +19,6 @@
             type="primary"
             icon="el-icon-search"
             @click="search"
-            placeholder="请输入单据编号或操作人姓名"
             >搜索</el-button
             >
             <el-date-picker
@@ -41,7 +40,7 @@
             <el-button size="small" type="primary" @click="dialogVisible = true">新增</el-button>
             <el-button size="small" type="primary" @click="toCheck">核对</el-button>
             <el-button size="small" type="primary" @click="print">打印</el-button>
-            <el-button size="small" type="primary">导出</el-button>
+            <el-button size="small" type="primary" @click="toExport">导出</el-button>
         </div>
       </div>
       <div>
@@ -58,68 +57,90 @@
                            {{scope.row.good_name}}
                         </template>
                     </el-table-column>
-                    <el-table-column label="规格" width="100">
+                    <el-table-column label="规格" width="100" align="center">
                       <template slot-scope="scope">
                          {{scope.row.specification_name}}
                       </template>
                     </el-table-column>
-                    <el-table-column label="单位" width="100">
+                    <el-table-column label="单位" width="100" align="center">
                       <template slot-scope="scope">
                          {{scope.row.packing_unit}}
                       </template>
                     </el-table-column>
-                    <el-table-column label="调价数量" width="100">
+                    <el-table-column label="调价数量" width="100" align="center">
                       <template slot-scope="scope">
                        {{scope.row.count}}
                       </template>
                     </el-table-column>
-                    <el-table-column label="原进货价" width="100">
+                    <el-table-column label="原进货价" width="100" align="center">
                       <template slot-scope="scope">
                        {{scope.row.buy_price}}
                       </template>
                     </el-table-column>
-                    <el-table-column label="原零售价" width="100">
+                    <el-table-column label="原零售价" width="100" align="center">
                       <template slot-scope="scope">
                        {{scope.row.packing_price}}
                      </template>
                     </el-table-column>
-                    <el-table-column label="生产厂商" width="100">
+                    <el-table-column label="现零价" width="100" align="center">
+                      <template slot-scope="scope">
+                       {{scope.row.new_price}}
+                     </template>
+                    </el-table-column>
+                    <el-table-column label="生产厂商" width="100" align="center">
                       <template slot-scope="scope">
                        {{scope.row.manufacturer}}
                       </template>
                     </el-table-column>
-                    <el-table-column label="经销商" width="100">
+                    <el-table-column label="经销商" width="100" align="center">
                       <template slot-scope="scope">
                         {{scope.row.dealer}}
                       </template>
                     </el-table-column>
-                    <el-table-column label="操作人" width="100">
+                    <el-table-column label="操作人" width="100" align="center">
                       <template slot-scope="scope">
                         {{getDoctor(scope.row.creater)}}
                       </template>
                     </el-table-column>
-                    <el-table-column label="核对人" width="100">
+                    <el-table-column label="核对人" width="100" align="center">
                       <template slot-scope="scope">
                          {{getDoctor(scope.row.checker)}}
                       </template>
                     </el-table-column>
-                    <el-table-column label="状态" width="100">
+                    <el-table-column label="状态" width="100" align="center">
                       <template slot-scope="scope">
                         <span v-if="scope.row.checker_status == 2">未核对</span>
                         <span v-if="scope.row.checker_status == 1">已核对</span>  
                       </template>
                     </el-table-column>
-                    <el-table-column prop="date" label="调价日期" width="100">
+                    <el-table-column prop="date" label="调价日期" width="100" align="center">
                      <template slot-scope="scope">
                           {{getTime(scope.row.start_time)}}
                      </template> 
                     </el-table-column>
-                    <el-table-column label="备注" width="100">
+                    <el-table-column label="备注" width="100" align="center">
                        <template slot-scope="scope">
                          {{scope.row.remark}}
                        </template>
                     </el-table-column>
+                   <el-table-column label="操作" align="center" width="200">
+                    <template slot-scope="scope">
+                      <el-button type="primary" size="small" @click="modifyPrice(scope.row.id,scope.row.checker_status)">编辑</el-button>
+                      <el-button  type="danger" size="small" @click="deleteStockPrice(scope.row.id,scope.row.checker_status,scope.$index)">删除</el-button>
+                    </template>
+                  </el-table-column>
                 </el-table>
+
+                <el-pagination
+                  @size-change="handleSizeChange"
+                  @current-change="handleCurrentChange"
+                  :page-sizes="[10, 20, 40, 100]"
+                  :page-size="10"
+                  background
+                  style="margin-top:20px;text-align: right"
+                  layout="total, sizes, prev, pager, next, jumper"
+                  :total="total">
+               </el-pagination>
             </div>
                 <!-- <el-table :data="tableData" border :height="tableHeight" :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }">
                     <el-table-column
@@ -410,12 +431,36 @@
             <el-button type="primary" @click="SaveCheckedPrice">保 存</el-button>
         </span>
     </el-dialog>
+
+
+
+    <el-dialog
+        title="耗材调价核对"
+        :visible.sync="modifyDialogVisible"
+        width="30%"
+        >
+        <span>
+          <el-form :model="form">
+            <el-row>
+              <el-col>
+                <el-form-item label="现价格">
+                  <el-input v-model="form.new_price" style="width:100px"></el-input>
+                </el-form-item>  
+              </el-col>
+            </el-row>  
+          </el-form>  
+        </span>
+        <span slot="footer" class="dialog-footer">
+            <el-button @click="modifyDialogVisible = false">取 消</el-button>
+            <el-button type="primary" @click="updateStockPrice">保 存</el-button>
+        </span>
+    </el-dialog>
   </div>
 </template>
 
 <script>
 import BreadCrumb from "../components/bread-crumb";
-import { postSearchGoodWarehouseList,saveAdjustPrice,getAllStockPrice,SaveCheckedPrice} from "@/api/stock"
+import { postSearchGoodWarehouseList,saveAdjustPrice,getAllStockPrice,SaveCheckedPrice,getModifyPriceDetail,updateStockPrice,deleteStockPrice} from "@/api/stock"
 import { uParseTime } from '@/utils/tools'
 export default {
     name: "stockModifyPrice",
@@ -466,11 +511,16 @@ export default {
             check_time:new Date(),
             checker:this.$store.getters.xt_user.user.id,
             checkDialogVisible:false,
+            limit:10,
+            page:1,
+            total:0,
+            modifyDialogVisible:false,
+            id:0,
         }
     },
     methods:{
         search(){
-
+          this.getAllStockPrice()
         },
         print(){
             if(this.ids == ""){
@@ -535,9 +585,6 @@ export default {
           this.form.buy_price = val.buy_price
           this.form.warehousing_unit = val.packing_unit
          
-      },
-      handleClose(){
-
       },
       addPrice(){
         var obj = {
@@ -589,7 +636,8 @@ export default {
      editPrice(row){
       console.log("row232233223",row)
       this.form.good_name = row.good_name
-      this.form.packing_price = row.packing_unit
+      this.form.packing_price = row.packing_price
+      this.form.packing_unit = row.packing_unit
       this.form.new_price = row.new_price
       this.form.count = row.count
       this.form.remark = row.remark
@@ -607,6 +655,11 @@ export default {
          }
        }
        this.editPriceDialogVisible = false
+       this.form.good_name = ""
+       this.form.packing_price = ""
+       this.form.new_price = ""
+       this.form.count = ""
+       this.form.remark = ""
      },
      saveAdjustPrice(){
          for(let i=0;i<this.tableData.length;i++){
@@ -614,6 +667,12 @@ export default {
            this.tableData[i].packing_price = this.tableData[i].packing_price.toString()
            this.tableData[i].new_price = this.tableData[i].new_price.toString()
            this.tableData[i].count =  parseInt(this.tableData[i].count)
+           if(this.tableData[i].dealer == 0){
+             this.tableData[i].dealer = ""
+           }
+           if(this.tableData[i].manufacturer == 0){
+             this.tableData[i].manufacturer = ""
+           }
          }
          var params= {
            tableData:this.tableData,
@@ -625,6 +684,7 @@ export default {
           console.log("msg",msg)
           this.$message.success("保存成功!")
           this.dialogVisible = false
+          this.getAllStockPrice()
         }
       })  
      },
@@ -633,6 +693,8 @@ export default {
             keyword:this.searchKey,
             start_time:this.start_time,
             end_time:this.end_time,
+            limit:this.limit,
+            page:this.page,
          }
         console.log("params",params)
        getAllStockPrice(params).then(response=>{
@@ -643,6 +705,7 @@ export default {
            var doctor = response.data.data.doctor
            console.log("doctor",doctor)
            this.doctorList = doctor
+           this.total = response.data.data.total
          }
        })  
      },
@@ -694,6 +757,92 @@ export default {
            this.checkDialogVisible = false
          }
        })
+     },
+     handleSizeChange(val){
+       this.limit = val
+       this.getAllStockPrice()
+      },
+     handleCurrentChange(val){
+        this.page = val
+        this.getAllStockPrice()
+      },
+     toExport(){
+      import('@/vendor/Export2Excel').then(excel => {
+        for(let i=0;i<this.tableList.length;i++){
+          this.tableList[i].start_time = this.getTime(this.tableList[i].start_time)
+          this.tableList[i].creater =  this.getDoctor(this.tableList[i].creater)
+          this.tableList[i].checker = this.getDoctor(this.tableList[i].checker)
+        }
+        console.log("表格",this.tableList)
+        const tHeader = ['单据编码','调价日期','操作人','审核人','耗材名称','规格','生产厂家','批注文书','经销商','数量','原零价','现零价','进货价','零售总价','批号','生产日期','有效日期']
+        const filterVal = ['warehousing_order', 'start_time','creater','checker','good_name','specification_name','manufacturer','license_number','dealer','count','packing_price','new_price','buy_price','','','','']
+        console.log("table",this.tableList)
+      
+        const data = this.formatJson(filterVal, this.tableList)
+        excel.export_json_to_excel({
+          header: tHeader,
+          data,
+          filename: '调价明细表'
+        })
+      this.downloadLoading = false
+     })
+    },
+    formatJson(filterVal, jsonData) {
+      return jsonData.map(v => filterVal.map(j => v[j]));
+     },
+     modifyPrice(id,check_status){
+       if(check_status == 1){
+         this.$message.error("已核对不能编辑")
+         return
+       }
+       getModifyPriceDetail(id).then(response=>{
+         if(response.data.state == 1){
+           var info =  response.data.data.detail
+           console.log("info",info)
+           this.id = info.id
+           this.form.new_price = info.new_price
+           this.modifyDialogVisible = true
+         }
+       })
+     },
+     updateStockPrice(){
+         var params = {
+           new_price:this.form.new_price.toString(),
+           id:this.id
+         }
+         console.log("params",params)
+       updateStockPrice(params).then(response=>{
+          if(response.data.state == 1){
+            var adjust = response.data.data.adjust
+            this.$message.success("保存成功")
+             this.modifyDialogVisible = false
+             this.getAllStockPrice()
+          }
+       })
+     },
+     deleteStockPrice(id,check_status,index){
+       if(check_status == 1){
+         this.$message.error("已核对不能编辑")
+         return
+       }
+        this.$confirm('是否删除所选内容?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          let params = {
+            id:id,
+          }
+          deleteStockPrice(params).then(response => {
+            if (response.data.state == 1) {
+              var msg = response.data.data.msg
+              this.$message.success("保存成功")
+              this.tableList.splice(index,1)
+            } 
+          })
+        }).catch(() => {
+          this.loading = false
+        });
      }
     },
     created(){

src/xt_pages/user/dialysisSolution.vue

@@ -438,7 +438,7 @@
             </el-form-item>
           </el-col>
 
-          <el-col :span="8" v-if="isShows('灌流器')">
+          <el-col :span="8" v-if="isShows('灌流器') && (addPlan.mode_id == 2 || addPlan.mode_id == 12 || addPlan.mode_id == 5)">
              <el-form-item label="灌流器:">
                <el-input v-model="dialysis_irrigation" @focus="showInnerDialog('7')"></el-input>
              </el-form-item>
@@ -1640,20 +1640,23 @@ export default {
     
       this.addPlan.remark = row.remark
 
-      this.addPlan.hemodialysis_pipelines  = row.hemodialysis_pipelines
-      if(row.hemodialysis_pipelines_count!="" || row.hemodialysis_pipelines_count!=undefined){
-        this.addPlan.hemodialysis_pipelines_count  = row.hemodialysis_pipelines_count.toString()
-      }
+      // this.addPlan.hemodialysis_pipelines  = row.hemodialysis_pipelines
+
+      // if(row.hemodialysis_pipelines_count!="" || row.hemodialysis_pipelines_count!=undefined){
+      //   this.addPlan.hemodialysis_pipelines_count  = row.hemodialysis_pipelines_count.toString()
+      // }
      
-      this.addPlan.puncture_needle  = row.puncture_needle
-      if(row.puncture_needle_count!=null || row.puncture_needle_count!=undefined){
-        this.addPlan.puncture_needle_count = row.puncture_needle_count.toString()
-      }
+      // this.addPlan.puncture_needle  = row.puncture_needle
+
+      // if(row.puncture_needle_count!=null || row.puncture_needle_count!=undefined){
+      //   this.addPlan.puncture_needle_count = row.puncture_needle_count.toString()
+      // }
      
-      this.addPlan.epo  = row.epo
-      if(row.epo_count!="" || row.epo_count!=undefined){
-        this.addPlan.epo_count  = row.epo_count.toString()
-      }
+      // this.addPlan.epo  = row.epo
+
+      // if(row.epo_count!="" || row.epo_count!=undefined){
+      //   this.addPlan.epo_count  = row.epo_count.toString()
+      // }
     
       if(row.dialyzer_perfusion_apparatus!="" ||  row.dialyzer_perfusion_apparatus!=undefined){
          this.addPlan.dialyzer_perfusion_apparatus = row.dialyzer_perfusion_apparatus.toString()

src/xt_pages/user/templateSummary.vue

@@ -61,7 +61,7 @@
               <div class="record_content_panel">
                 <div style="background-color:rgb(245, 247, 250)" class="title">阶段小结内容</div>
                 <div style="padding:10px;border-bottom:1px solid #DCDFE6;"><span v-if="editObj.record_time!=''">阶段小结时间:{{getTime(editObj.record_time)}}</span></div>  
-                <div style="padding: 10px 10px 0;">阶段小结概要:</div>  
+                <!-- <div style="padding: 10px 10px 0;">阶段小结概要:</div>  
                 <div style="padding:10px;border-bottom:1px solid #DCDFE6;">
                   <span style="margin-right:10px;line-height:30px;">干体重(kg):{{editObj.dry_weight}}</span>
                   <span style="margin-right:10px;line-height:30px;">共透析:{{editObj.dialysis_count}}次</span>
@@ -85,7 +85,7 @@
                   <br>
                   <span style="margin-right:10px;line-height:30px;">透前血压（mmHg):{{editObj.befor_pressure}}</span>
                   <span style="margin-right:10px;line-height:30px;">透后血压（mmHg):{{editObj.after_pressure}}</span>
-                </div>
+                </div> -->
                  <div style="padding:10px;border-bottom:1px solid #DCDFE6;line-height:20px;">阶段小结总结:
                    {{editObj.template_summary_content}}
                  </div>
@@ -128,7 +128,7 @@
                     </el-form-item>
                   </el-col>
                 </el-row>
-                 <el-row :gutter="24">
+                 <!-- <el-row :gutter="24">
                   <el-col :span="8">
                     <el-form-item label="阶段小结时间:">
                         <el-date-picker
@@ -151,14 +151,6 @@
                   
                   <el-col :span="8" v-if="form.radio == 1">
                     <el-form-item>
-                       <!-- <el-select v-model="form.start_month" placeholder="请选择" @change="changeStartMonth">
-                        <el-option
-                          v-for="item in monthType"
-                          :key="item.id"
-                          :label="item.name"
-                          :value="item.id">
-                        </el-option>
-                      </el-select> -->
                       <el-date-picker
                         @change="changeStartMonth"
                         value-format="MM"
@@ -180,15 +172,15 @@
                       </el-select>
                     </el-form-item> 
                   </el-col> 
-                 </el-row>  
+                 </el-row>   -->
                 
               </el-form>
             </div>
 
             <div class="cell clearfix" style="margin-top: 10px">
-              <label class="title"><span class="name">阶段小结摘要</span> : </label>
+              <!-- <label class="title"><span class="name">阶段小结摘要</span> : </label> -->
               <el-form>
-                  <el-row :gutter="24">
+                  <!-- <el-row :gutter="24">
                     <el-col :span="8">
                      <el-form-item label="干体重">
                       <el-input v-model="form.dry_weight"></el-input>
@@ -299,7 +291,7 @@
                       <el-input v-model="form.after_pressure"></el-input>
                      </el-form-item>  
                     </el-col>
-                  </el-row>
+                  </el-row> -->
                  
                   <el-row>
                     <label class="title"><span class="name">阶段小结总结</span> : </label>
@@ -396,7 +388,7 @@
                     </el-form-item>
                   </el-col>
                 </el-row>
-                 <el-row :gutter="24">
+                 <!-- <el-row :gutter="24">
                   <el-col :span="8">
                     <el-form-item label="阶段小结时间:">
                         <el-date-picker
@@ -439,15 +431,15 @@
                       </el-select>
                     </el-form-item> 
                   </el-col> 
-                 </el-row>  
+                 </el-row>   -->
                 
               </el-form>
             </div>
 
             <div class="cell clearfix" style="margin-top: 10px">
-              <label class="title"><span class="name">阶段小结摘要</span> : </label>
+              <!-- <label class="title"><span class="name">阶段小结摘要</span> : </label> -->
               <el-form>
-                  <el-row :gutter="24">
+                  <!-- <el-row :gutter="24">
                     <el-col :span="8">
                      <el-form-item label="干体重">
                       <el-input v-model="form.dry_weight"></el-input>
@@ -463,8 +455,8 @@
                       <el-input v-model="form.hd_count"></el-input>
                      </el-form-item>  
                     </el-col>
-                  </el-row>
-                  <el-row :gutter="24">
+                  </el-row> -->
+                  <!-- <el-row :gutter="24">
                     <el-col :span="8">
                      <el-form-item label="HDF(次)">
                       <el-input v-model="form.hdf_count"></el-input>
@@ -480,8 +472,8 @@
                       <el-input v-model="form.other_count"></el-input>
                      </el-form-item>  
                     </el-col>
-                  </el-row>
-                   <el-row :gutter="24">
+                  </el-row> -->
+                   <!-- <el-row :gutter="24">
                     <el-col :span="8">
                      <el-form-item label="透析器">
                        <el-input v-model="form.dialzer_apparatus" @focus="showInnerDialog('7')"></el-input>
@@ -495,7 +487,6 @@
 
                     <el-col :span="8">
                      <el-form-item label="抗凝剂">
-                      <!-- <el-input v-model="form.anticoagulant"></el-input> -->
                        <el-select v-model="form.anticoagulant" placeholder="请选择" style="width:100%;">
                           <el-option :key="0" label="请选择" :value="0"></el-option>
                           <el-option v-for="(item, index) in anticoagulantList" :label="item.name" :key="index + 'e'"
@@ -503,8 +494,8 @@
                        </el-select>
                      </el-form-item>  
                     </el-col>
-                  </el-row>
-                   <div>透析液</div>
+                  </el-row> -->
+                   <!-- <div>透析液</div>
                    <el-row :gutter="24">
                     <el-col :span="8">
                      <el-form-item label="钾">
@@ -521,8 +512,8 @@
                       <el-input v-model="form.natrium"></el-input>
                      </el-form-item>  
                     </el-col>
-                  </el-row>
-                   <div>透析时长</div>
+                  </el-row> -->
+                   <!-- <div>透析时长</div>
                    <el-row :gutter="24">
                     <el-col :span="8">
                      <el-form-item label="时">
@@ -534,8 +525,8 @@
                       <el-input v-model="form.minute"></el-input>
                      </el-form-item>  
                     </el-col>
-                  </el-row>
-                  <el-row :gutter="24">
+                  </el-row> -->
+                  <!-- <el-row :gutter="24">
                     <el-col :span="8">
                      <el-form-item label="透前体重(kg)">
                       <el-input v-model="form.befor_weight"></el-input>
@@ -546,8 +537,8 @@
                       <el-input v-model="form.after_weight"></el-input>
                      </el-form-item>  
                     </el-col>
-                  </el-row>
-                   <el-row :gutter="24">
+                  </el-row> -->
+                   <!-- <el-row :gutter="24">
                     <el-col :span="8">
                      <el-form-item label="透前血压(mmHg)">
                       <el-input v-model="form.befor_pressure"></el-input>
@@ -558,7 +549,7 @@
                       <el-input v-model="form.after_pressure"></el-input>
                      </el-form-item>  
                     </el-col>
-                  </el-row>
+                  </el-row> -->
                  
                   <el-row>
                     <label class="title"><span class="name">阶段小结总结</span> : </label>
@@ -587,7 +578,7 @@
                   <el-row>
                     <label class="title"><span class="name">阶段小结化验结果</span> : </label>
                     <el-button type="primary" @click="toInspection">选择检验检查</el-button>
-                     <!-- <el-input style="margin:10px 0;" type="textarea" v-model="form.template_inspection_content"></el-input> -->
+                   
                      <div class="borderBox">
                        <div v-for="item in form.template_inspection_content">
                         <p>{{ item.project_name }}</p>
@@ -1465,9 +1456,19 @@
                this.form.perfusion_apparatus= list.perfusion_apparatus
                this.form.record_time = this.getTimeTwo(list.record_time)
                console.log("时间232233232",list.record_time)
-               this.form.template_inspection_id = list.template_inspection_id
+               if(list.template_inspection_id == 0){
+                  list.template_inspection_id = ""
+               }else{
+                 this.form.template_inspection_id = list.template_inspection_id
+               }
+              
                this.form.template_plan_content = list.template_plan_content
-               this.form.template_plan_id = list.template_plan_id,
+               if(list.template_plan_id == 0){
+                 this.form.template_plan_id  = ""
+               }else{
+                 this.form.template_plan_id = list.template_plan_id
+               }
+             
                console.log("hhhhhhhhh",list.template_plan_id)
                this.form.template_summary_content =list.template_summary_content
                if(list.template_summary_id == 0){

src/xt_pages/user/templateSummaryPrint.vue

@@ -20,7 +20,7 @@
       <div style="padding:20px 0;border-bottom:1px solid #000;font-weight:bold;">
         <span>阶段评估时间:{{getTime(patientList.record_time)}}</span>  
       </div>
-       <div style="padding:20px 0;border-bottom:1px solid #000;">
+       <!-- <div style="padding:20px 0;border-bottom:1px solid #000;">
         <span style="font-weight:bold;">阶段小结概要:</span>  
         <div style="margin-top:20px;">
           <div style="display:flex;justify-content: space-between;">
@@ -45,7 +45,7 @@
             <span>透后血压(mmHg):{{patientList.after_pressure}}</span>
           </div>
         </div>
-      </div>
+      </div> -->
       <div style="padding:20px 0;border-bottom:1px solid #000;min-height:200px;">
         <span style="font-weight:bold;">阶段小结总结:</span><div>{{patientList.template_summary_content}}</div>  
       </div>

src/xt_permission.js

@@ -12,19 +12,19 @@ const permissionWhiteList = loginWhiteList.concat(['/']) // 权限验证白名
 
 router.beforeEach((to, from, next) => {
   // 线上注释
-  if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
-        store.dispatch('VerifyConfigList', []).then(() => {
-          next()
-        })
-      }
-      if (store.getters.permission_routers === undefined) {
-        store.dispatch('xt_GenerateRoutes', []).then(() => {
-          next()
-        })
-      } else {
-        next()
-      }
-    return
+  // if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
+  //       store.dispatch('VerifyConfigList', []).then(() => {
+  //         next()
+  //       })
+  //     }
+  //     if (store.getters.permission_routers === undefined) {
+  //       store.dispatch('xt_GenerateRoutes', []).then(() => {
+  //         next()
+  //       })
+  //     } else {
+  //       next()
+  //     }
+  //   return
   // 线上注释
 
   NProgress.start()