Selaa lähdekoodia

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

28169 3 kuukautta sitten
vanhempi
commit
7381c2ff1f

+ 1 - 1
src/xt_pages/dialysis/template/DialysisPrintOrderFortySeven.vue Näytä tiedosto

426
                           predialysis.weight_after_last_transparency
426
                           predialysis.weight_after_last_transparency
427
                             ? predialysis.weight_after_last_transparency
427
                             ? predialysis.weight_after_last_transparency
428
                             : "未称重"
428
                             : "未称重"
429
-                        }}</span>``
429
+                        }}</span>
430
                         <!-- {{ predialysis.weight_after_last_transparency ? parseFloat(lastafterdialysis.weight_after - lastafterdialysis.additional_weight).toFixed(1) : "未称重" }} -->
430
                         <!-- {{ predialysis.weight_after_last_transparency ? parseFloat(lastafterdialysis.weight_after - lastafterdialysis.additional_weight).toFixed(1) : "未称重" }} -->
431
                       </div>
431
                       </div>
432
                       kg
432
                       kg

+ 6 - 3
src/xt_pages/drugSourceCode/drugQuery.vue Näytä tiedosto

622
       };
622
       };
623
 
623
 
624
 
624
 
625
-      axios.get('http://127.0.0.1:9532/test/net',{}).then(function(response) {
625
+      axios.get('http://127.0.0.1:9531/test/net',{}).then(function(response) {
626
         if (response.data.state == 0) {
626
         if (response.data.state == 0) {
627
           that.isloading = false
627
           that.isloading = false
628
 
628
 
638
             .catch(() => {});
638
             .catch(() => {});
639
           return false
639
           return false
640
         } else {
640
         } else {
641
-
641
+          console.log("-------ssajsnaskjnajska")
642
           that.tableData = []
642
           that.tableData = []
643
+          console.log(that.stock_type)
644
+
643
           if(that.stock_type == 1){
645
           if(that.stock_type == 1){
644
             axios.get('http://127.0.0.1:9532/api/3508',{params:params}).then(function(response) {
646
             axios.get('http://127.0.0.1:9532/api/3508',{params:params}).then(function(response) {
645
               if (response.data.state == 0) {
647
               if (response.data.state == 0) {
751
             }).catch(function(error) {
753
             }).catch(function(error) {
752
             })
754
             })
753
 
755
 
754
-          }else if(this.stock_type == 6){
756
+          }else if(that.stock_type == 6){
757
+
755
             axios.get('http://127.0.0.1:9532/api/35081',{params:params}).then(function(response) {
758
             axios.get('http://127.0.0.1:9532/api/35081',{params:params}).then(function(response) {
756
               if (response.data.state == 0) {
759
               if (response.data.state == 0) {
757
                 that.$message.error(response.data.data.msg);
760
                 that.$message.error(response.data.data.msg);