Merge remote-tracking branch 'origin/master'

.env.development

@@ -38,3 +38,7 @@ VUE_APP_COURSE_DEFAULT = 1
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true
+# 患者信息
+VUE_APP_PATIENT_INFO = '客户信息'
+# 添加病人
+VUE_APP_ADD_PATIENT = '添加信息'

.env.prod-fcky

@@ -40,3 +40,8 @@ VUE_APP_COURSE_DEFAULT = 1
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true
+
+# 患者信息
+VUE_APP_PATIENT_INFO = '客户信息'
+# 添加病人
+VUE_APP_ADD_PATIENT = '添加信息'

src/api/course/userCourse.js

@@ -43,6 +43,14 @@ export function delUserCourse(courseId) {
   })
 }
 
+// 复制课程
+export function copyUserCourse(courseId) {
+  return request({
+    url: '/course/userCourse/copy/' + courseId,
+    method: 'get'
+  })
+}
+
 // 导出课程
 export function exportUserCourse(query) {
   return request({
@@ -79,4 +87,4 @@ export function pullOff(courseIds) {
     url: '/course/userCourse/pullOff/' + courseIds,
     method: 'post'
   })
-}
+}

src/views/components/his/followMsgDetails.vue

@@ -173,7 +173,7 @@
         <el-descriptions-item label="问诊备注"><span v-if="reportItem!=null">{{reportItem.companyUserRemark}}</span></el-descriptions-item>
       </el-descriptions>
       <div class="desct">
-        患者信息
+        ${process.env.VUE_APP_VIDEO_LINE_1}
       </div>
       <el-descriptions :column="3" border  >
         <el-descriptions-item label="患者姓名" ><span v-if="reportItem.patientJson!=null">{{JSON.parse(reportItem.patientJson).patientName}}</span></el-descriptions-item>

src/views/components/his/inquiryOrderReportDetails.vue

@@ -27,7 +27,13 @@
         </el-descriptions>
   </div>
   <div class="contentx" v-if="item!=null">
-        <div class="desct" > 患者信息</div>
+        <div class="desct" > 
+          <span v-if="patientInfo">
+            {{ patientInfo }}
+          </span>
+          <span v-else>
+            患者信息
+          </span></div>
         <el-descriptions title="" :column="3" border>
           <el-descriptions-item label="患者姓名" ><span v-if="item!=null">{{JSON.parse(item.patientJson).patientName}}</span></el-descriptions-item>
           <el-descriptions-item label="患者年龄" ><span v-if="item!=null">{{JSON.parse(item.patientJson).age}}</span></el-descriptions-item>
@@ -88,6 +94,7 @@ import { listBySearch } from "@/api/his/inquiryDisease";
     props:["data"],
     data() {
       return {
+        patientInfo: process.env.VUE_APP_PATIENT_INFO,
         diseaseParams:{
           diseaseId:null,
           diseaseName:null

src/views/components/his/msgDetails.vue

@@ -173,7 +173,12 @@
         <el-descriptions-item label="问诊备注"><span v-if="reportItem!=null">{{reportItem.companyUserRemark}}</span></el-descriptions-item>
       </el-descriptions>
       <div class="desct">
-        患者信息
+        <span v-if="patientInfo">
+            {{ patientInfo }}
+          </span>
+          <span v-else>
+            患者信息
+          </span>
       </div>
       <el-descriptions :column="3" border  >
        <el-descriptions-item label="患者姓名" ><span v-if="reportItem.patientJson!=null">{{JSON.parse(reportItem.patientJson).patientName}}</span></el-descriptions-item>
@@ -263,6 +268,7 @@ import {getPrescribe,getDrugInfo} from "@/api/his/prescribe";
     name: "MsgList",
     data() {
       return {
+        patientInfo: process.env.VUE_APP_PATIENT_INFO,
         usageJson:{},
         prescribeItem:{},
         statusDrugReportOptions:[],

src/views/components/his/testReportDetails.vue

@@ -17,7 +17,14 @@
         </el-descriptions>
   </div>
   <div class="contentx" v-if="patientJson!=null">
-        <div class="desct" > 患者信息</div>
+        <div class="desct" > 
+          <span v-if="patientInfo">
+            {{ patientInfo }}
+          </span>
+          <span v-else>
+            患者信息
+          </span>
+        </div>
         <el-descriptions title="" :column="3" border >
             <el-descriptions-item label="患者名称"><span >{{patientJson.name}}</span></el-descriptions-item>
             <el-descriptions-item label="患者性别">
@@ -48,6 +55,7 @@ import { listTestReport, getTestReport, delTestReport, addTestReport, updateTest
     props:["data"],
     data() {
       return {
+        patientInfo: process.env.VUE_APP_PATIENT_INFO,
         item:null,
         formJson:null,
         conditioningPlanJson:null,

src/views/components/his/userDetails.vue

@@ -101,7 +101,12 @@
 
   <div class="contentx" v-if="item!=null">
         <div class="desct">
-          患者信息
+          <span v-if="patientInfo">
+            {{ patientInfo }}
+          </span>
+          <span v-else>
+            患者信息
+          </span>
         </div>
     <userPatietDetails  ref="userPatietDetail" />
 
@@ -145,6 +150,7 @@ import userAddDetails from "../his/userAddDetails.vue";
      components: { userStorerDetails ,userInquiryOrderDetails,userPatietDetails,userAddDetails},
     data() {
       return {
+        patientInfo: process.env.VUE_APP_PATIENT_INFO,
         addr:[],
         patient:[],
         userOptions: [],

src/views/components/his/userPatietDetails.vue

@@ -176,6 +176,7 @@ export default {
   name: "Patient",
   data() {
     return {
+      addPatientInfo: process.env.VUE_APP_ADD_PATIENT,
       show:{
          title:"患者详情",
          open:false,
@@ -355,7 +356,7 @@ export default {
     handleAdd() {
       this.reset();
       this.open = true;
-      this.title = "添加病人";
+      this.title = this.addPatientInfo||"添加病人";
     },
     /** 修改按钮操作 */
     handleUpdate(row) {

src/views/course/userCourse/index.vue

@@ -135,6 +135,14 @@
             v-hasPermi="['course:userCourse:edit']"
           >修改
           </el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleCopy(scope.row)"
+            v-hasPermi="['course:userCourse:copy']"
+          >复制
+          </el-button>
           <el-button
             size="mini"
             type="text"
@@ -209,6 +217,9 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-form-item label="排序" prop="sort">
+          <el-input-number v-model="form.sort"  :min="0" label="请输入排序"></el-input-number>
+        </el-form-item>
         <el-form-item label="课程封面" prop="imgUrl">
           <ImageUpload v-model="form.imgUrl" type="image" :num="10" :width="150" :height="150"/>
         </el-form-item>
@@ -246,6 +257,7 @@ import {
   updateUserCourse,
   exportUserCourse,
   updateIsShow,
+  copyUserCourse,
   putOn,
   pullOff
 } from "@/api/course/userCourse";
@@ -627,6 +639,21 @@ export default {
         }
       });
     },
+    /** 复制按钮操作 */
+    handleCopy(row) {
+      const courseId = row.courseId;
+      this.$confirm('是否确认复制课程编号为"' + courseId + '"的数据项?', "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function () {
+        return copyUserCourse(courseId);
+      }).then(() => {
+        this.getList();
+        this.msgSuccess("复制成功");
+      }).catch(() => {
+      });
+    },
     /** 删除按钮操作 */
     handleDelete(row) {
       const courseIds = row.courseId || this.ids;

src/views/his/patient/index.vue

@@ -262,6 +262,7 @@ export default {
   components: {patientDetails},
   data() {
     return {
+      addPatientInfo: process.env.VUE_APP_ADD_PATIENT,
       show:{
               title:"患者详情",
               open:false,
@@ -431,7 +432,7 @@ export default {
     handleAdd() {
       this.reset();
       this.open = true;
-      this.title = "添加病人";
+      this.title = this.addPatientInfo||"添加病人";
     },
     /** 修改按钮操作 */
     handleUpdate(row) {