XMLWAN 4 anni fa
parent
commit
0b280f0145

+ 1 - 1
src/api/his/his.js Vedi File

21
 
21
 
22
 
22
 
23
 export function createCaseHistory(params) {
23
 export function createCaseHistory(params) {
24
-  // console.log("params",params)
24
+  console.log("params",params)
25
   return request({
25
   return request({
26
     url: "/api/doctorworkstation/casehistory/create",
26
     url: "/api/doctorworkstation/casehistory/create",
27
     method: "get",
27
     method: "get",

+ 1 - 0
src/xt_pages/data/components/addtion.vue Vedi File

270
             }
270
             }
271
           })
271
           })
272
         } else if (val.isCreated == 1) {
272
         } else if (val.isCreated == 1) {
273
+          console.log("val00000",val)
273
           //新增
274
           //新增
274
           createAddition(val).then(response => {
275
           createAddition(val).then(response => {
275
             if (response.data.state == 0) {
276
             if (response.data.state == 0) {

+ 4 - 2
src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue Vedi File

1011
             }
1011
             }
1012
 
1012
 
1013
             for (let b = 0; b < this.prescriptions[i].project.length; b++) {
1013
             for (let b = 0; b < this.prescriptions[i].project.length; b++) {
1014
-              this.prescriptions[i].project[b].price = parseFloat(this.prescriptions[i].project[b].price)
1014
+              this.prescriptions[i].project[b].price = this.prescriptions[i].project[b].price.toString()
1015
               this.prescriptions[i].project[b].total = this.prescriptions[i].project[b].total.toString()
1015
               this.prescriptions[i].project[b].total = this.prescriptions[i].project[b].total.toString()
1016
             }
1016
             }
1017
 
1017
 
1018
             for (let b = 0; b < this.prescriptions[i].addition.length; b++) {
1018
             for (let b = 0; b < this.prescriptions[i].addition.length; b++) {
1019
               this.prescriptions[i].addition[b].id = parseInt(this.prescriptions[i].addition[b].id)
1019
               this.prescriptions[i].addition[b].id = parseInt(this.prescriptions[i].addition[b].id)
1020
               this.prescriptions[i].addition[b].item_id = parseInt(this.prescriptions[i].addition[b].item_id)
1020
               this.prescriptions[i].addition[b].item_id = parseInt(this.prescriptions[i].addition[b].item_id)
1021
-              this.prescriptions[i].addition[b].price = parseFloat(this.prescriptions[i].addition[b].price)
1021
+              this.prescriptions[i].addition[b].price = this.prescriptions[i].addition[b].price.toString()
1022
               this.prescriptions[i].addition[b].count = this.prescriptions[i].addition[b].count.toString()
1022
               this.prescriptions[i].addition[b].count = this.prescriptions[i].addition[b].count.toString()
1023
             }
1023
             }
1024
           }
1024
           }
1026
             'prescriptions': this.prescriptions
1026
             'prescriptions': this.prescriptions
1027
           }
1027
           }
1028
           isLoading = true
1028
           isLoading = true
1029
+          console.log("prescriptions9999",this.prescriptions)
1030
+          console.log("params---",params)
1029
           createHisPrescription(data, params).then(response => {
1031
           createHisPrescription(data, params).then(response => {
1030
             if (response.data.state == 1) {
1032
             if (response.data.state == 1) {
1031
               this.$emit("change")
1033
               this.$emit("change")

+ 1 - 1
src/xt_pages/stock/drugs/drugStockInOrderAdd.vue Vedi File

147
             </template>
147
             </template>
148
           </el-table-column>
148
           </el-table-column>
149
 
149
 
150
-          <el-table-column label="零价" align="center" width="150">
150
+          <el-table-column label="零价" align="center" width="150">
151
             <template slot-scope="scope">
151
             <template slot-scope="scope">
152
               {{ scope.row.retail_price }}
152
               {{ scope.row.retail_price }}
153
             </template>
153
             </template>

+ 1 - 1
src/xt_pages/stock/drugs/drugStockOutOrderAdd.vue Vedi File

182
           </el-table-column>
182
           </el-table-column>
183
 
183
 
184
 
184
 
185
-          <el-table-column label="零价" align="center" width="150">
185
+          <el-table-column label="零价" align="center" width="150">
186
             <template slot-scope="scope">
186
             <template slot-scope="scope">
187
               {{ scope.row.retail_price }}
187
               {{ scope.row.retail_price }}
188
             </template>
188
             </template>

+ 1 - 1
src/xt_pages/stock/stockQuery.vue Vedi File

157
       <el-pagination
157
       <el-pagination
158
         @size-change="handleSizeChange"
158
         @size-change="handleSizeChange"
159
         @current-change="handleCurrentChange"
159
         @current-change="handleCurrentChange"
160
-        :page-sizes="[10, 50, 100]"
160
+        :page-sizes="[10, 50, 100,200,500,1000]"
161
         :page-size="10"
161
         :page-size="10"
162
         background
162
         background
163
         align="right"
163
         align="right"

+ 15 - 2
src/xt_pages/workforce/components/nextTableWeeks.vue Vedi File

221
         path: "/schedule/remind/print/next?week_type=" + this.week_type+"&week_time="+this.week_time
221
         path: "/schedule/remind/print/next?week_type=" + this.week_type+"&week_time="+this.week_time
222
       });
222
       });
223
     },
223
     },
224
+   compare(property) {
225
+       return function (a, b) {
226
+          var value1 = a[property];
227
+          var value2 = b[property];
228
+          return value1 - value2;
229
+      }
230
+     },
224
     getNextScheduleWeekDay() {
231
     getNextScheduleWeekDay() {
225
         const params = {
232
         const params = {
226
           start_time:moment().week(moment().week() + 1).startOf('week').unix(),
233
           start_time:moment().week(moment().week() + 1).startOf('week').unix(),
232
       getNextScheduleWeekDay(params).then(response => {
239
       getNextScheduleWeekDay(params).then(response => {
233
         this.scheduleData = [];
240
         this.scheduleData = [];
234
         if (response.data.state == 1) {
241
         if (response.data.state == 1) {
235
-          this.scheduleData = response.data.data.schedule;
236
-          console.log("下周数据",response.data.data.schedule)
242
+          var scheduleData = response.data.data.schedule;
243
+          for(let i=0;i<scheduleData.length;i++){
244
+             scheduleData[i].sort = scheduleData[i].number.sort
245
+           }
246
+          var arr =   scheduleData.sort(this.compare('sort'))
247
+          // console.log("元旦快乐",arr)
248
+          this.scheduleData = arr
249
+        
237
          
250
          
238
         } else {
251
         } else {
239
           this.$message.error("网络错误");
252
           this.$message.error("网络错误");

+ 14 - 2
src/xt_pages/workforce/components/tableWeeks.vue Vedi File

220
         path: "/schedule/remind/print?week_type=" + this.week_type+"&week_time="+this.week_time
220
         path: "/schedule/remind/print?week_type=" + this.week_type+"&week_time="+this.week_time
221
       });
221
       });
222
     },
222
     },
223
+    compare(property) {
224
+       return function (a, b) {
225
+          var value1 = a[property];
226
+          var value2 = b[property];
227
+          return value1 - value2;
228
+      }
229
+     },
223
     getScheduleWeekDay() {
230
     getScheduleWeekDay() {
224
         const params = {
231
         const params = {
225
           week_type:this.week_type,
232
           week_type:this.week_type,
229
       getScheduleWeekDay(params).then(response => {
236
       getScheduleWeekDay(params).then(response => {
230
         this.scheduleData = [];
237
         this.scheduleData = [];
231
         if (response.data.state == 1) {
238
         if (response.data.state == 1) {
232
-          this.scheduleData = response.data.data.schdules;
233
-         
239
+           var scheduleData = response.data.data.schdules;
240
+           for(let i=0;i<scheduleData.length;i++){
241
+             scheduleData[i].sort = scheduleData[i].number.sort
242
+           }
243
+          var arr =   scheduleData.sort(this.compare('sort'))
244
+          // console.log("元旦快乐",arr)
245
+          this.scheduleData = arr
234
         } else {
246
         } else {
235
           this.$message.error("网络错误");
247
           this.$message.error("网络错误");
236
           return false;
248
           return false;