Quellcode durchsuchen

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

csx vor 3 Jahren
Ursprung
Commit
eea6c2fc17

+ 2 - 1
src/xt_pages/data/components/addDrugs.vue Datei anzeigen

@@ -545,6 +545,7 @@
545 545
           dose_unit:"",//剂量
546 546
           dose:"",//剂量单位
547 547
           prescribing_number_unit:"",
548
+          total:"",
548 549
         },
549 550
 
550 551
         rules: {
@@ -794,7 +795,7 @@
794 795
         form['drug_remark'] = this.form.drug_remark
795 796
         form['hosp_appr_flag'] = this.form.hosp_appr_flag
796 797
         form['lmt_used_flag'] = this.form.lmt_used_flag
797
-
798
+        form['total'] = this.form.total
798 799
         form['min_number'] = this.form.min_number
799 800
         form["drug_day"] = this.form.drug_day
800 801
         form['dose'] = this.form.dose,

+ 12 - 1
src/xt_pages/data/components/consumables.vue Datei anzeigen

@@ -34,7 +34,7 @@
34 34
             :value="item.value">
35 35
           </el-option>
36 36
         </el-select>
37
-       
37
+
38 38
       </div>
39 39
       <div>
40 40
         <el-button type="primary" @click="openForm()">新增</el-button>
@@ -312,6 +312,7 @@
312 312
               packing_price:'',
313 313
               default_count_unit:"",
314 314
               min_unit:"",
315
+              total:"",
315 316
             },
316 317
             isVisibility: false,
317 318
 
@@ -665,6 +666,13 @@
665 666
                 response.data.data.goodInfo.sort.toString()
666 667
             }
667 668
 
669
+            if (response.data.data.goodInfo.total <= 0) {
670
+              this.goodInfo.goodInfoDialog.formValue.total = ''
671
+            } else {
672
+              this.goodInfo.goodInfoDialog.formValue.total =
673
+                      response.data.data.goodInfo.total
674
+            }
675
+
668 676
 
669 677
             if (response.data.data.goodInfo.is_doctor_use <= 0) {
670 678
               this.goodInfo.goodInfoDialog.formValue.is_doctor_use = ''
@@ -696,6 +704,9 @@
696 704
             this.goodInfo.goodInfoDialog.formValue.packing_price = response.data.data.goodInfo.packing_price
697 705
             this.goodInfo.goodInfoDialog.formValue.default_count_unit = response.data.data.goodInfo.default_count_unit
698 706
             this.$refs.addConsumable.show(row.id, this.goodInfo.goodInfoDialog.formValue)
707
+
708
+
709
+
699 710
           }
700 711
         })
701 712
       },

+ 23 - 20
src/xt_pages/data/components/drugs.vue Datei anzeigen

@@ -7,7 +7,7 @@
7 7
         <el-button style="margin-right:10px;" class="filter-item" type="primary" icon="el-icon-search"
8 8
                    @click="searchAction">搜索
9 9
         </el-button>
10
-      
10
+
11 11
        <label class="title"><span class="name">生产厂商</span> : </label>
12 12
         <el-select v-model="manufacturer" style="width:140px;margin-right:10px;" placeholder="请选择" @change="changeManufacture">
13 13
           <el-option
@@ -26,7 +26,7 @@
26 26
             :value="item.value">
27 27
           </el-option>
28 28
         </el-select>
29
-   
29
+
30 30
 
31 31
         <span style="color: #909399;font-size:14px;">备案 : &nbsp;</span>
32 32
         <el-select v-model="is_record" style="width:140px;margin-right:10px;" placeholder="请选择" @change="changeRecord">
@@ -40,7 +40,7 @@
40 40
       </div>
41 41
       <div>
42 42
         <el-button type="primary" @click="openForm(0)">新增</el-button>
43
-       
43
+
44 44
       </div>
45 45
 
46 46
     </div>
@@ -315,7 +315,8 @@
315 315
           lmt_used_flag:'',
316 316
           dose_unit:'',
317 317
           min_price:'',
318
-          drug_day:"",//默认开药天数
318
+          drug_day:"",//默认开药天数,
319
+          total:"",
319 320
         },
320 321
         tempFormValue: {
321 322
           drug_name: '',//药品名称
@@ -373,6 +374,8 @@
373 374
           packing_unit:"",//包装单位
374 375
           packing_price:"",//包装零售价
375 376
           drug_day:"",//默认开药天数
377
+          total:"",
378
+
376 379
         },
377 380
 
378 381
         current_id: 0,
@@ -494,7 +497,7 @@
494 497
           console.log("9999999999999999999",val.min_number)
495 498
           val.min_number =  parseInt(val.min_number)
496 499
           console.log("min_22222222",val)
497
-         
500
+
498 501
           editBaseDrugLib(val,untit).then(response => {
499 502
             if (response.data.state == 0) {
500 503
               this.$message.error(response.data.msg);
@@ -508,7 +511,7 @@
508 511
         } else if (val.id == 0) {
509 512
           //新增
510 513
           console.log("val2222222",val)
511
-         
514
+
512 515
           createBaseDrugLib(val).then(response => {
513 516
             if (response.data.state == 0) {
514 517
               this.$message.error(response.data.msg);
@@ -939,7 +942,7 @@
939 942
            console.log("isHasMinUnit",isHasMinUnit)
940 943
           var isHasDosage =  header.includes('*剂量')
941 944
           console.log("isHasDosage",isHasDosage)
942
-        
945
+
943 946
           var isHasMaxUnit= header.includes('*剂量单位');
944 947
           console.log("isHasMaxUnit",isHasMaxUnit)
945 948
           var isHasPackingUnit = header.includes('*包装单位')
@@ -952,7 +955,7 @@
952 955
           console.log("isHasDrugOriginPlace",isHasDrugOriginPlace)
953 956
           var isHasDrugDosageForm = header.includes('*药品剂型');
954 957
           console.log("isHasDrugDosageForm",isHasDrugDosageForm)
955
-      
958
+
956 959
           var isHasUnitMatrixing= header.includes("*单位换算");
957 960
           console.log("isHasUnitMatrixing",isHasUnitMatrixing)
958 961
           var isHasRetailPrice = header.includes('*拆零零售价');
@@ -1024,7 +1027,7 @@
1024 1027
                obj['max_unit'] = results[i][key].replace(/\s/g,"")
1025 1028
               }
1026 1029
            }
1027
-          
1030
+
1028 1031
             if (results[i]['*包装单位'] === undefined) {
1029 1032
                 obj['packing_unit'] = ''
1030 1033
               } else {
@@ -1041,7 +1044,7 @@
1041 1044
                obj['delivery_way'] = results[i][key].replace(/\s/g,"")
1042 1045
               }
1043 1046
            }
1044
-          
1047
+
1045 1048
            if (results[i]['默认执行频率'] === undefined) {
1046 1049
                 obj['execution_frequency'] = ''
1047 1050
               } else {
@@ -1057,7 +1060,7 @@
1057 1060
                obj['drug_day'] = results[i][key].replace(/\s/g,"")
1058 1061
               }
1059 1062
            }
1060
-          
1063
+
1061 1064
 
1062 1065
 
1063 1066
             if (results[i]['*药品类型'] === undefined) {
@@ -1104,7 +1107,7 @@
1104 1107
            }
1105 1108
 
1106 1109
 
1107
-          
1110
+
1108 1111
 
1109 1112
             if (results[i]['*单位换算'] === undefined) {
1110 1113
                 obj['unit_matrixing'] = ''
@@ -1125,7 +1128,7 @@
1125 1128
               }
1126 1129
            }
1127 1130
 
1128
-          
1131
+
1129 1132
           if (results[i]['*包装零售价'] === undefined) {
1130 1133
                 obj['packing_price'] = ''
1131 1134
               } else {
@@ -1154,7 +1157,7 @@
1154 1157
 
1155 1158
 
1156 1159
 
1157
-          
1160
+
1158 1161
 
1159 1162
            if (results[i]['*默认单次用量'] === undefined) {
1160 1163
                 obj['drug_dose'] = ''
@@ -1190,7 +1193,7 @@
1190 1193
                 obj['dealer'] = results[i][key].replace(/\s/g,"")
1191 1194
               }
1192 1195
            }
1193
-          
1196
+
1194 1197
            if (results[i]['限制性用药'] === undefined) {
1195 1198
                 obj['lmt_used_flag'] = ''
1196 1199
               } else {
@@ -1198,7 +1201,7 @@
1198 1201
                 obj['lmt_used_flag'] = results[i][key].replace(/\s/g,"")
1199 1202
               }
1200 1203
            }
1201
-           
1204
+
1202 1205
 
1203 1206
 
1204 1207
            if (results[i]['药品别名'] === undefined) {
@@ -1209,7 +1212,7 @@
1209 1212
               }
1210 1213
            }
1211 1214
 
1212
-          
1215
+
1213 1216
              if (results[i]['药品类别'] === undefined) {
1214 1217
                 obj['drug_category'] = ''
1215 1218
               } else {
@@ -1236,7 +1239,7 @@
1236 1239
               }
1237 1240
            }
1238 1241
 
1239
-         
1242
+
1240 1243
 
1241 1244
             if (results[i]['审批标志'] === undefined) {
1242 1245
                 obj['hosp_appr_flag'] = ''
@@ -1343,7 +1346,7 @@
1343 1346
                 obj['limit_remark'] = results[i][key].replace(/\s/g,"")
1344 1347
               }
1345 1348
            }
1346
-           
1349
+
1347 1350
          }
1348 1351
          var newArr = [];
1349 1352
          tableData.push(obj);
@@ -1416,7 +1419,7 @@
1416 1419
           'drugs':tableData
1417 1420
         };
1418 1421
         console.log("params222222222",params)
1419
-        
1422
+
1420 1423
         postDrugInformation(params).then(response=>{
1421 1424
            if(response.data.state == 1){
1422 1425
              var msg =  response.data.data.msg;

+ 1 - 2
src/xt_pages/outpatientCharges/components/registerDialog.vue Datei anzeigen

@@ -155,7 +155,7 @@
155 155
                 </div>
156 156
             </el-form-item>
157 157
 
158
-            <el-form-item label="挂号类型:" prop="register" :validate-event="is_Name">
158
+            <el-form-item label="挂号类型:" :validate-event="is_Name">
159 159
                 <el-select v-model="form.register" placeholder="请选择" style="width:100%;">
160 160
                     <el-option
161 161
                             v-for="item in register"
@@ -327,7 +327,6 @@
327 327
           name: [{ required: true, message: '患者姓名不能为空', trigger: 'blur' }],
328 328
           gender: [{ required: true, message: '患者性别不能为空', trigger: 'blur' }],
329 329
           id_card: [{ required: true, message: '证件号码不能为空', trigger: 'blur' }],
330
-          register: [{ required: true, message: '请选择挂号类型', trigger: 'blur' }],
331 330
           doctor: [{ required: true, message: '请选择医生', trigger: 'blur' }],
332 331
           department: [{ required: true, message: '请填写科室', trigger: 'blur' }],
333 332
           age: [{ required: true, message: '患者年龄不能为空', trigger: 'blur' }],

+ 103 - 101
src/xt_pages/outpatientCharges/outpatientChargesManagement.vue Datei anzeigen

@@ -1040,105 +1040,109 @@
1040 1040
                   })
1041 1041
 
1042 1042
                 } else {
1043
-                  that.radio = 1
1044
-                  that.$refs.register.hide();
1045
-                  let params = {
1046
-                    'record_date': that.record_date
1047
-                  };
1048
-                  getChargeHisPatientList(params).then(response => {
1049
-                    if (response.data.state == 0) {
1050
-                      that.$message.error(response.data.msg);
1051
-                      return false
1052
-                    } else {
1053
-
1054
-                      that.loadingone = false;
1055
-                      that.$message({ message: '挂号成功', type: 'success' });
1056
-
1057
-                      that.patientTableData = []
1058
-                      that.all_table_data = []
1059
-                      that.hisPatientDatas = []
1060
-                      let one_count = 0
1061
-                      let two_count = 0
1062
-                      let three_count = 0
1063
-                      for (let i = 0; i < response.data.data.list.length; i++) {
1064
-                        if (response.data.data.list[i].his_patient.length == 0) { //没挂号
1065
-                          if (response.data.data.list[i].prescription.length > 0) {
1066
-                            let obj = {
1067
-                              id: response.data.data.list[i].id,
1068
-                              name: response.data.data.list[i].name,
1069
-                              number: '',
1070
-                              order_status: 0,
1071
-                              order_number: '',
1072
-                              his_patient_id: 0
1073
-                            }
1074
-
1075
-                            that.all_table_data.push(obj)
1076
-                          }
1077
-
1078
-                        } else { //挂号
1079
-                          if (response.data.data.list[i].his_patient.length == 1) {
1080
-                            let obj = {
1081
-                              id: response.data.data.list[i].id,
1082
-                              name: response.data.data.list[i].name,
1083
-                              number: response.data.data.list[i].his_patient[0].number,
1084
-                              order_status: response.data.data.list[i].his_patient[0].order.order_status,
1085
-                              his_patient_id: response.data.data.list[i].his_patient[0].id,
1086
-                              order_number: response.data.data.list[i].his_patient[0].order.number,
1087
-                              order_id: response.data.data.list[i].his_patient[0].order.id
1088
-                            }
1089
-                            that.all_table_data.push(obj)
1090
-
1091
-                          }
1092
-
1093
-                          if (response.data.data.list[i].his_patient.length > 1) {
1094
-                            for (let b = 0; b < response.data.data.list[i].his_patient.length; b++) {
1095
-                              let obj = {
1096
-                                id: response.data.data.list[i].id,
1097
-                                name: response.data.data.list[i].name,
1098
-                                number: response.data.data.list[i].his_patient[b].number,
1099
-                                order_status: response.data.data.list[i].his_patient[b].order.order_status,
1100
-                                his_patient_id: response.data.data.list[i].his_patient[b].id,
1101
-                                order_number: response.data.data.list[i].his_patient[b].order.number,
1102
-                                order_id: response.data.data.list[i].his_patient[b].order.id
1103
-                              }
1104
-                              that.all_table_data.push(obj)
1105
-
1106
-                            }
1107
-                          }
1108
-                        }
1109
-
1110
-                      }
1111
-
1112
-                      for (let i = 0; i < that.all_table_data.length; i++) {
1113
-                        if (that.all_table_data[i].his_patient_id > 0) {
1114
-                          that.hisPatientDatas.push(this.all_table_data[i])
1115
-                        }
1116
-                      }
1117
-
1118
-                      for (let i = 0; i < that.all_table_data.length; i++) {
1119
-                        if (that.all_table_data[i].order_status == 0 || that.all_table_data[i].order_status == 1 || that.all_table_data[i].order_status == 3) {
1120
-                          one_count = one_count + 1
1121
-                          that.patientTableData.push(that.all_table_data[i])
1122
-                        }
1123
-                        if (that.all_table_data[i].order_status == 2) {
1124
-                          two_count = two_count + 1
1125
-                          that.patientTableData.push(that.all_table_data[i])
1126
-                        }
1127
-                      }
1128
-                      that.cal_one = one_count
1129
-                      that.cal_two = two_count
1130
-                      that.cal_three = three_count
1131
-                      that.current_index = 0
1132
-                      for (let i = 0; i < that.patientTableData.length; i++) {
1133
-                        if (that.patientTableData[i].his_patient_id == that.hisPatientInfo.id) {
1134
-                          that.$refs.tab.setCurrentRow(that.patientTableData[i])
1135
-                          that.getPatientInformation(that.patientTableData[i].id, that.patientTableData[i].order_number, that.patientTableData[i].his_patient_id)
1136
-                        }
1137
-                      }
1138
-                      var his_info = response.data.data.his_info
1139
-                      that.hisPatientInfo = his_info
1140
-                    }
1141
-                  })
1043
+                  this.changeRadio(1)
1044
+                  this.$message({ message: '挂号成功', type: 'success', duration: 5000 })
1045
+                  this.$refs.register.hide()
1046
+                  this.loadingone = false
1047
+                  // that.radio = 1
1048
+                  // that.$refs.register.hide();
1049
+                  // let params = {
1050
+                  //   'record_date': that.record_date
1051
+                  // };
1052
+                  // getChargeHisPatientList(params).then(response => {
1053
+                  //   if (response.data.state == 0) {
1054
+                  //     that.$message.error(response.data.msg);
1055
+                  //     return false
1056
+                  //   } else {
1057
+                  //
1058
+                  //     that.loadingone = false;
1059
+                  //     that.$message({ message: '挂号成功', type: 'success' });
1060
+                  //
1061
+                  //     that.patientTableData = []
1062
+                  //     that.all_table_data = []
1063
+                  //     that.hisPatientDatas = []
1064
+                  //     let one_count = 0
1065
+                  //     let two_count = 0
1066
+                  //     let three_count = 0
1067
+                  //     for (let i = 0; i < response.data.data.list.length; i++) {
1068
+                  //       if (response.data.data.list[i].his_patient.length == 0) { //没挂号
1069
+                  //         if (response.data.data.list[i].prescription.length > 0) {
1070
+                  //           let obj = {
1071
+                  //             id: response.data.data.list[i].id,
1072
+                  //             name: response.data.data.list[i].name,
1073
+                  //             number: '',
1074
+                  //             order_status: 0,
1075
+                  //             order_number: '',
1076
+                  //             his_patient_id: 0
1077
+                  //           }
1078
+                  //
1079
+                  //           that.all_table_data.push(obj)
1080
+                  //         }
1081
+                  //
1082
+                  //       } else { //挂号
1083
+                  //         if (response.data.data.list[i].his_patient.length == 1) {
1084
+                  //           let obj = {
1085
+                  //             id: response.data.data.list[i].id,
1086
+                  //             name: response.data.data.list[i].name,
1087
+                  //             number: response.data.data.list[i].his_patient[0].number,
1088
+                  //             order_status: response.data.data.list[i].his_patient[0].order.order_status,
1089
+                  //             his_patient_id: response.data.data.list[i].his_patient[0].id,
1090
+                  //             order_number: response.data.data.list[i].his_patient[0].order.number,
1091
+                  //             order_id: response.data.data.list[i].his_patient[0].order.id
1092
+                  //           }
1093
+                  //           that.all_table_data.push(obj)
1094
+                  //
1095
+                  //         }
1096
+                  //
1097
+                  //         if (response.data.data.list[i].his_patient.length > 1) {
1098
+                  //           for (let b = 0; b < response.data.data.list[i].his_patient.length; b++) {
1099
+                  //             let obj = {
1100
+                  //               id: response.data.data.list[i].id,
1101
+                  //               name: response.data.data.list[i].name,
1102
+                  //               number: response.data.data.list[i].his_patient[b].number,
1103
+                  //               order_status: response.data.data.list[i].his_patient[b].order.order_status,
1104
+                  //               his_patient_id: response.data.data.list[i].his_patient[b].id,
1105
+                  //               order_number: response.data.data.list[i].his_patient[b].order.number,
1106
+                  //               order_id: response.data.data.list[i].his_patient[b].order.id
1107
+                  //             }
1108
+                  //             that.all_table_data.push(obj)
1109
+                  //
1110
+                  //           }
1111
+                  //         }
1112
+                  //       }
1113
+                  //
1114
+                  //     }
1115
+                  //
1116
+                  //     for (let i = 0; i < that.all_table_data.length; i++) {
1117
+                  //       if (that.all_table_data[i].his_patient_id > 0) {
1118
+                  //         that.hisPatientDatas.push(this.all_table_data[i])
1119
+                  //       }
1120
+                  //     }
1121
+                  //
1122
+                  //     for (let i = 0; i < that.all_table_data.length; i++) {
1123
+                  //       if (that.all_table_data[i].order_status == 0 || that.all_table_data[i].order_status == 1 || that.all_table_data[i].order_status == 3) {
1124
+                  //         one_count = one_count + 1
1125
+                  //         that.patientTableData.push(that.all_table_data[i])
1126
+                  //       }
1127
+                  //       if (that.all_table_data[i].order_status == 2) {
1128
+                  //         two_count = two_count + 1
1129
+                  //         that.patientTableData.push(that.all_table_data[i])
1130
+                  //       }
1131
+                  //     }
1132
+                  //     that.cal_one = one_count
1133
+                  //     that.cal_two = two_count
1134
+                  //     that.cal_three = three_count
1135
+                  //     that.current_index = 0
1136
+                  //     for (let i = 0; i < that.patientTableData.length; i++) {
1137
+                  //       if (that.patientTableData[i].his_patient_id == that.hisPatientInfo.id) {
1138
+                  //         that.$refs.tab.setCurrentRow(that.patientTableData[i])
1139
+                  //         that.getPatientInformation(that.patientTableData[i].id, that.patientTableData[i].order_number, that.patientTableData[i].his_patient_id)
1140
+                  //       }
1141
+                  //     }
1142
+                  //     var his_info = response.data.data.his_info
1143
+                  //     that.hisPatientInfo = his_info
1144
+                  //   }
1145
+                  // })
1142 1146
                 }
1143 1147
               }
1144 1148
             })
@@ -1158,8 +1162,6 @@
1158 1162
               this.$message({ message: '挂号成功', type: 'success', duration: 5000 })
1159 1163
               this.$refs.register.hide()
1160 1164
               this.loadingone = false
1161
-              var his_info = response.data.data.his_info
1162
-              this.hisPatientInfo = his_info
1163 1165
             }
1164 1166
           })
1165 1167
         }

+ 11 - 9
src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue Datei anzeigen

@@ -272,10 +272,11 @@
272 272
                                         </el-table-column>
273 273
                                         <el-table-column label="库存" width="60">
274 274
                                             <template slot-scope="scope">
275
-                                                {{scope.row.total}}{{scope.row.total?scope.row.min_unit:''}} / {{
276
-                                                scope.row.total * (scope.row.dose / scope.row.min_number)}}
277
-                                                {{(scope.row.total * (scope.row.dose /
278
-                                                scope.row.min_number))?scope.row.max_unit:''}}
275
+                                                {{scope.row.total}}{{scope.row.total?scope.row.min_unit:''}}
276
+                                                <!--/ {{-->
277
+                                                <!--scope.row.total * (scope.row.dose / scope.row.min_number)}}-->
278
+                                                <!--{{(scope.row.total * (scope.row.dose /-->
279
+                                                <!--scope.row.min_number))?scope.row.max_unit:''}}-->
279 280
                                             </template>
280 281
                                         </el-table-column>
281 282
                                         <el-table-column label="单价" width="40">
@@ -1885,7 +1886,7 @@
1885 1886
             this.doctorValue = hisPatientInfo.doctor
1886 1887
             this.departmentValue = hisPatientInfo.department
1887 1888
           } else {
1888
-            if (admin_info.user_type == 2 || admin_info.user_type == 1) {
1889
+            if (admin_info.user_type == 2) {
1889 1890
               this.doctorValue = admin_info.admin_user_id
1890 1891
               if (admin_info.department_id == 0) {
1891 1892
                 if (this.department.length > 0) {
@@ -2048,6 +2049,7 @@
2048 2049
                 this.prescriptions[i].project[b].price = this.prescriptions[i].project[b].price.toString()
2049 2050
                 this.prescriptions[i].project[b].total = this.prescriptions[i].project[b].total.toString()
2050 2051
                 this.prescriptions[i].project[b].delivery_way = this.prescriptions[i].project[b].delivery_way.toString()
2052
+                this.prescriptions[i].project[b].single_dose = this.prescriptions[i].project[b].single_dose.toString()
2051 2053
 
2052 2054
               }
2053 2055
 
@@ -2477,12 +2479,12 @@
2477 2479
                   advice_id: 0,
2478 2480
                   id: temp3[b].id,
2479 2481
                   drug_name: temp3[b].advice_name,
2480
-                  single_dose: temp3[b].single_dose,
2482
+                  single_dose: temp3[b].single_dose.toString(),
2481 2483
                   delivery_way: temp3[b].delivery_way,
2482 2484
                   execution_frequency: temp3[b].execution_frequency,
2483 2485
                   retail_price: temp3[b].drug.retail_price.toString(),
2484 2486
                   remark: '',
2485
-                  day: 1,
2487
+                  day: "1",
2486 2488
                   prescribing_number: temp3[b].prescribing_number,
2487 2489
                   single_dose_unit: temp3[b].drug.min_unit,
2488 2490
                   prescribing_number_unit: temp3[b].drug.max_unit,
@@ -2542,10 +2544,10 @@
2542 2544
                   project_id: temp2[b].id,
2543 2545
                   project_name: temp2[b].project_name,
2544 2546
                   statistical_classification: temp2[b].statistical_classification,
2545
-                  single_dose: temp2[b].single_dose,
2547
+                  single_dose: temp2[b].single_dose.toString(),
2546 2548
                   delivery_way: temp2[b].delivery_way,
2547 2549
                   execution_frequency: temp2[b].execution_frequency,
2548
-                  number_days: temp2[b].number_days,
2550
+                  number_days: temp2[b].number_days.toString(),
2549 2551
                   total: temp2[b].total,
2550 2552
                   price: temp2[b].price,
2551 2553
                   remark: '',

+ 23 - 19
src/xt_pages/stock/Dialog/goodInfoDailog.vue Datei anzeigen

@@ -51,7 +51,7 @@
51 51
                 </el-option>
52 52
               </el-select>
53 53
             </el-form-item>
54
-           
54
+
55 55
            <div style="width:100%;">
56 56
               <div><span style="color:red;">*</span>单位&规格: <span style="color:#999">例如:FX80 * 60盒</span></div>
57 57
           </div>
@@ -73,7 +73,7 @@
73 73
                     </el-option>
74 74
                   </el-select>
75 75
               </el-form-item> -->
76
-            
76
+
77 77
               <el-form-item prop="packing_unit" class="noMargin">
78 78
                 <el-select v-model="form.packing_unit" style="width:160px;" placeholder="包装单位" @change="changePackingUnit">
79 79
                   <el-option
@@ -85,9 +85,9 @@
85 85
                 </el-select>
86 86
               </el-form-item>
87 87
             </div>
88
-                       
88
+
89 89
             <el-form-item label="生产厂商 : " prop="manufacturer" style="width:100%">
90
-             
90
+
91 91
                <el-select v-model="form.manufacturer" style="width:100%;" filterable placeholder="请选择">
92 92
                   <el-option
93 93
                     v-for="(item,index) in form.manufacturers"
@@ -113,7 +113,7 @@
113 113
             <el-form-item label="拆零零售价 : " prop="retail_price">
114 114
               <el-input v-model="form.retail_price" style="width:160px;" placeholder="" maxlength="30"></el-input>
115 115
             </el-form-item>
116
-         
116
+
117 117
             <el-form-item label="进货价 : " prop="buy_price">
118 118
               <el-input v-model="form.buy_price" style="width:160px;" placeholder="" maxlength="30"></el-input>
119 119
             </el-form-item>
@@ -165,7 +165,7 @@
165 165
                 </el-option>
166 166
               </el-select>
167 167
             </el-form-item>
168
-          
168
+
169 169
             <el-form-item label="状态 : " prop="good_status">
170 170
               <el-checkbox-group v-model="good_status">
171 171
                 <el-checkbox label="停用">停用</el-checkbox>
@@ -188,7 +188,7 @@
188 188
               </el-select>
189 189
             </el-form-item>
190 190
 
191
-          
191
+
192 192
 
193 193
             <el-form-item label="特殊医用材料标志:">
194 194
               <el-select v-model="form.special_medical " style="width:160px;" placeholder="请选择">
@@ -201,10 +201,10 @@
201 201
               </el-select>
202 202
             </el-form-item>
203 203
 
204
-            
204
+
205 205
 
206 206
            <el-form-item label="经销商 : " style="width:100%">
207
-             
207
+
208 208
                <el-select v-model="form.dealer" style="width:100%;" filterable placeholder="请选择">
209 209
                   <el-option
210 210
                     v-for="(item,index) in dealer"
@@ -225,7 +225,7 @@
225 225
       <el-tab-pane label="扩展数据" name="second">
226 226
         <el-form :model="form" label-width="120px"
227 227
                  style="display: flex;flex-wrap: wrap;justify-content: space-between;">
228
-         
228
+
229 229
           <el-form-item label="标签:" prop="sign">
230 230
             <el-select v-model="form.sign" style="width:160px;" placeholder="请选择">
231 231
               <el-option
@@ -292,7 +292,7 @@
292 292
           <el-form-item label="代理商:" prop="agent">
293 293
             <el-input v-model="form.agent" style="width:160px;" placeholder="" maxlength="30"></el-input>
294 294
           </el-form-item>
295
-         
295
+
296 296
           <el-form-item label="耗材编号:" prop="good_number">
297 297
             <el-input v-model="form.good_number" style="width:160px;" placeholder="" maxlength="30"></el-input>
298 298
           </el-form-item>
@@ -383,6 +383,7 @@
383 383
           packing_price:'',
384 384
           default_count_unit:"",
385 385
           min_unit:"",
386
+          total:"",
386 387
         },
387 388
 
388 389
         rules: {
@@ -463,10 +464,10 @@
463 464
           if(form.packing_unit == arr[j].name){
464 465
               this.unitList.push(arr[j])
465 466
             }
466
-          } 
467
+          }
467 468
           console.log("列表222",this.unitList)
468 469
         }
469
-       
470
+
470 471
         this.visible = true
471 472
         this.good_status =[]
472 473
         this.getlist()
@@ -512,6 +513,7 @@
512 513
               packing_price:'',
513 514
               default_count_unit:"",
514 515
               min_unit:"",
516
+              total:"",
515 517
             }
516 518
           this.good_status = []
517 519
           for (let key in tempform) {
@@ -554,7 +556,7 @@
554 556
           });
555 557
       },
556 558
       getValue: function() {
557
-        
559
+
558 560
         const form = {}
559 561
         form['specification_name'] = this.form.specification_name
560 562
         form['good_unit'] = this.form.good_unit
@@ -599,6 +601,8 @@
599 601
         form["packing_unit"]= this.form.packing_unit
600 602
         form["packing_price"] = this.form.packing_price
601 603
         form["default_count_unit"] = this.form.default_count_unit
604
+        form["total"] = this.form.total
605
+
602 606
         return form
603 607
       }, changeSelected: function(val) {
604 608
         console.log(val)
@@ -608,10 +612,10 @@
608 612
              page:this.page,
609 613
              limit:this.limit
610 614
           }
611
-        
615
+
612 616
         getManufacturerList(params).then(response=>{
613 617
            var manufacturerList =   response.data.data.manufacturer
614
-         
618
+
615 619
            this.manufacturerList = manufacturerList
616 620
         })
617 621
       },
@@ -622,7 +626,7 @@
622 626
           return false;
623 627
         } else {
624 628
           this.dealer = response.data.data.dealer;
625
-          
629
+
626 630
         }
627 631
        });
628 632
       },
@@ -655,7 +659,7 @@
655 659
            this.unitList.push(arr[i])
656 660
           }
657 661
         }
658
-        
662
+
659 663
       },
660 664
       changePackingUnit(val){
661 665
         if(this.form.min_unit == val){
@@ -681,7 +685,7 @@
681 685
       visible(val) {
682 686
         this.form = this.formValue
683 687
         this.good_unit = this.formValue.good_unit
684
-      
688
+
685 689
         if (this.isCreated == 1) {
686 690
           this.good_unit = ''
687 691
         }