Merge branch 'yanglilong' of git.ssish.com:sunhailiang/bims into test

src/api/state_code.js

@@ -14,7 +14,7 @@ const TOKEN_INVLIDE_TO_LOGIN = (code) => {
       });
     }
     // 清除个人数据
-    store.commit("user/setUserInfo", "");
+    store.commit("common/setUserInfo", "");
     route.replace({
       path: "/login",
       query: {

src/router/modules/menu.js

@@ -96,7 +96,7 @@ export default [
   {
     icon: "ssiscan",
     path: "/bi",
-    title: "报销",
+    title: "报表",
     children: [],
   },
 ];

src/views/info/components/companyDiscount.vue

@@ -30,7 +30,7 @@
     </a-table>
     <!--分页-->
     <BurtPagination :pagination="pagination" @pageChange="getTableList" />
-    <a-modal title="编辑" :visible="dialogShow" width="60%" :maskClosable="false"
+    <a-modal :title="editFormObj.id?'编辑':'新增'" :visible="dialogShow" width="60%" :maskClosable="false"
       okText="确定" cancelText="取消"  @ok="handleEditOK" @cancel="dialogShow = false">
       <a-form-model layout="vertical" ref="editForm" :model="editFormObj" :rules="editRules">
         <a-row :gutter="30">

src/views/info/index.vue

@@ -97,17 +97,16 @@
         <span>{{ filterSpecialty(record.specialtyList) }}</span>
       </template>
       <template slot="operation" slot-scope="text, record, index">
-        <a-button type="link" @click.stop="editEvt(record)">{{ record.edit ? "保存" : "修改"}}</a-button>
+        <a-button type="link" @click.stop="editEvt(record)">修改</a-button>
         <a-button type="link" class="danger" @click.stop="delRecord(index)">删除</a-button>
       </template>
     </a-table>
     <!--分页-->
     <BurtPagination :pagination="pagination" @pageChange="getDoctorList" />
-    <a-modal title="编辑" :visible="dialogShow" width="700px" :maskClosable="false"
+    <a-modal title="编辑" :visible="dialogShow" width="60%" :maskClosable="false"
       okText="确定" cancelText="取消"
       @ok="handleEditOK" @cancel="dialogShow = false">
-      <a-form-model ref="editForm" :model="editFormObj"
-        :rules="editRules" :label-col="labelCol" :wrapper-col="wrapperCol">
+      <a-form-model ref="editForm" :model="editFormObj" :rules="editRules">
         <a-form-model-item label="科室" prop="specialtyList">
           <a-select v-model="editFormObj.specialtyList" placeholder="请选择" mode="multiple">
             <a-select-option :value="item.id" v-for="item in specialtyList" :key="item.id">{{ item.specialtyDesc }}</a-select-option>
@@ -157,8 +156,6 @@ export default {
   data() {
     return {
       dialogShow: false,
-      labelCol: { span: 4 },
-      wrapperCol: { span: 20 },
       columns,
       dataList: [],
       detailObj: {}, //详细信息