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

config/index.js

@@ -29,8 +29,8 @@ module.exports = {
 
      // host: 'xt.test.sgjyun.com',
     //  host: 'xt.kuyicloud.com',
-    host: 'xt.test.sgjyun.com',
-    // host: 'localhost',
+    // host: 'xt.test.sgjyun.com',
+    host: 'localhost',
     port: 9528, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     autoOpenBrowser: true,
     errorOverlay: true,

src/xt_pages/dialysis/batch_print/batch_print_order_thirtyTwo.vue

@@ -874,11 +874,11 @@
                     <td width="150"></td>
                     <td width="30">医生</td>
                     <td width="80">
-                        <div class="under-line">
+                      <div class="under-line">
                         &nbsp;
                         <span v-if="setAdminUserES(record.prescription, 'creater') == ''">{{getAdminUser(record.prescription, 'creater')}}</span>
-                        <img class="es-img" :src="setAdminUserES(record.prescription, 'creater')" alt="" srcset="" v-else style="height: 30px;">
-                        </div>
+                        <img class="es-img" v-else style="height:30px;" :src="setAdminUserES(record.prescription, 'creater')" />
+                      </div>
                     </td>
                     <td width="50">穿刺护士</td>
                     <td width="80">
@@ -1220,6 +1220,25 @@ export default {
       })
   },
   methods: {
+    getComplication(complication){
+      if(complication.indexOf(',') == -1){
+        let str = complication
+        if(['无','头晕','头痛','呕吐','低血压','发热','抽搐','高血压','心律失常'].indexOf(str) == -1){
+          return str
+        }
+      }else if(complication.indexOf(',') > -1){
+        let str = complication
+        if(['无','头晕','头痛','呕吐','低血压','发热','抽搐','高血压','心律失常'].indexOf(str) == -1){
+          let newStr = ''
+          str.split(',').map(item => {
+            if(['无','头晕','头痛','呕吐','低血压','发热','抽搐','高血压','心律失常'].indexOf(item) == -1){
+              newStr += item + ','
+            }
+          })
+          return newStr.substring(0, newStr.length - 1)
+        }
+      }
+    },
     dialysateFormulationName(id) {
       if (id in this.dialysateFormulationOptions) {
         return this.dialysateFormulationOptions[id].name

src/xt_pages/dialysis/template/DialysisPrintOrderThirtyTwo.vue

@@ -946,7 +946,7 @@
           <td width="80">
             <div class="under-line">
               &nbsp;
-              <span v-if=" setAdminUserES(prescription.creater) == '' " >{{ getAdminUser(prescription.creater)}}</span >
+              <span v-if=" setAdminUserES(prescription.creater) == '' " >{{ getAdminUser(prescription.creater)}}</span>
               <img style="height:30px;" :src="setAdminUserES(prescription.creater)" alt="" srcset="" v-else  />
             </div>
           </td>

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -29,7 +29,6 @@
           </el-radio-group>
         </div>
         <div class="mainCell" style="margin-bottom:10px;">
-          <!--<el-input size="small" v-model="key" class="filter-item"/>-->
           <el-input size="small" @keyup.enter.native='searchAction' v-model.trim="search_input" class="filter-item"/>
           <el-button size="small" style="margin-left:10px;" class="filter-item" type="primary" @click="searchAction">
             搜索
@@ -80,17 +79,18 @@
           </el-button>
 
 
-          <!--<el-button v-loading="loadingtwo" v-if="this.hisPatientInfo.id > 0 && this.order.id == 0" size="small"-->
-                     <!--@click="open(4)"-->
-                     <!--type="primary">收费-->
-          <!--</el-button>-->
+          <el-button v-loading="loadingtwo" v-if="this.hisPatientInfo.id > 0 && this.order.id == 0" size="small"
+                     @click="open(4)"
+                     type="primary">收费
+          </el-button>
 
           <el-button size="small" @click="open(5)" type="primary"
                      v-if="this.hisPatientInfo.id > 0 && this.order.id > 0 &&  this.order.order_status == 2">退费
           </el-button>
-          <!-- <el-button size="small" @click="open(5)" type="primary"
-                    >退费
-          </el-button> -->
+
+          <!--<el-button size="small" @click="open(5)" type="primary"-->
+                    <!--&gt;退费-->
+          <!--</el-button>-->
 
 
           <!--<el-button v-if="this.info.prescription_status >= 2" size="small" @click="open(7)" type="primary"-->
@@ -105,15 +105,15 @@
           >结算单
           </el-button>
 
-          <!--<el-button v-if="this.$store.getters.xt_user.org_id == 9919"-->
-          <!--size="small" @click="open(10)" type="primary"-->
-          <!--&gt;退号-->
-          <!--</el-button>-->
+          <el-button v-if="this.$store.getters.xt_user.org_id == 9919"
+          size="small" @click="open(10)" type="primary"
+          >退号
+          </el-button>
 
-          <!--<el-button v-if="$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9919"-->
-          <!--size="small" @click="open(11)" type="primary"-->
-          <!--&gt;撤销明细-->
-          <!--</el-button>-->
+          <el-button v-if="$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9919"
+          size="small" @click="open(11)" type="primary"
+          >撤销明细
+          </el-button>
 
 
           <!--<el-button v-if="$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9919" size="small" @click="open(12)" type="primary"-->
@@ -553,6 +553,8 @@
         form['id'] = this.patientInfo.id
         form['record_time'] = this.record_date
         form['admin_user_id'] = this.$store.getters.xt_user.user.id
+        form['order_id'] = this.order.id
+
 
         if (this.activeName == 'first') {
           form['settle_accounts_type'] = 1
@@ -1582,7 +1584,7 @@
           this.loadingtwo = true
           if (this.$store.getters.xt_user.org_id == 9919) {
             var that = this
-            axios.get('http://127.0.0.1:9532/api/upload/get', {
+            axios.get('http://127.0.0.1:9532/api/pre_upload/get', {
               params: form
             })
               .then(function(response) {
@@ -1594,6 +1596,7 @@
                 } else {
                   that.loadingtwo = false
                   that.state = '预结算'
+
                   that.$message({ message: '预结算成功', type: 'success' })
                 }
               })