imeik-bizui 2.0.2 → 2.0.4

package/dist/bizui/src/FieldExpertSelect/index.vue

@@ -19,7 +19,7 @@
           v-if="!isView"
           v-model="row.doctorNumber"
           :class="{ 'is-error': row.valid === false && !row.doctorNumber }"
-          :attrs="{ ...doctorAttrs, disabled: !!row.acceptanceDoctorTimes }"
+          :attrs="{ ...doctorAttrs, disabled: !!row.acceptanceDoctorTimes, loading: doctorLoading }"
           :listeners="{ focus: onDoctorFocus }"
           @input="changedoctorName(row)"
         ></ImSelect>
@@ -47,13 +47,18 @@
       <!-- 其他信息 -->
       <template slot="otherInfo" slot-scope="{ row }">
         <div class="expertOther">
+          <div>
+            <div v-if="Array.isArray(row.doctorOrg)">
+              <ImOneLineDot v-for="(item, index) in row.doctorOrg" :key="index" :text="item">{{ item }}</ImOneLineDot>
+            </div>
+          </div>
           <p v-if="!row.doctorNumber">-</p>
           <div v-else>
             <ImOneLineDot :text="row.doctorNumber">专家编号：{{ row.doctorNumber }}</ImOneLineDot>
             <ImOneLineDot :text="formatPhone(row.doctorPhone)">手机号：{{ formatPhone(row.doctorPhone) }}</ImOneLineDot>
-            <ImOneLineDot :text="row.doctorType">类型：{{ row.doctorType }}</ImOneLineDot>
-            <ImOneLineDot :text="row.doctorPost">职称：{{ row.doctorPost }}</ImOneLineDot>
-            <ImOneLineDot v-if="row.doctorExpertType" :text="row.doctorExpertType">医生类专家类别：{{ row.doctorExpertType }}</ImOneLineDot>
+            <ImOneLineDot :text="row.doctorType">类型：{{ row.doctorType || '-' }}</ImOneLineDot>
+            <ImOneLineDot :text="row.doctorPost">职称：{{ row.doctorPost || '-' }}</ImOneLineDot>
+            <ImOneLineDot v-if="row.doctorExpertType" :text="row.doctorExpertType">医生类专家类别：{{ row.doctorExpertType || '-' }}</ImOneLineDot>
           </div>
         </div>
       </template>
@@ -198,7 +203,8 @@ export default {
         remote: true,
         'remote-method': this.getExpertsList
       },
-      scenarioLoading: false
+      scenarioLoading: false,
+      doctorLoading: false
     }
   },
   computed: {
@@ -230,15 +236,6 @@ export default {
             'min-width': '120'
           }
         },
-        {
-          label: '执业机构',
-          prop: 'organizations',
-          type: 'slot',
-          slot: 'organizations',
-          attrs: {
-            'min-width': '140'
-          }
-        },
         {
           label: '其他信息',
           prop: 'otherInfo',
@@ -414,18 +411,24 @@ export default {
         page: 1,
         limit: 10
       }
-      getExpertsPageQuery(params).then((res) => {
-        if (res.code === 200) {
-          res.data.list.forEach((item) => {
-            item.label = item.doctorName
-            item.value = item.doctorNumber
-          })
-          this.doctorAttrs.options = res.data.list
-          data && this.changedoctorName(data, 'refresh')
-        } else {
-          this.$message.error(res.message)
-        }
-      })
+      this.doctorLoading = true
+      getExpertsPageQuery(params)
+        .then((res) => {
+          this.doctorLoading = false
+          if (res.code === 200) {
+            res.data.list.forEach((item) => {
+              item.label = item.doctorName
+              item.value = item.doctorNumber
+            })
+            this.doctorAttrs.options = res.data.list
+            data && this.changedoctorName(data, 'refresh')
+          } else {
+            this.$message.error(res.message)
+          }
+        })
+        .finally(() => {
+          this.doctorLoading = false
+        })
     },
     // 设置默认值
     setDefaultRoleInfo(data) {
@@ -497,6 +500,7 @@ export default {
       row.roleList = doctorInfo.doctorRoleInfoList.map((item) => ({ value: item.roleCode, label: item.roleName }))
       if (!type) {
         this.$set(row, 'doctorServiceSceneCode', '')
+        this.$set(row, 'doctorLevel', '')
         this.$set(row, 'describe', '')
         this.$set(row, 'identity', '')
         this.$set(row, 'courseName', '')
@@ -620,7 +624,7 @@ export default {
           sums[index] = '合计'
           return
         }
-        if (index === 7) {
+        if (index === 6) {
           const values = data.map((item) => {
             if (item._newData) {
               return item?._newData[column.property]