Browse Source

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

csx 4 years ago
parent
commit
e7a2766837

+ 3 - 3
package-lock.json View File

@@ -3515,9 +3515,9 @@
3515 3515
       "dev": true
3516 3516
     },
3517 3517
     "element-ui": {
3518
-      "version": "2.13.0",
3519
-      "resolved": "https://registry.npmjs.org/element-ui/-/element-ui-2.13.0.tgz",
3520
-      "integrity": "sha512-KYsHWsBXYbLELS8cdfvgJTOMSUby3UEjvsPV1V1VmgJ/DdkOAS4z3MiOrPxrT9w2Cc5lZ4eVSQiGhYFR5NVChw==",
3518
+      "version": "2.13.2",
3519
+      "resolved": "https://registry.npmjs.org/element-ui/-/element-ui-2.13.2.tgz",
3520
+      "integrity": "sha512-r761DRPssMPKDiJZWFlG+4e4vr0cRG/atKr3Eqr8Xi0tQMNbtmYU1QXvFnKiFPFFGkgJ6zS6ASkG+sellcoHlQ==",
3521 3521
       "requires": {
3522 3522
         "async-validator": "~1.8.1",
3523 3523
         "babel-helper-vue-jsx-merge-props": "^2.0.0",

+ 1 - 1
package.json View File

@@ -46,7 +46,7 @@
46 46
     "driver.js": "0.5.2",
47 47
     "dropzone": "5.2.0",
48 48
     "echarts": "3.8.5",
49
-    "element-ui": "^2.13.0",
49
+    "element-ui": "^2.13.2",
50 50
     "file-saver": "^1.3.3",
51 51
     "font-awesome": "4.7.0",
52 52
     "js-cookie": "2.2.0",

+ 7 - 7
src/xt_pages/dialysis/components/allSummaryDialog.vue View File

@@ -21,13 +21,13 @@
21 21
         @change="handleSchedule">
22 22
         </el-date-picker>
23 23
         <el-button icon="el-icon-printer" type="primary" @click="toPrint">打印</el-button>
24
-        
24
+
25 25
     </div>
26 26
     <div style="margin-top:10px;">
27 27
         <el-table :data="tableData" border style="width: 100%" height="300">
28 28
             <el-table-column align="center" prop="date" label="商品类型" width="180">
29 29
                <template slot-scope="scope">
30
-                  <span v-if="scope.row.stage == 1">{{scope.row.type_name}}</span> 
30
+                  <span v-if="scope.row.stage == 1">{{scope.row.type_name}}</span>
31 31
                   <span v-if="scope.row.stage == 2">抗凝剂</span>
32 32
                </template>
33 33
             </el-table-column>
@@ -88,7 +88,7 @@ export default {
88 88
     },
89 89
     created(){
90 90
       //获取统计表数据
91
-      this.getlist()   
91
+      this.getlist()
92 92
     },
93 93
     methods:{
94 94
         _close: function(done) {
@@ -119,18 +119,18 @@ export default {
119 119
               start_time:this.start_time,
120 120
               end_time:this.end_time
121 121
             }
122
-           console.log("params======",params)
122
+           console.log("params",params)
123 123
           getGatherList(params).then(response=>{
124 124
             if(response.data.state == 1){
125 125
               var arr = []
126
-              var warehouselist = response.data.data.warehouselist    
126
+              var warehouselist = response.data.data.warehouselist
127 127
               for(let i=0;i<warehouselist.length;i++){
128 128
                  warehouselist[i].stage = 1
129 129
               }
130 130
              console.log("warehouselist",warehouselist)
131 131
               arr.push(...warehouselist)
132
-              var consumables =  response.data.data.consumables            
133
-             
132
+              var consumables =  response.data.data.consumables
133
+
134 134
               var count = response.data.data.count
135 135
               for(let j=0;j<count.length;j++){
136 136
                  count[j].stage = 2

+ 2 - 18
src/xt_pages/dialysis/components/dialysisParametersDialog.vue View File

@@ -35,7 +35,7 @@
35 35
             </el-option>
36 36
         </el-select>
37 37
         <el-button icon="el-icon-printer" type="primary" @click="toPrint">打印</el-button>
38
-        
38
+
39 39
     </div>
40 40
     <div style="margin-top:10px;">
41 41
         <el-table :data="tableData" border style="width: 100%" height="300">
@@ -84,23 +84,7 @@ export default {
84 84
             schedulType: 0,
85 85
             partitionArr:[],
86 86
             partitionType: 0,
87
-            tableData: [{
88
-                date: '2016-05-02',
89
-                name: '王小虎',
90
-                address: '上海市普陀区金沙江路 1518 弄'
91
-                }, {
92
-                date: '2016-05-04',
93
-                name: '王小虎',
94
-                address: '上海市普陀区金沙江路 1517 弄'
95
-                }, {
96
-                date: '2016-05-01',
97
-                name: '王小虎',
98
-                address: '上海市普陀区金沙江路 1519 弄'
99
-                }, {
100
-                date: '2016-05-03',
101
-                name: '王小虎',
102
-                address: '上海市普陀区金沙江路 1516 弄'
103
-            }]
87
+            tableData: []
104 88
         }
105 89
     },
106 90
     created(){