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

src/api/drug/drug_stock.js

@@ -485,3 +485,11 @@ export function getSinleOrderDetail(params) {
     params: params
   })
 }
+
+export function getAutoDrugDetail(params) {
+  return request({
+    url: '/api/drug/getautodrugdetial',
+    method: 'Get',
+    params: params
+  })
+}

src/api/patient.js

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

src/xt_pages/data/components/project.vue

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

src/xt_pages/stock/drugs/drugStockOutOrder.vue

@@ -195,6 +195,8 @@
       </el-pagination>
     </div>
 
+
+<!-- 使用详情 -->
     <div v-show="tableShow" style="margin-bottom:10px">
       <el-table
         :data="tableList"
@@ -286,6 +288,12 @@
             {{scope.row.remark}}
           </template>
         </el-table-column>
+
+        <el-table-column label="操作" align="center">
+          <template slot-scope="scope">
+             <span style="color: #589ff8" v-if="scope.row.is_sys == 1" @click="toDetail(scope.row)">使用明细</span>
+          </template>
+        </el-table-column>
       </el-table>
 
     </div>
@@ -442,7 +450,63 @@
         <el-button type="primary" @click="dialogVisibleTwo = false">确 定</el-button>
       </span>
     </el-dialog>
-  </div>
+
+
+   
+    <el-dialog
+      title="提示"
+      :visible.sync="drugDialogVisible"
+      width="90%">
+      <span>
+        <el-table :data="userList" :class="signAndWeighBoxPatients" style="width: 50%"
+                  border :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}"
+        >
+          <el-table-column min-width="35" align="center">
+            <template slot="header" slot-scope="scope">
+              <span>序号</span>
+            </template>
+            <template slot-scope="scope">
+              <span v-if="scope.row.is_total == 0">{{scope.$index+1}}</span>
+              <span v-if="scope.row.is_total == 1">{{'合计'}}</span>
+            </template>
+          </el-table-column>
+
+          <el-table-column min-width="35" align="center">
+            <template slot="header" slot-scope="scope">
+              <span>使用人</span>
+            </template>
+            <template slot-scope="scope">
+              <span v-if="scope.row.is_total == 0">{{scope.row.user.name}}</span>
+              <span v-if="scope.row.is_total == 1"></span>
+            </template>
+          </el-table-column>
+          <el-table-column min-width="35" align="center">
+            <template slot="header" slot-scope="scope">
+              <span>使用数量</span>
+            </template>
+            <template slot-scope="scope">
+              <span >{{scope.row.count}}</span>
+            </template>
+          </el-table-column>
+
+          <el-table-column min-width="35" align="center">
+            <template slot="header" slot-scope="scope">
+              <span>使用时间</span>
+            </template>
+            <template slot-scope="scope">
+              <span  v-if="scope.row.is_total == 0">{{scope.row.ctime | parseTime('{y}-{m}-{d} {h}:{i}')}} </span>
+              <span  v-if="scope.row.is_total == 1">{{scope.row.total}} </span>
+            </template>
+          </el-table-column>
+
+        </el-table>
+      </span>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="drugDialogVisible = false">取 消</el-button>
+        <el-button type="primary" @click="drugDialogVisible = false">确 定</el-button>
+      </span>
+    </el-dialog>
+   </div>
 </template>
 
 <script>
@@ -456,7 +520,8 @@ import {
   getDrugWarehouseOutInfo,
   getDrugWarehouseOutUser,
   getDrugAutoMaticList,
-  getSinleOrderDetail
+  getSinleOrderDetail,
+  getAutoDrugDetail
 } from "@/api/drug/drug_stock";
 import BreadCrumb from "../../components/bread-crumb";
 import { getInitializtion } from '@/api/stock'
@@ -528,6 +593,7 @@ export default {
       drugTypeList:[],
       tableShow:false,
       manufacturerList:[],
+      drugDialogVisible:false,
     };
   },
   methods: {
@@ -976,7 +1042,34 @@ export default {
           this.tableList = list
         }
      })
-   }
+   },
+   toDetail(val){
+    
+     console.log("val",val)
+     var params = {
+       drug_id:val.drug_id,
+       record_time:val.sys_record_time,
+     }
+     this.userList = []
+     getAutoDrugDetail(params).then(response=>{
+       if(response.data.state == 1){
+        this.drugDialogVisible = true
+        var total = 0
+        for (let i = 0; i < response.data.data.list.length; i++) {
+          var obj = response.data.data.list[i]
+          obj['is_total'] = 0
+          this.userList.push(obj)
+          total = total + response.data.data.list[i].count
+        }
+        this.userList.push({
+          is_total: 1,
+          total: total,
+        })
+       }
+     })
+   },
+
+    
   }
 };
 </script>

src/xt_pages/stock/stockInOrderEdit.vue

@@ -610,10 +610,13 @@ export default {
               return;
             }
           }
-
+          for(let i=0;i<this.recordInfo.recordData.length;i++){
+            this.recordInfo.recordData[i].price = this.recordInfo.recordData[i].price.toString()
+          }
           const params = {
             stockIn: this.recordInfo.recordData
           };
+          console.log("params2222",params)
           EditWarehouse(
             params,
             this.warehousing_time,
@@ -660,7 +663,9 @@ export default {
             response.data.data.info[i].good_name = response.data.data.info[i].GoodInfo.good_name
             response.data.data.info[i].name = response.data.data.info[i].GoodInfo.specification_name + "*" + response.data.data.info[i].GoodInfo.min_number+response.data.data.info[i].GoodInfo.min_unit
             response.data.data.info[i].min_unit = response.data.data.info[i].GoodInfo.min_unit
+           
             this.recordInfo.recordData.push(response.data.data.info[i]);
+           
             console.log("列表",this.recordInfo.recordData)
           }
 

src/xt_pages/user/courseOfDisease.vue

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