Merge branch 'superman' of http://git.shengws.com/zhangbj/xt_vue into superman

src/api/signandweigh.js

@@ -72,3 +72,13 @@ export function sighdata(params){
      method: 'Post'
    })
 }
+
+export function updateSignweight(params){
+  console.log("好好玩")
+  console.log(params)
+  return request({
+     url:'/api/sign/updateSignweight',
+     params:params,
+     method:'Post'
+  })
+}

src/api/stock.js

@@ -385,9 +385,9 @@ export function DeleteWarehouseInfoItem(params) {
   })
 }
 
-export function EditWarehouse(params, warehousing_time, id,type) {
+export function EditWarehouse(params, warehousing_time, id,type,manufacturer_id) {
   return request({
-    url: '/api/warehouse/edit?warehousing_time=' + warehousing_time + '&id=' + id+"&type="+type,
+    url: '/api/warehouse/edit?warehousing_time=' + warehousing_time + '&id=' + id+"&type="+type+"&manufacturer_id="+manufacturer_id,
     method: 'post',
     data: params
   })
@@ -433,9 +433,9 @@ export function deleteSalesReturnInfo(params) {
   })
 }
 
-export function editSalesReturnInfo(params, return_time, id,type) {
+export function editSalesReturnInfo(params, return_time, id,type,manufacturer_id) {
   return request({
-    url: '/api/salesreturn/edit?return_time=' + return_time + '&id=' + id+"&type="+type,
+    url: '/api/salesreturn/edit?return_time=' + return_time + '&id=' + id+"&type="+type+"&manufacturer_id="+manufacturer_id,
     method: 'post',
     data: params
   })
@@ -473,9 +473,9 @@ export function getWarehouseOutInfo(params) {
   })
 }
 
-export function editWarehouseoutInfo(params, warehouse_out_time, id,type) {
+export function editWarehouseoutInfo(params, warehouse_out_time, id,type,manufacturer_id) {
   return request({
-    url: '/api/warehouseout/edit?warehouse_out_time=' + warehouse_out_time + '&id=' + id+"&type="+type,
+    url: '/api/warehouseout/edit?warehouse_out_time=' + warehouse_out_time + '&id=' + id+"&type="+type+"&manufacturer_id="+manufacturer_id,
     method: 'post',
     data: params
   })
@@ -489,9 +489,9 @@ export function getCancelStockList(params) {
   })
 }
 
-export function editCancelStockInfo(params, cancel_stock_time, id,type) {
+export function editCancelStockInfo(params, cancel_stock_time, id,type,manufacturer_id) {
   return request({
-    url: '/api/cancelstockinfo/edit?cancel_time=' + cancel_stock_time + '&id=' + id+"&type="+type,
+    url: '/api/cancelstockinfo/edit?cancel_time=' + cancel_stock_time + '&id=' + id+"&type="+type+"&manufacturer_id="+manufacturer_id,
     method: 'post',
     data: params
   })

src/xt_pages/sign/index.vue

@@ -81,7 +81,7 @@
                     <el-row :gutter="20">
                         <el-col :span="23" align="right" class="button">
                             <el-button  @click="hide()">取消</el-button>
-                            <el-button @click="savedata();updatedata();sighdata();" type="primary">保存</el-button>
+                            <el-button @click="updateSignweight();sighdata();" type="primary">保存</el-button>
                         </el-col>
                     </el-row>
                    </div>
@@ -93,7 +93,7 @@
 </template>
 
 <script>
-import { fetchSignPatients, getPatientSign, SignWeigh, getDialysisInforInfomation, getDialysisAfterInfomation, createdata, editdata, sighdata } from '@/api/signandweigh'
+import { fetchSignPatients, getPatientSign, SignWeigh, getDialysisInforInfomation, getDialysisAfterInfomation, createdata, updateSignweight,sighdata} from '@/api/signandweigh'
 import BreadCrumb from '../components/bread-crumb'
 export default {
   name: 'sign',
@@ -279,48 +279,6 @@ export default {
       //console.log("是否有数据",this.weigh_list.id)
       // this.getsignweigh(row.id)
     },
-    // submitSign() {
-    //   SignWeigh(this.querySignParams, this.weigh_form).then(response => {
-    //     if (response.data.state === 1) {
-    //       this.$message({
-    //         type: 'success',
-    //         message: '成功!'
-    //       })
-
-    //       var tlen = this.patients.length
-    //       for (let index = 0; index < tlen; index++) {
-    //         if (this.patients[index].id === this.querySignParams.patient_id) {
-    //           var signin = this.patients[index].signin
-    //           this.patients[index].signin = response.data.data.sign
-
-    //           if (this.patients[index].schedule.id > 0 && (this.patients[index].schedule.schedule_type >= 1 || this.patients[index].schedule.schedule_type <= 3)) {
-    //             var sl = this.schedules.length
-    //             for (let j = 0; j < sl; j++) {
-    //               if (this.schedules[j].type === this.patients[index].schedule.schedule_type) {
-    //                 if (this.weigh_form.id <= 0) {
-    //                   this.schedules[j].sign++
-    //                 }
-    //                 if (signin.weigh_before_time === 0 && response.data.data.sign.weigh_before_time > 0) {
-    //                   this.schedules[j].before++
-    //                 }
-
-    //                 if (signin.weigh_time === 0 && response.data.data.sign.weigh_time > 0) {
-    //                   this.schedules[j].after++
-    //                 }
-    //               }
-    //             }
-    //           }
-    //           break
-    //         }
-    //       }
-    //       this.weigh_form.id = response.data.data.sign.id
-    //     } else {
-    //       this.$message.error(response.data.msg)
-    //       return false
-    //     }
-    //   })
-    // },
-
     getDialysisInforInfomation(id) {
       getDialysisInforInfomation(id).then(response => {
         if (response.data.data.patientlist != null) {
@@ -404,49 +362,40 @@ export default {
       this.show = true
       this.disa = false
     },
-    savedata() {
+
+    updateSignweight() {
       var params = new Object()
+      var data_time = this.querySignParams.date_time
+      params.date_time = data_time
       params.patient_id = this.weigh_form.patient_id
       params.dry_weight = this.weigh_list.dry_weight
       params.weight_before = this.weigh_list.weight_before
       params.temperature = this.weigh_list.temperature
       params.pulse_frequency = this.weigh_list.pulse_frequency
-      params.breathing_rate = this.weigh_list.breathing_rate
       params.systolic_blood_pressure = this.weigh_list.systolic_blood_pressure
       params.diastolic_blood_pressure = this.weigh_list.diastolic_blood_pressure
-      createdata(params).then(response => {
-        if (response.data.state === 1) {
-          this.$message({
+
+      params.patient_id = this.weigh_form.patient_id
+      params.weight_after = this.weigh_infor.weight_after
+      params.temperatureafter = this.weigh_infor.temperature
+      params.pulse_frequencyafter = this.weigh_infor.pulse_frequency
+      params.systolic_blood_pressureafter = this.weigh_infor.systolic_blood_pressure
+      params.diastolic_blood_pressureafter = this.weigh_infor.diastolic_blood_pressure
+      console.log("干体重:"+ params.dry_weight)
+      updateSignweight(params).then(response =>{
+         if(response.data.state ===1){
+            this.$message({
             type: 'success',
             message: '成功!'
-          })
-        }
+           })
+         }
       })
+       console.log("params数据",params)
     },
     hide() {
       this.show = false
     },
-    updatedata() {
-      var params = new Object()
-      params.patient_id = this.weigh_form.patient_id
-      params.dry_weight = this.weigh_infor.dry_weight
-      params.weight_after = this.weigh_infor.weight_after
-      params.temperature = this.weigh_infor.temperature
-      params.pulse_frequency = this.weigh_infor.pulse_frequency
-      params.breathing_rate = this.weigh_infor.breathing_rate
-      params.systolic_blood_pressure = this.weigh_infor.systolic_blood_pressure
-      params.diastolic_blood_pressure = this.weigh_infor.diastolic_blood_pressure
-      editdata(params).then(response => {
-        if (response.data.state === 1) {
-          this.$message({
-            type: 'success',
-            message: '成功!'
-          })
-        }
-      })
-      console.log('hahahahah')
-      console.log(params)
-    },
+  
     sighdata() {
       // 透前数据
       var params = new Object()
@@ -465,13 +414,12 @@ export default {
       params.weight_after = this.weigh_infor.weight_after
       params.temperatureafter = this.weigh_infor.temperature
       params.pulse_frequencyafter = this.weigh_infor.pulse_frequency
-      params.breathing_rateafter = this.weigh_infor.breathing_rate
       params.systolic_blood_pressureafter = this.weigh_infor.systolic_blood_pressure
       params.diastolic_blood_pressureafter = this.weigh_infor.diastolic_blood_pressure
       console.log('params是什么?', params)
       sighdata(params).then(response => {
         var signs = response.data.data.signs
-        // this.patients[this.table_current_index].signin.id = 1
+        console.log("signs是什么?",signs)
         if (response.data.state === 1) {
           this.$message({
             type: 'success',

src/xt_pages/stock/cancelStockOrderEdit.vue

@@ -301,7 +301,7 @@
             const params = {
               'cancelStock': this.recordInfo.recordData
             }
-            editCancelStockInfo(params, this.return_time, this.$route.query.id, this.$route.query.type).then(response => {
+            editCancelStockInfo(params, this.return_time, this.$route.query.id, this.$route.query.type,this.form.manufacturer).then(response => {
               if (response.data.state == 0) {
                 this.$message.error(response.data.msg)
                 return false

src/xt_pages/stock/detail/salesReturnDetail.vue

@@ -61,7 +61,7 @@
             </template>
           </el-table-column>
 
-          <el-table-column label="商品类型" align="center">
+          <el-table-column label="商品" align="center">
             <template slot-scope="scope">
               {{specificationName(scope.row.good_id)}}
             </template>

src/xt_pages/stock/detail/stockInDetail.vue

@@ -58,7 +58,7 @@
             </template>
           </el-table-column>
 
-          <el-table-column label="商品类型" align="center">
+          <el-table-column label="商品" align="center">
             <template slot-scope="scope">
               {{specificationName(scope.row.good_id)}}
             </template>

src/xt_pages/stock/detail/stockOutDetail.vue

@@ -62,7 +62,7 @@
             </template>
           </el-table-column>
 
-          <el-table-column label="商品类型" align="center">
+          <el-table-column label="商品" align="center">
             <template slot-scope="scope">
               {{specificationName(scope.row.good_id)}}
             </template>

src/xt_pages/stock/salesReturnEdit.vue

@@ -309,7 +309,7 @@
             const params = {
               'salesReturn': this.recordInfo.recordData
             }
-            editSalesReturnInfo(params, this.return_time, this.$route.query.id, this.$route.query.type).then(response => {
+            editSalesReturnInfo(params, this.return_time, this.$route.query.id, this.$route.query.type,this.form.manufacturer).then(response => {
               if (response.data.state == 0) {
                 this.$message.error(response.data.msg)
                 return false

src/xt_pages/stock/stockInOrderEdit.vue

@@ -406,7 +406,7 @@ export default {
             const params = {
               'stockIn': this.recordInfo.recordData
             }
-            EditWarehouse(params, this.warehousing_time, this.$route.query.id, this.$route.query.type).then(response => {
+            EditWarehouse(params, this.warehousing_time, this.$route.query.id, this.$route.query.type,this.form.manufacturer).then(response => {
               if (response.data.state == 0) {
                 this.$message.error(response.data.msg)
                 return false

src/xt_pages/stock/stockOutOrderEdit.vue

@@ -333,7 +333,7 @@
             const params = {
               'stockOut': this.recordInfo.recordData
             }
-            editWarehouseoutInfo(params, this.warehouse_out_time, this.$route.query.id, this.$route.query.type).then(response => {
+            editWarehouseoutInfo(params, this.warehouse_out_time, this.$route.query.id, this.$route.query.type,this.form.manufacturer).then(response => {
               if (response.data.state == 0) {
                 this.$message.error(response.data.msg)
                 return false
@@ -362,6 +362,8 @@
             }
             this.warehouseOut = response.data.data.info
             this.warehouse_out_time = this.getTime(this.warehouseOut.warehouse_out_time, '{y}-{m}-{d}')
+            this.form.manufacturer = this.warehouseOut.manufacturer
+
           }
 
           if (this.recordInfo.recordData.length == 0) {