XMLWAN 3 years ago
parent
commit
44eaa5dec6

+ 2 - 2
config/index.js View File

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

+ 8 - 0
src/api/stock.js View File

@@ -761,3 +761,11 @@ export function SaveCheckedPrice(params) {
761 761
     params: params
762 762
   })
763 763
 }
764
+
765
+export function getAdjustPriceById(params) {
766
+  return request({
767
+    url: '/api/stock/getadjustpricebyid',
768
+    method: 'get',
769
+    params: params
770
+  })
771
+}

+ 12 - 5
src/xt_pages/stock/stockModifyPrice.vue View File

@@ -200,8 +200,7 @@
200 200
     <el-dialog
201 201
         title="库房调价"
202 202
         :visible.sync="dialogVisible"
203
-        width="1200px"
204
-        :before-close="handleClose">
203
+        width="1200px">
205 204
         <el-form :model="form" class="modifyDialog" label-width="120px">
206 205
             <el-form-item label="耗材名称">
207 206
                 <!-- <el-input v-model="form.name"></el-input> -->
@@ -465,7 +464,7 @@ export default {
465 464
             end_time:"",
466 465
             ids:"",
467 466
             check_time:new Date(),
468
-            checker:this.$store.getters.xt_user.user.user_name,
467
+            checker:this.$store.getters.xt_user.user.id,
469 468
             checkDialogVisible:false,
470 469
         }
471 470
     },
@@ -474,7 +473,11 @@ export default {
474 473
 
475 474
         },
476 475
         print(){
477
-            this.$router.push({path:'/stock/stockModifyPricePrint'})
476
+            if(this.ids == ""){
477
+              this.$message.error("请勾选打印数据")
478
+              return
479
+            }
480
+            this.$router.push({path:'/stock/stockModifyPricePrint?ids='+this.ids})
478 481
             
479 482
         },
480 483
         querySearchAsync(keyword, cb) {
@@ -676,6 +679,7 @@ export default {
676 679
     
677 680
      },
678 681
      SaveCheckedPrice(){
682
+       
679 683
          var params = {
680 684
             ids:this.ids,
681 685
             check_time:this.getTime(this.check_time),
@@ -684,7 +688,10 @@ export default {
684 688
        console.log("params",params)
685 689
        SaveCheckedPrice(params).then(response=>{
686 690
          if(response.data.state == 1){
687
-            
691
+           var adjustPrice = response.data.data.adjustPrice
692
+           this.$message.success("保存成功")
693
+           this.getAllStockPrice() 
694
+           this.checkDialogVisible = false
688 695
          }
689 696
        })
690 697
      }

+ 15 - 1
src/xt_pages/stock/stockModifyPricePrint.vue View File

@@ -77,6 +77,7 @@
77 77
 import BreadCrumb from '@/xt_pages/components/bread-crumb'
78 78
 const moment = require('moment');
79 79
 import { uParseTime } from '@/utils/tools'
80
+import { getAdjustPriceById} from "@/api/stock"
80 81
 export default {
81 82
     components:{
82 83
         BreadCrumb
@@ -101,10 +102,23 @@ export default {
101 102
             scanStyles: false
102 103
             })
103 104
         },
104
-
105
+       getAdjustPriceById(ids){
106
+           var params = {
107
+            ids:ids,
108
+           }
109
+         getAdjustPriceById(params).then(response=>{
110
+           if(response.data.state == 1){
111
+             var list = response.data.data.list
112
+             console.log("打印列表",list)
113
+           }
114
+         })
115
+       }
105 116
 
106 117
     },
107 118
     created(){
119
+      var ids = this.$route.query.ids
120
+      console.log("ids",ids)
121
+      this.getAdjustPriceById(ids)
108 122
     }
109 123
 }
110 124
 </script>

+ 13 - 14
src/xt_pages/user/templateSummary.vue View File

@@ -91,10 +91,10 @@
91 91
                 <div style="padding:10px;border-bottom:1px solid #DCDFE6;line-height:20px;">阶段小结化验结果:
92 92
                   <div>
93 93
                     <div v-for="item in editObj.template_inspection_content">
94
-                    <p style="font-weight: bold;margin: 10px 0;">{{ item.project_name }}</p>
94
+                    <p style="font-weight: bold;margin: 10px 0;">{{ item.project_name }} 检查日期:{{getTime(item.arr[0].inspect_date)}}</p>
95 95
                     <div style="display:flex;flex-wrap: wrap;">
96 96
                       <div v-for="it in item.arr" style="width:33%;">
97
-                        {{ it.item_name }} <span v-if="it.unit!=''">[{{it.unit}}]</span>
97
+                        {{ it.item_name }} <span v-if="it.unit!=''">[{{it.unit}}]</span>:
98 98
                         <span v-if="parseInt(it.inspect_value) < parseInt(it.range_min)">
99 99
                             {{it.inspect_value}}↓
100 100
                           </span> 
@@ -332,7 +332,7 @@
332 332
                         <p>{{ item.project_name }}</p>
333 333
                         <div style="display:flex;flex-wrap: wrap;">
334 334
                           <div v-for="it in item.arr" style="width:33%;">
335
-                           {{ it.item_name }} <span v-if="it.unit!=''"> [{{it.unit}}] </span>
335
+                           {{ it.item_name }} <span v-if="it.unit!=''"> [{{it.unit}}] </span>:
336 336
                              <span v-if="parseInt(it.inspect_value) < parseInt(it.range_min)">
337 337
                              {{it.inspect_value}}↓
338 338
                            </span> 
@@ -588,7 +588,7 @@
588 588
                         <p>{{ item.project_name }}</p>
589 589
                         <div style="display:flex;flex-wrap: wrap;">
590 590
                           <div v-for="it in item.arr" style="width:33%;">
591
-                            {{ it.item_name }} <span v-if="it.unit!=''"> [{{it.unit}}] </span>
591
+                            {{ it.item_name }} <span v-if="it.unit!=''"> [{{it.unit}}] </span>:
592 592
                              <span v-if="parseInt(it.inspect_value) < parseInt(it.range_min)">
593 593
                              {{it.inspect_value}}↓
594 594
                            </span> 
@@ -957,16 +957,15 @@
957 957
      
958 958
     },
959 959
     methods: {
960
-      getTime(val) {
961
-         if(val < 0){
962
-           return ""
963
-         }
964
-         if(val == ""){
965
-          return ""
966
-         }else {
967
-          return uParseTime(val, '{y}-{m}-{d}')
968
-         }
969
-      },
960
+    getTime(value, temp) {
961
+      if (value == 0) {
962
+        return ''
963
+      }
964
+      if (value != undefined) {
965
+        return uParseTime(value, temp)
966
+      }
967
+      return ''
968
+    },
970 969
       getTimeOne(val) {
971 970
          if(val < 0){
972 971
            return ""

+ 8 - 2
src/xt_pages/user/templateSummaryPrint.vue View File

@@ -52,10 +52,16 @@
52 52
         <span style="font-weight:bold;">阶段小结化验结果:</span>
53 53
         <div class="borderBox">
54 54
           <div v-for="item in patientList.template_inspection_content">
55
-            <p>{{ item.project_name }}</p>
55
+            <p>{{ item.project_name }} 检查日期:{{getTime(item.arr[0].inspect_date)}}</p>
56 56
             <div style="display:flex;flex-wrap: wrap;">
57 57
               <div v-for="it in item.arr" style="width:33%;">
58
-                {{ it.item_name }} {{ it.inspect_value }}
58
+            {{ it.item_name }} <span v-if="it.unit!=''"> [{{it.unit}}] </span>:
59
+                <span v-if="parseInt(it.inspect_value) < parseInt(it.range_min)">
60
+                  {{it.inspect_value}}↓
61
+                </span> 
62
+                <span v-if="parseInt(it.inspect_value) > parseInt(it.range_max)">
63
+                    {{it.inspect_value}}↑
64
+                </span> 
59 65
               </div>
60 66
             </div>
61 67
           </div>