Sfoglia il codice sorgente

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

yq1 1 mese fa
parent
commit
d291790485

+ 6 - 3
src/xt_pages/drugSourceCode/drugQuery.vue Vedi File

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

+ 1 - 1
src/xt_pages/user/physiqueprinting.vue Vedi File

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