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

src/xt_pages/data/components/consumables.vue

@@ -66,7 +66,7 @@
      <div style="display:flex; align-items:center;margin-bottom:10px;">
         <el-button type="primary" size="mini" @click="BatchDelete()" v-if="$store.getters.xt_user.org_id == 9504 || $store.getters.xt_user.org_id == 10028">批量备案</el-button>
         <el-button type="primary" size="mini" v-if="$store.getters.xt_user.org_id != 9504 && $store.getters.xt_user.org_id != 10028" @click="GDYBBatchPutOnRecord">批量备案</el-button>
-        <el-link target="_blank" href="https://kuyi.shengws.com/stock_template.xlsx" :underline="false"
+        <!-- <el-link target="_blank" href="https://kuyi.shengws.com/stock_template.xlsx" :underline="false"
                  style="margin-left:15px">
           <el-button
             class="filter-item"
@@ -82,7 +82,7 @@
           class="filter-item"
           type="primary"
           size="small"
-        >下载日志
+        >下载日志 -->
         </el-button>
       </div>
 

src/xt_pages/data/components/drugs.vue

@@ -64,7 +64,7 @@
     <div style="display:flex; align-items:center;margin-bottom:10px;">
         <el-button type="primary" size="small" @click="BatchDelete()" v-if="$store.getters.xt_user.org_id == 9504 || $store.getters.xt_user.org_id == 10028" >批量备案</el-button>
         <el-button type="primary" size="small" v-if="$store.getters.xt_user.org_id != 9504 && $store.getters.xt_user.org_id != 10028" @click="GDYBBatchPutOnRecord()">批量备案</el-button>
-        <el-link target="_blank" href="https://kuyi.shengws.com/drug_template.xlsx" :underline="false"
+        <!-- <el-link target="_blank" href="https://kuyi.shengws.com/drug_template.xlsx" :underline="false"
                  style="margin-left:15px">
           <el-button
             class="filter-item"
@@ -81,7 +81,7 @@
           type="primary"
           size="small"
         >下载日志
-        </el-button>
+        </el-button> -->
       </div>
     <el-table :data="list" border style="width: 100%" :row-style="{ color: '#303133' }"
               :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)', color: '#606266'}"

src/xt_pages/data/components/project.vue

@@ -41,7 +41,7 @@
         <div style="display:flex; align-items:center;margin-bottom:10px;">
         <el-button type="primary" size="small" @click="BatchDelete()" v-if="$store.getters.xt_user.org_id == 9504 || $store.getters.xt_user.org_id == 10028" >批量备案</el-button>
         <el-button type="primary" size="small" v-if="$store.getters.xt_user.org_id != 9504 && $store.getters.xt_user.org_id != 10028" @click="GDYBBatchPutOnRecord()">批量备案</el-button>
-        <el-link target="_blank" href="https://kuyi.shengws.com/project_template.xlsx" :underline="false"
+        <!-- <el-link target="_blank" href="https://kuyi.shengws.com/project_template.xlsx" :underline="false"
                  style="margin-left:15px">
           <el-button
             class="filter-item"
@@ -60,7 +60,7 @@
           type="primary"
           size="small"
         >下载日志
-        </el-button>
+        </el-button> -->
       </div>
         <el-table :data="tableData" border style="width: 100%" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)', color: '#606266'}"  @selection-change="handleSelectionChange">
             <el-table-column

src/xt_pages/outpatientRegistration/index.vue

@@ -688,7 +688,8 @@
             cb([])
           }
         })
-      }, readingSZ() {
+      }, 
+      readingSZ() {
         var that = this
         if (this.form.id_card_type.length == 0 || this.form.id_card_type == 0) {
           this.$message.error('请先选择读卡类型')
@@ -737,7 +738,6 @@
           .catch(function(error) {
 
           })
-
       },
 
       reading(medicalInsuranceCard) {

src/xt_pages/outpatientRegistration/registrationHistory.vue

@@ -756,7 +756,8 @@
         }).then(() => {
           //
           let params = {
-            'patient_id': row.id,
+            'id':row.id,
+            'patient_id': row.patient_id,
             'record_time': row.record_date,
             'admin_user_id': this.$store.getters.xt_user.user.id
           }