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

src/xt_pages/dialysis/template/DialysisPrintOrderFortySeven.vue

@@ -426,7 +426,7 @@
                           predialysis.weight_after_last_transparency
                             ? predialysis.weight_after_last_transparency
                             : "未称重"
-                        }}</span>``
+                        }}</span>
                         <!-- {{ predialysis.weight_after_last_transparency ? parseFloat(lastafterdialysis.weight_after - lastafterdialysis.additional_weight).toFixed(1) : "未称重" }} -->
                       </div>
                       kg

src/xt_pages/drugSourceCode/drugQuery.vue

@@ -622,7 +622,7 @@ export default {
       };
 
 
-      axios.get('http://127.0.0.1:9532/test/net',{}).then(function(response) {
+      axios.get('http://127.0.0.1:9531/test/net',{}).then(function(response) {
         if (response.data.state == 0) {
           that.isloading = false
 
@@ -638,8 +638,10 @@ export default {
             .catch(() => {});
           return false
         } else {
-
+          console.log("-------ssajsnaskjnajska")
           that.tableData = []
+          console.log(that.stock_type)
+
           if(that.stock_type == 1){
             axios.get('http://127.0.0.1:9532/api/3508',{params:params}).then(function(response) {
               if (response.data.state == 0) {
@@ -751,7 +753,8 @@ export default {
             }).catch(function(error) {
             })
 
-          }else if(this.stock_type == 6){
+          }else if(that.stock_type == 6){
+
             axios.get('http://127.0.0.1:9532/api/35081',{params:params}).then(function(response) {
               if (response.data.state == 0) {
                 that.$message.error(response.data.data.msg);