Merge branch 'yanglilong-0711' into 'master'

Yanglilong 0711

See merge request !9

README.md

@@ -13,13 +13,16 @@
 ### 接口文档地址
 [接口文档地址](http://git.ssish.com/root/core-ci/wikis/interface_document)
 
-### 测试
+### bug文档地址
+> https://doc.weixin.qq.com/sheet/e3_AJUAZgYxAAgc43lZU8US7aQNaosuJ?scode=AMoAawcKABAwUOv0vIACEApQbQAFk&tab=BB08J2
+
+### 测试  npm run build
 1. IP: 114.55.4.202
 2. 域名 http://nt.run4wd.com/bims
 3. 登录账密  admin/123456
 4. 发布目录：/datavg/bims/
 
-### 生产
+### 生产  npm run build
 1. IP: 139.224.200.172
 2. 域名 http://bims.medilink-global.com.cn
 3. 登录账密  admin/123456

package.json

@@ -4,7 +4,6 @@
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve  --mode development",
-    "build:test": "vue-cli-service build --mode development",
     "build": "vue-cli-service build --mode production --report",
     "lint": "vue-cli-service lint"
   },

src/api/apis_moudles/pre-auth.js

@@ -12,4 +12,5 @@ export default {
   authorizeUseList: "/backstage/auth/authorizeUseList",  //预授权使用列表
   authorizeUseAdd: "/backstage/auth/authorizeUseAdd",  //新增预授权使用
   authorizeSendEmail: "/backstage/auth/authorizeSendEmail",  //预授权邮件
+  authorizeEmailView: "/backstage/auth/authorizeEmailView",  //预览邮件
 };

src/api/funcs_modules/pre-auth.js

@@ -57,6 +57,11 @@ const AUTHORIZESENDEMAIL = function (data) {
   return req.post(apis.authorizeSendEmail, data);
 };
 
+//预览邮件
+const AUTHORIZEVIEWEMAIL = function (data) {
+  return req.post(apis.authorizeEmailView, data);
+};
+
 // 对象数组
 export default {
   PATIENTLISTNOPAGE,
@@ -70,4 +75,5 @@ export default {
   AUTHORIZEUSELIST,
   AUTHORIZEUSEADD,
   AUTHORIZESENDEMAIL,
+  AUTHORIZEVIEWEMAIL,
 };

src/views/info/components/infoDoctor.vue

@@ -118,6 +118,7 @@ export default{
         country: '',
         language: [],
         specialtyList: [],
+        jobStatus: '',
       },
       editRules: {
         specialtyList: [
@@ -211,6 +212,7 @@ export default{
         country: record.country || "",
         language: record.language? record.language.split(','): [],
         specialtyList: record.specialtyList || [],
+        jobStatus: record.jobStatus || ""
       };
       this.dialogShow = true;
     },

src/views/pre-auth/add.vue

@@ -133,19 +133,31 @@
           </a-form-model-item>
         </a-col>
         <a-col :lg="6" :sm="12">
-          <a-form-model-item label="补充材料">
+          <a-form-model-item label="文件上传">
             <a-upload name="file" :multiple="false" :showUploadList="true"
               :fileList="form.supplementalResult"
               :customRequest="(file)=>uploadFile(file, 2)"
               :beforeUpload="()=>beforeUpload(2)"
               :remove="(file)=>removeFile(file, 2)">
-              <a-button type="primary"> <Icon name="ssiupload" :size="18" />上传材料</a-button>
+              <a-button type="primary"> <Icon name="ssiupload" :size="18" />文件上传</a-button>
             </a-upload>
           </a-form-model-item>
         </a-col>
       </a-row>
-      <a-row>
-        <a-col :lg="24" :sm="12" class="none-label">
+      <a-row :gutter="30">
+        <a-col :lg="6" :sm="12">
+          <a-form-model-item label="预授权开始日期">
+            <a-date-picker allow-clear v-model="form.startDate" placeholder="请选择开始日期"
+              value-format="YYYY-MM-DD 00:00:00" />
+          </a-form-model-item>
+        </a-col>
+        <a-col :lg="6" :sm="12">
+          <a-form-model-item label="预授权截止日期">
+            <a-date-picker allow-clear v-model="form.endDate" placeholder="请选择截止日期"
+              value-format="YYYY-MM-DD 00:00:00" />
+          </a-form-model-item>
+        </a-col>
+        <a-col :lg="12" :sm="12" class="none-label">
           <a-form-model-item label="button">
             <a-button type="primary" @click="saveEvt" :loading="loading">
               <Icon :name="id?'ssibaocun':'ssiadd'" :size="14" />{{id? '保存预授权': '新建预授权'}}
@@ -154,10 +166,19 @@
               @click="sendEmailEvt">
               <Icon name="ssiemail" :size="14" />邮件发送
             </a-button>
+            <a-button type="primary" class="mar-left10" v-if="id"
+              @click="previewEmailEvt">
+              <Icon name="ssiemail" :size="14" />预览邮件
+            </a-button>
           </a-form-model-item>
         </a-col>
       </a-row>
     </a-form-model>
+
+    <a-modal title="邮件预览" :visible="previewModalShow" width="80%" :maskClosable="false"
+      :footer="null" @cancel="previewModalShow = false">
+      <div class="content-div" v-html="previewContent"></div>
+    </a-modal>
   </div>
 </template>
 
@@ -196,6 +217,8 @@ export default{
       ProjectList: [], //预授权项目
       rejectReason: [], //拒绝原因
       treatmentPlanList: [], //治疗方案
+      previewContent: '', //预览邮件内容
+      previewModalShow: false, //预览邮件弹窗
     }
   },
   components: {
@@ -451,6 +474,24 @@ export default{
           this.$message.warning(res.returnMsg);
         }
       })
+    },
+    //预览邮件
+    previewEmailEvt(){
+      this.$apis.AUTHORIZEVIEWEMAIL({
+        id: this.id
+      })
+      .then((res)=>{
+        this.loading2 = false;
+        if(res.returnCode == '0000'){
+          let data = res.content || {};
+          //防止图片或者视频超过弹窗的宽度
+          this.previewContent = ( data.content || "").replace(/<img/gi,"<img style='max-width:100%;height:auto;'")
+							            .replace(/<video/gi,"<video style='width:100%;height:auto;'");
+          this.previewModalShow = true;
+        }else{
+          this.$message.warning(res.returnMsg);
+        }
+      })
     }
   }
 }
@@ -460,4 +501,8 @@ export default{
 .footer-body{
   margin-top: 25px;
 }
+.content-div{
+  max-height: 70vh;
+  overflow-y: auto;
+}
 </style>
\ No newline at end of file

src/views/pre-auth/index.vue

@@ -41,16 +41,21 @@
             <a-input v-model="form.patientName" placeholder="请输入客户姓名" allow-clear />
           </a-form-model-item>
         </a-col>
-        <a-col :lg="12" :sm="12" class="none-label">
+        <a-col :lg="6" :sm="12">
+          <a-form-model-item label="预授权日期">
+            <a-range-picker format="YYYY年MM月DD日" v-model="form.dateRange2"  :placeholder="['开始日期', '结束日期']" />
+          </a-form-model-item>
+        </a-col>
+        <a-col :lg="6" :sm="12" class="none-label">
           <a-form-model-item label="button">
-            <a-button class="mar-left10" type="primary" @click="handlerSearch">
-              <Icon name="ssisearch_active" :size="14" />查询
+            <a-button type="primary" @click="handlerSearch">
+              <Icon name="ssisearch_active" :size="12" />查询
             </a-button>
-            <a-button class="mar-left10" type="primary" @click="reset">
-              <Icon name="ssireset" :size="14" />重置
+            <a-button class="mar-left5" type="primary" @click="reset">
+              <Icon name="ssireset" :size="12" />重置
             </a-button>
-            <a-button class="mar-left10" type="primary" @click="addPreAuth">
-              <Icon name="ssiadd" :size="14" />新建预授权</a-button>
+            <a-button class="mar-left5" type="primary" @click="addPreAuth">
+              <Icon name="ssiadd" :size="12" />新建预授权</a-button>
             </a-form-model-item>
         </a-col>
       </a-row>
@@ -108,6 +113,7 @@ export default{
       ApplyStatusOptions,
       form: {
         dateRange: [],
+        dateRange2: [],
         payorCode: '',
         authProject: '',
         authorStatus: '',
@@ -205,8 +211,11 @@ export default{
         ...this.form,
         createDateStart: this.form.dateRange[0]?moment(this.form.dateRange[0]).format('YYYY-MM-DD 00:00:00'):'',
         createDateEnd: this.form.dateRange[1]?moment(this.form.dateRange[1]).format('YYYY-MM-DD 00:00:00'):'',
+        startDate: this.form.dateRange2[1]?moment(this.form.dateRange2[1]).format('YYYY-MM-DD 00:00:00'):'',
+        endDate: this.form.dateRange2[1]?moment(this.form.dateRange2[1]).format('YYYY-MM-DD 00:00:00'):'',
       }
       delete filter.dateRange;
+      delete filter.dateRange2;
       this.$apis.AUTHORIZELIST(filter)
       .then((res) => {
         if (res.returnCode == "0000") {
@@ -261,5 +270,7 @@ export default{
 </script>
 
 <style lang="less" scoped>
-
+.mar-left5{
+  margin-left: 5px;
+}
 </style>
\ No newline at end of file

src/views/welfare/info/components/benefits/index.vue

@@ -42,8 +42,8 @@
       <a-col :span="12">{{item.benefitDesc}}</a-col>
       <a-col :span="12" class="border-r">
         <a-row :gutter="10">
-          <a-col :span="12">{{item.benefitConditionDesc}}</a-col>
-          <a-col :span="12" class="border-r" v-if="item.remainingQuota || item.remainingQuota === 0">
+          <a-col :span="8">{{item.benefitConditionDesc}}</a-col>
+          <a-col :span="8" class="border-r" v-if="showRemainingQuota(item)">
             <a-row v-if="item.isEditRemainingQuota">
               <a-col :span="14">
                 <a-input v-model="remainingQuotaForm[item.benefitCode]" placeholder="请输入剩余金额"></a-input>
@@ -55,6 +55,7 @@
             </a-row>
             <p v-else @dblclick="editRemainingQuota(item, index)" title="双击可编辑剩余金额">剩余{{item.remainingQuota}}元</p>
           </a-col>
+          <a-col :span="8">{{item.modifierDate}}</a-col>
         </a-row>
       </a-col>
     </a-row>
@@ -83,6 +84,9 @@ export default {
     this._getBenefitData();
   },
   methods: {
+    showRemainingQuota(item){
+      return item.remainingQuota || item.remainingQuota === 0;
+    },
     // 编辑剩余金额的打开与取消
     editRemainingQuota(data, index) {
       const val = data.isEditRemainingQuota