Merge remote-tracking branch 'origin/20230223_pc_vue_new_branch' into 20230223_pc_vue_new_branch

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);

src/xt_pages/user/physiqueprinting.vue

@@ -133,7 +133,7 @@
             </div>
             <span v-if="org_id!=10612">{{ patient.diagnose }}</span>
             <span style="font-weight: bold; display: block;">诊疗计划：</span>
-            <div v-for="(item,index) in treatment_plan_list" :key="index" style="line-height: 20px;" v-if="org_id == 0">
+            <div v-for="(item,index) in treatment_plan_list" :key="index" style="line-height: 20px;">
               {{index+1}}.<span>{{ item }}</span><br/>
             </div>
             <div style="text-align: right;margin-bottom: 10px;">