Merge branch 'master' of http://git.shengws.com/csx/Vue_New

src/xt_pages/dialysis/template/DialysisPrintOrderThirteen.vue

@@ -86,13 +86,13 @@
           （<label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('中心静脉置管-左') > -1 ? true : false" showValue="左"></label-box>
               <label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('中心静脉置管-右') > -1 ? true : false" showValue="右"></label-box>）部位
           &nbsp;
-          <label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('颈内静脉') > -1 ? true : false" showValue="颈内"></label-box>
+          <label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('颈内') > -1 ? true : false" showValue="颈内"></label-box>
           &nbsp;
           <label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('锁骨下') > -1 ? true : false" showValue="锁骨下"></label-box>
           &nbsp;
-          <label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('股静脉') > -1 ? true : false" showValue="股"></label-box>
+          <label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('股') > -1 ? true : false" showValue="股"></label-box>
           &nbsp;
-          <label-box :isChecked="['内瘘-左','内瘘-右','中心静脉置管-左','中心静脉置管-右','颈内静脉','锁骨下','股静脉'].indexOf(predialysis.blood_access_part_opera_name) == -1? true : false" showValue="其他"></label-box>
+          <label-box :isChecked="['内瘘-左','内瘘-右','中心静脉置管-左','中心静脉置管-右','颈内','锁骨下','股'].indexOf(predialysis.blood_access_part_opera_name) == -1? true : false" showValue="其他"></label-box>
           &nbsp;
         </div>
       </div>

src/xt_pages/user/patients.vue

@@ -99,7 +99,7 @@
           class="filter-item"
           type="primary"
           size="small"
-        >下载错误日志
+        >下载日志
         </el-button>
 
         <el-button

src/xt_pages/workforce/appointment.vue

@@ -61,7 +61,7 @@
             class="filter-item"
             type="primary"
             size="small"
-          >下载错误日志
+          >下载日志
           </el-button>
 
           <el-button type="primary" size="small" icon="el-icon-printer" @click="printScheduleAction">打印</el-button>

src/xt_pages/workforce/template.vue

@@ -76,7 +76,7 @@
           class="filter-item"
           type="primary"
           size="small"
-        >下载错误日志
+        >下载日志
         </el-button>
 
         <!--<upload-excel style="float:right;" :on-success='handleSuccess' :before-upload="beforeUpload"></upload-excel>-->