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

src/views/charge-query/lpjManage.vue

@@ -19,8 +19,11 @@
           </a-form-model-item>
         </a-col>
         <a-col :lg="8" :sm="12">
-          <a-form-model-item label="寄送批号">
-            <a-input v-model="form.sendBatchNo" placeholder="请输入寄送批号" allow-clear />
+          <a-form-model-item label="寄送状态">
+            <a-select v-model="form.sendSts" placeholder="请选择寄送状态" allowClear>
+              <a-select-option value="1">已寄送</a-select-option>
+              <a-select-option value="2">未寄送</a-select-option>
+            </a-select>
           </a-form-model-item>
         </a-col>
       </a-row>
@@ -38,11 +41,10 @@
           </a-form-model-item>
         </a-col>
         <a-col :lg="8" :sm="12">
-          <a-form-model-item label="账单编号">
-            <a-input v-model="form.receiptNo" placeholder="请输入账单编号" allow-clear />
+          <a-form-model-item label="寄送批号">
+            <a-input v-model="form.sendBatchNo" placeholder="请输入寄送批号" allow-clear />
           </a-form-model-item>
         </a-col>
-        
         <a-col :sm="24" class="none-label">
           <div class="btn-div flex">
             <span></span>
@@ -71,6 +73,7 @@
       </template>
       <template slot="operation" slot-scope="text, record, index">
         <a-button type="link" @click.stop="editEvt(record)">编辑</a-button>
+        <a-button type="link" class="success" @click.stop="editEvt(record)">查看</a-button>
         <a-button type="link" class="danger" @click.stop="delRecord(index)">删除</a-button>
       </template>
     </a-table>
@@ -100,8 +103,9 @@ export default {
         dateRange: [],
         payorCode: '',
         sendBatchNo: '',
+        sendCompany: '',
         trackingNo: '',
-        receiptNo: '',
+        sendSts: '',
       },
       companyOptions: [], //保险公司
       expressList: [], //快递列表
@@ -165,8 +169,9 @@ export default {
         dateRange: [],
         payorCode: '',
         sendBatchNo: '',
+        sendCompany: '',
         trackingNo: '',
-        receiptNo: '',
+        sendSts: '',
       }
     },
     //编辑 

src/views/info/components/companyDiscount.vue

@@ -42,8 +42,8 @@
             </a-form-model-item>
           </a-col>
           <a-col :lg="12" :xs="24">
-            <a-form-model-item label="折扣比例" prop="ratio">
-              <a-input v-model.trim="editFormObj.ratio" placeholder="折扣比例" type="number" :min="0" />
+            <a-form-model-item label="折扣比例%" prop="ratio">
+              <a-input v-model.trim="editFormObj.ratio" placeholder="折扣比例%" type="number" :min="0" />
             </a-form-model-item>
           </a-col>
           <a-col :xs="24">

src/views/info/index.vue

@@ -115,6 +115,16 @@
       @ok="handleEditOK" @cancel="dialogShow = false">
       <a-form-model ref="editForm" :model="editFormObj" :rules="editRules">
         <a-row :gutter="30">
+          <a-col :lg="12" :sm="24">
+            <a-form-model-item label="工号" prop="doctorCode">
+              <a-input type="number" :min="0" v-model.trim="editFormObj.doctorCode" placeholder="工号" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :lg="12" :sm="24">
+            <a-form-model-item label="医生姓名" prop="doctorDesc">
+              <a-input v-model.trim="editFormObj.doctorDesc" placeholder="医生姓名" />
+            </a-form-model-item>
+          </a-col>
           <a-col :lg="12" :sm="24">
             <a-form-model-item label="医生英文名" prop="doctorDescLang1">
               <a-input v-model.trim="editFormObj.doctorDescLang1" placeholder="医生英文名" />
@@ -177,6 +187,8 @@ export default {
       languageList: [],
       editFormObj: {
         id: "",
+        doctorCode: '',
+        doctorDesc: '',
         doctorDescLang1: '',
         country: '',
         language: '',
@@ -294,6 +306,8 @@ export default {
     editEvt(record) {
       this.editFormObj = {
         id: record.id || "",
+        doctorCode: record.doctorCode || "",
+        doctorDesc: record.doctorDesc || "",
         doctorDescLang1: record.doctorDescLang1 || "",
         country: record.country || "",
         language: record.language || "",

src/views/verification/collection.vue

@@ -39,6 +39,7 @@
       </template>
       <template slot="operation" slot-scope="text, record, index">
         <a-button type="link" @click.stop="editEvt(record)">修改</a-button>
+        <a-button type="link" class="success" @click.stop="editEvt(record)">查看</a-button>
         <a-button v-if="record.backMoneyNo" type="link" class="danger" @click.stop="delRecord(index)">删除</a-button>
       </template>
     </a-table>

src/views/verification/index.vue

@@ -40,6 +40,7 @@
       </template>
       <template slot="operation" slot-scope="text, record, index">
         <a-button type="link" @click.stop="editEvt(record)">修改</a-button>
+        <a-button type="link" class="success" @click.stop="editEvt(record)">查看</a-button>
         <a-button v-if="record.eobNo" type="link" class="danger" @click.stop="delRecord(index)">删除</a-button>
       </template>
     </a-table>