Browse Source

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

csx 3 years ago
parent
commit
8c0469fb7a

+ 2 - 2
config/index.js View File

29
 
29
 
30
     // host: 'xt.test.sgjyun.com',
30
     // host: 'xt.test.sgjyun.com',
31
     //  host: 'xt.kuyicloud.com',
31
     //  host: 'xt.kuyicloud.com',
32
-    host: 'xt.test.sgjyun.com',
33
-   // host: 'localhost',
32
+    // host: 'xt.test.sgjyun.com',
33
+   host: 'localhost',
34
     port: 9528, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
34
     port: 9528, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
35
     autoOpenBrowser: true,
35
     autoOpenBrowser: true,
36
     errorOverlay: true,
36
     errorOverlay: true,

+ 0 - 6
src/xt_pages/outpatientCharges/newStatementPrint.vue View File

154
 
154
 
155
       },
155
       },
156
       getInfo(order_id) {
156
       getInfo(order_id) {
157
-        if (this.$store.getters.xt_user.org_id == 3877 || this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 4  || this.$store.getters.xt_user.org_id == 9538 || this.$store.getters.xt_user.org_id == 9671 ||  this.$store.getters.xt_user.org_id == 9674 || this.$store.getters.xt_user.org_id == 10106 || this.$store.getters.xt_user.org_id == 9990 ) {
158
-
159
           var that = this;
157
           var that = this;
160
-
161
           axios.get('http://127.0.0.1:9532/api/settle/query', {
158
           axios.get('http://127.0.0.1:9532/api/settle/query', {
162
             params: {
159
             params: {
163
               order_id: order_id,
160
               order_id: order_id,
175
                 that.info = response.data.data.info;
172
                 that.info = response.data.data.info;
176
                 that.p_admin = response.data.data.printor_admin;
173
                 that.p_admin = response.data.data.printor_admin;
177
                 that.charge_admin = response.data.data.charge_admin;
174
                 that.charge_admin = response.data.data.charge_admin;
178
-
179
-
180
                 that.info['p_admin'] =  that.p_admin;
175
                 that.info['p_admin'] =  that.p_admin;
181
                 that.info['charge_admin'] =  that.charge_admin;
176
                 that.info['charge_admin'] =  that.charge_admin;
182
 
177
 
233
             .catch(function (error) {
228
             .catch(function (error) {
234
 
229
 
235
             });
230
             });
236
-        }
237
       }
231
       }
238
 
232
 
239
     },
233
     },

+ 0 - 2
src/xt_pages/outpatientCharges/settlementPrint.vue View File

162
 
162
 
163
     },
163
     },
164
     getInfo(order_id) {
164
     getInfo(order_id) {
165
-      if (this.$store.getters.xt_user.org_id == 3877 || this.$store.getters.xt_user.org_id == 9919 ||  this.$store.getters.xt_user.org_id == 9671 ||  this.$store.getters.xt_user.org_id == 9674 ||  this.$store.getters.xt_user.org_id == 10106  ||  this.$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9990 || this.$store.getters.xt_user.org_id == 0) {
166
 
165
 
167
         var that = this;
166
         var that = this;
168
 
167
 
237
           .catch(function (error) {
236
           .catch(function (error) {
238
 
237
 
239
           });
238
           });
240
-      }
241
     }
239
     }
242
   },
240
   },
243
   created() {
241
   created() {