Merge branch 'dev-0522' into 'release'

# Conflicts:
#   src/views/IM/diagnosis-admin/diagnosis-editor.vue

src/components/list/table-component.vue

@@ -12,6 +12,7 @@
         <el-table-column prop="orderNo" label="订单ID" min-width="170" align="center"></el-table-column>
         <el-table-column prop="diagnoseTypeStr" label="预约类型" min-width="150" align="center"></el-table-column>
         <el-table-column prop="statusStr" label="状态" min-width="150" align="center"></el-table-column>
+        <el-table-column prop="crrsName" label="招募人" min-width="170" align="center"></el-table-column>
         <el-table-column prop="operateUserName" label="运营人员" min-width="150" align="center"></el-table-column>
         <el-table-column prop="patientName" label="患者姓名" min-width="150" align="center"></el-table-column>
         <el-table-column prop="idCard" label="证件号" min-width="170" align="center"></el-table-column>
@@ -53,6 +54,7 @@
         </el-table-column>
         <el-table-column prop="payTypeStr" label="支付方式" min-width="150" align="center"></el-table-column>
         <el-table-column prop="sexStr" label="性别" min-width="150" align="center"></el-table-column>
+        <el-table-column prop="maritalStatusStr" label="婚否" min-width="150" align="center"></el-table-column>
         <el-table-column prop="age" label="年龄" min-width="150" align="center"></el-table-column>
         <el-table-column prop="idCardTypeStr" label="证件类型" min-width="170" align="center"></el-table-column>
         <el-table-column prop="userTitle" label="助诊医生职称" min-width="170" align="center"></el-table-column>
@@ -68,7 +70,6 @@
                 <span>{{scope.row.serviceFee | priceFilter}}</span>
             </template>
         </el-table-column>
-        <el-table-column prop="crrsName" label="招募人" min-width="170" align="center"></el-table-column>
         <el-table-column prop="remark" label="备注" min-width="200" align="center" show-overflow-tooltip></el-table-column>
         <el-table-column label="操作" fixed="right" align="center" min-width="200">
             <template slot-scope="scope">
@@ -175,4 +176,4 @@ export default {
 </script>
 
 <style>
-</style>
\ No newline at end of file
+</style>

src/router/router.js

@@ -5,6 +5,7 @@ const diagnosisList = r => require.ensure([], () => r(require('../views/IM/diagn
 const diagnosisIm = r => require.ensure([], () => r(require('../views/IM/diagnosis-admin/diagnosis-im.vue')), 'diagnosisIm')
 const diagnosisLive = r => require.ensure([], () => r(require('../views/IM/diagnosis-admin/diagnosis-live.vue')), 'diagnosisLive')
 const serviceList = r => require.ensure([], () => r(require('../views/IM/diagnosis-admin/service-list.vue')), 'serviceList')
+const assistList = r => require.ensure([], () => r(require('../views/IM/diagnosis-admin/assist-list.vue')), 'assistList')
 const diagnosisEditor = r => require.ensure([], () => r(require('../views/IM/diagnosis-admin/diagnosis-editor.vue')), 'diagnosisEditor')
 const diagnosisListLod = r => require.ensure([], () => r(require('../views/IM/diagnosis-admin/diagnosis-list-old.vue')), 'diagnosisListLod')
 
@@ -27,6 +28,9 @@ export default [{
         }, {
             path: '/service-List',
             component: serviceList
+        },  {
+            path: '/assist-list',
+            component: assistList
         }, {
             path: '/diagnosis-editor',
             component: diagnosisEditor

src/utils/filter.js

@@ -23,6 +23,17 @@ const vueFilter = {
         return value;
       }
    },
+  priceNum (value) {
+    if(value != "" && value != null && value != "null"){
+      return (value/100).toFixed(2);
+    }
+    else if(value == 0){
+      return (value/100).toFixed(2);
+    }
+    else {
+      return value;
+    }
+  },
     diagnosisTypeFilter: (value) => {
         if(value == 1) {
             return '音频'

src/views/IM/diagnosis-admin/diagnosis-list.vue

@@ -498,6 +498,23 @@ export default {
         },
         // 预约时间
         timeHandle(row) {
+            let bTime = new Date(row.userAppointBeginTime)
+            let eTime = new Date(row.userAppointEndTime)
+            if (this.activeName == 'three' &&  (new Date() - bTime) && (eTime - new Date())) {
+                this.$confirm('	当前问诊正在进行中，一旦将立即关闭进行中的问诊且无法恢复，确定继续更改时间?', '提醒', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'warning'
+                }).then(() => {
+                    this.timeHandleFn(row)
+                }).catch(() => {
+
+                })
+            } else {
+                this.timeHandleFn(row)
+            }
+        },
+        timeHandleFn(row) {
             this.beginFlag = false
             this.endFlag = false
             this.timeVisible = true