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

src/xt_pages/hospitalStation/components/deskPrescription.vue

     <!-- <div class="backColor"></div> -->
     <div class="mainCenter" v-loading="loading">
       <div class="centerLeft">
+<!--        <el-button  size="small"-->
+<!--                    @click="open(1)"-->
+<!--                    type="primary">入院登记-->
+<!--        </el-button>-->
+
         <el-tabs v-model="dayorMonth" @tab-click="changeDayOrMonth">
           <el-tab-pane label="日结" name="day"></el-tab-pane>
           <el-tab-pane label="月结" name="month"></el-tab-pane>

src/xt_pages/hospitalStation/outpatientChargesManagement.vue

         <div class="mainCell fixedCell" style="margin-bottom:10px;">
 
           <div>
+            <div>入院时间：{{this.hisPatientInfo&&this.hisPatientInfo.in_hosptial_time?this.hisPatientInfo.in_hosptial_time:""}}</div>
             <el-button  size="small"
                        @click="open(1)"
                        type="primary">入院登记

src/xt_pages/outpatientCharges/summary.vue

                                    v-if="scope.row.order_status == 2&& scope.row.result.id == 0">
                             上传结算清单
                         </el-button>
+                      <el-button size="mini" type="primary" @click="cancelUpload(scope.row)"
+                                 v-if="scope.row.order_status == 2&& scope.row.result.id > 0">
+                        撤销结算清单
+                      </el-button>
                         <el-button size="mini" type="primary"
                                    v-if="scope.row.order_status == 2 && $store.getters.xt_user.org_id == 10106"
                                    @click="settlementPrint(scope.row)">结算单
             return '普通住院'
             break
         }
+      },cancelUpload(row){
+        var that = this
+        axios.get('http://127.0.0.1:9532/zh/api/clearsettle', {
+          params: {
+            order_id: row.id,
+            admin_user_id: this.$store.getters.xt_user.user.id
+          }
+        }).then(function(response) {
+          if (response.data.state == 0) {
+            that.$message.error(response.data.msg)
+            return false
+          } else {
+
+            if (response.data.data.failed_code == -10) {
+              // that.$message.error(response.data.data.msg)
+              that.$confirm(response.data.data.msg, '医保错误信息', {
+                confirmButtonText: '确 定',
+                type: 'warning'
+              }).then(() => {
+
+              }).catch(() => {
+              })
+
+            } else {
+              that.$message.success('撤销成功')
+              row.result.id = 0
+            }
+
+          }
+        }).catch(function(error) {
+        })
+
       },
       uploadInfo(row) {
         var that = this