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

src/api/drug/drug.js

     method:"Get",
     params:params,
   })
+}
+
+export function getDrugInventoryRecordList(params){
+
+  return request({
+    url:"/api/drug/getdruginventoryrecordlist",
+    method:"get",
+    params:params
+  })
 }

src/api/patient.js

     method:"Get",
     params:params,
   })
+}
+
+
+export function getPatientLapeso(params){
+
+  return request({
+    url:"/api/patient/getpatientlapeso",
+    method:"Get",
+    params:params,
+  })
 }

src/api/stock.js

     method:"Get",
     params:params
   })
+}
+
+export function getGoodStockInventoryList(params){
+
+  return request({
+    url:"/api/good/getgoodstockinventorylist",
+    method:"get",
+    params:params
+  })
 }

src/xt_pages/stock/drugs/drugInventory.vue

         @tab-click="handleClick"
       >
          <el-tab-pane label="药品盘点(模式一)" name="first">
-          <!-- <drug-inventory></drug-inventory> -->
            <historyDrugInvetory ref="childFirst"></historyDrugInvetory>
          </el-tab-pane>
          <el-tab-pane label="药品盘点(模式二)" name="four">
         <el-tab-pane label="报损列表" name="three" v-if="three">
           <drug-damaged ref="childOne"></drug-damaged>
         </el-tab-pane>
+
+        <!-- <el-tab-pane label="盘点记录表" name="seven">
+            <inventory-record ref="childSeven"></inventory-record>
+         </el-tab-pane> -->
       </el-tabs>
     </div>
   </div>
 import inventoryDetails from "./inventoryDetails";
 import drugDamaged from "./drugDamaged.vue";
 import historyDrugInvetory from "./historyDrugInvetory";
+import inventoryRecord from "./inventory_record"
 export default {
   name: "stockModifyPrice",
   components: {
     drugDamaged,
     drugNewInventory,
     historyDrugInvetory,
+    inventoryRecord
   },
   data() {
     return {
       if (this.activeName == "three") {
         this.$refs.childOne.getlist();
       }
+
+      if(this.activeName == "seven"){
+        this.$refs.childSeven.getlist();
+      }
     },
   },
   created() {

src/xt_pages/stock/drugs/newDrugInventory.vue

        return false
       }
        var params = {
-         tableData:arr
+         tableData:arr,
+         newTableData:this.tableData
+
        }
-      console.log("arr23233232w",arr)
+      console.log("arr23233232w",params)
+      
      const loading = this.$loading({
         lock: true,
         text: 'Loading',

src/xt_pages/stock/inventoryDetails.vue

             <div>
               <el-button type="primary" @click="toprint">打印</el-button>
               <el-button type="primary" @click="inventoryExportList">盘点模版打印</el-button>
+             
             </div>
-            <!-- <div>
-                <el-button size="small" type="primary" @click="print">打印</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-column type="selection" width="55" align="center"> </el-table-column>

src/xt_pages/stock/newInventory.vue

           this.tableData[i].last_stock_count = parseInt(this.tableData[i].last_stock_count)
         }
         this.tableData[i].storehouse_id = this.storehouse_id
+
+        this.tableData[i].packing_price = this.tableData[i].Warehousing.packing_price
       }
       var arr = []
       for(let i=0;i<this.tableData.length;i++){
       var params = {
          tableData:arr,
          storehouse_id:this.storehouse_id,
+         newTableData:this.tableData,
       }
       
       console.log("param23323232323232323",params)
+
+      
       saveStockInentoryList(params).then(response=>{
         if(response.data.state == 1){
            loading.close()

src/xt_pages/stock/stockInventory.vue

             <el-tab-pane label="报损列表" name="three">
                 <stockDamaged ref="childOne"></stockDamaged>
             </el-tab-pane>
+
+            <!-- <el-tab-pane label="盘点记录表" name="seven">
+                <inventory-record ref="childSeven"></inventory-record>
+            </el-tab-pane> -->
         </el-tabs>
         
     </div>
 import historyInventory from './historyInventory.vue'
 import inventoryDetails from './inventoryDetails.vue'
 import stockDamaged from "./stockDamaged.vue"
+import inventoryRecord from "./inventoryRecord.vue"
 export default {
     name: "stockModifyPrice",
     components:{
         inventoryDetails,
         stockDamaged,
         newInventory,
-        historyInventory
+        historyInventory,
+        inventoryRecord
     },
     data() {
         return{
         if(this.activeName =="three"){
           this.$refs.childOne.getlist()
         }
+
+        if(this.activeName == "seven"){
+          this.$refs.childSeven.getlist()
+        }
+
        
       }
     },

src/xt_pages/user/patients.vue

   
         <el-button type="primary" size="small" style="float:right" @click="toExport">导出</el-button>
         <el-button type="primary" size="small" style="float:right" @click="toExportOne">导出2</el-button>
+
+        <el-button type="primary" size="small" style="float:right" @click="toJiaoBen">脚本</el-button>
       </div>
       <div  class="cell clearfix">
 
 
 <script>
   import { fetchAllAdminUsers } from "@/api/doctor";
-  import { code, EditLapseto, fetchList, getMaxDialysisNo, OpenView, postExportPatients,GetRemind,getPatientAllagic,getExportList } from '@/api/patient'
+  import { code, EditLapseto, fetchList, getMaxDialysisNo, OpenView, postExportPatients,GetRemind,getPatientAllagic,getExportList,getPatientLapeso } from '@/api/patient'
   import { generateLog } from '@/api/config'
   import QRCode from 'qrcodejs2'
   import Vue from 'vue'
         )
       },
       OpenSetLapseto(row, index) {
-        //  this.$router.push({path:"/patients/patient/"+row.id})
-        // this.$router.push({path:'/patient/patient/'+row.id+'/lapsoSummary'})
+        this.$router.push({path:"/patients/patient/"+row.id})
+        this.$router.push({path:'/patient/patient/'+row.id+'/lapsoSummary'})
        
-        if(row.lapseto == 1){
-          this.lapeseto = "转出"
-        }
-        if(row.lapseto == 2){
-          this.lapeseto = "留治"
-        }
-        if(row.lapeseto == 3){
-          this.lapeseto = "死亡"
-        }
-        this.patient = row
-        this.currentIndex = index
-        this.lapsetoForm.lapseto_time = ''
-        this.lapsetoForm.lapseto_type = row.lapseto
-        this.lapsetoForm.patient_id = row.id
-        this.lapsetoForm.out_reason = row.out_reason
-        this.LapsetoDialogVisible = true
+        // if(row.lapseto == 1){
+        //   this.lapeseto = "转出"
+        // }
+        // if(row.lapseto == 2){
+        //   this.lapeseto = "留治"
+        // }
+        // if(row.lapeseto == 3){
+        //   this.lapeseto = "死亡"
+        // }
+        // this.patient = row
+        // this.currentIndex = index
+        // this.lapsetoForm.lapseto_time = ''
+        // this.lapsetoForm.lapseto_type = row.lapseto
+        // this.lapsetoForm.patient_id = row.id
+        // this.lapsetoForm.out_reason = row.out_reason
+        // this.LapsetoDialogVisible = true
       },
       LapsetoInfo(row) {
         // console.log("row",row)
       }
     },
     toOpen(id){
-      getPatientAllagic(id).then(response=>{
-        if(response.data.state == 1){
-          var list =  response.data.data.list
-          this.patieintDialogVisible=  true
-          this.patientAllgicList = list
-        }
-      })
+      this.$router.push({path:"/patients/patient/"+id})
+      this.$router.push({path:'/patient/patient/'+id+'/lapsoSummary'})
+      // getPatientAllagic(id).then(response=>{
+      //   if(response.data.state == 1){
+      //     var list =  response.data.data.list
+      //     this.patieintDialogVisible=  true
+      //     this.patientAllgicList = list
+      //   }
+      // })
     },
     GetPatientName(id){
        var name = ""
        }
        return work_unit
     },
+    toJiaoBen(){
+      getPatientLapeso().then(response=>{
 
+      })
+    }
    
 
     }

src/xt_permission.js

 
 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()
   // console.log(store.getters.current_role_urls.indexOf(to.path))