imeik-bizui 1.7.9 → 1.8.1

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

@@ -34,6 +34,7 @@
             <ImOneLineDot :text="formatPhone(row.doctorPhone)">手机号：{{ formatPhone(row.doctorPhone) }}</ImOneLineDot>
             <ImOneLineDot :text="row.doctorType">类型：{{ row.doctorType }}</ImOneLineDot>
             <ImOneLineDot :text="row.doctorPost">职称：{{ row.doctorPost }}</ImOneLineDot>
+            <ImOneLineDot :text="row.doctorExpertType">医生类专家类别：{{ row.doctorExpertType }}</ImOneLineDot>
           </div>
         </div>
       </template>
@@ -68,17 +69,32 @@
           <p v-if="row.describe" class="tips-text">{{ row.describe }}</p>
         </div>
       </template>
+      <!-- 活动身份 -->
+      <template slot="identity" slot-scope="{ row }">
+        <div v-if="!isView">
+          <ImSelect
+            v-model="row.identity"
+            :class="{ 'is-error': row.valid === false && !row.identity }"
+            :attrs="{ options: row.shenfenList_new }"
+            @input="(val) => handleChangeIdentity(val, row)"
+          ></ImSelect>
+        </div>
+        <div v-else>
+          <ImDiffText v-if="showDiff" :show-diff="showDiff" />
+        </div>
+      </template>
       <!-- 授课名称 -->
       <template slot="className" slot-scope="{ row }">
         <div v-if="!isView">
-          <el-input v-if="checkHasCourse(row)" v-model="row.courseName" placeholder="请输入" maxlength="100"></el-input>
-          <div v-else>-</div>
+          <ImInput  :class="{ 'is-error': row.valid === false && checkHasCourse(row) }"  v-model="row.className" placeholder="请输入" maxlength="100"></ImInput>
+
         </div>
         <div v-else>
           <ImDiffText v-if="showDiff" :show-diff="showDiff" :old-value="row.courseName" :no-absolute="true" :new-value="row._newData?.courseName" />
           <div v-else>{{ row.courseName }}</div>
         </div>
       </template>
+
       <!-- 费用金额 -->
       <template slot="costAmount" slot-scope="{ row }">
         <p v-if="checkStandardAmountsIsBeyond(row)" class="standardAmount">费用标准：{{ row.standardAmount }}</p>
@@ -228,6 +244,15 @@ export default {
             'min-width': '150'
           }
         },
+        {
+          label: '活动身份',
+          prop: 'identity',
+          type: 'slot',
+          slot: 'identity',
+          attrs: {
+            'min-width': '150'
+          }
+        },
         {
           label: '授课名称',
           prop: 'className',
@@ -335,7 +360,10 @@ export default {
         } else if (!item.doctorServiceSceneCode) {
           res && showMessage && this.$message.warning('请检查服务场景')
           res = false
-        } else if (!item.costAmount) {
+        } else if (this.checkHasCourse(item) && !item.className) {
+          res && showMessage && this.$message.warning('请填写授课名称')
+          res = false
+        }else if (!item.costAmount) {
           res && showMessage && this.$message.warning('请检查费用金额')
           res = false
         } else if (this.checkStandardAmountsIsBeyond(item) && !item.remark) {
@@ -397,17 +425,30 @@ export default {
     },
     // 获取场景列表
     getSceneList(data) {
+      console.log('getSceneList',data.doctorExpertType)
       if (data.doctorLevel) {
         this.scenarioLoading = true
-        getExpertServiceFee({ expertRoleCode: data.doctorLevel }).then((res) => {
+        getExpertServiceFee({ expertRoleCode: data.doctorLevel,doctorExpertType: data.doctorExpertType }).then((res) => {
           this.scenarioLoading = false
           if (res.code === 200) {
-            const list = JSON.parse(res.data)
+            const list = JSON.parse(res.data).sceneList
+
+            const shenfenList = JSON.parse(res.data).standardAmountList.map(item => ({
+              label: item.sceneAndIdentity,
+              value: item.sceneAndIdentity,
+              standardAmount:item.standardAmount
+            }))
+
             this.$set(data, 'scenarioList', list)
+            this.$set(data, 'shenfenList', shenfenList)
           }
         })
       }
     },
+    handleChangeIdentity(val,row){
+      const sceneInfo = row.shenfenList_new.find((item) => item.value === val)
+        this.$set(row, 'standardAmount', sceneInfo.standardAmount)
+    },
     // 修改专家回调
     changedoctorName(row, type) {
       // 写入专家信息
@@ -442,11 +483,21 @@ export default {
     // 修改场景回调
     changeScenario(val, row) {
       const sceneInfo = row.scenarioList.find((item) => item.value === val)
+      console.log(sceneInfo.label)
       if (sceneInfo) {
-        this.$set(row, 'standardAmount', sceneInfo.standardAmount)
         this.$set(row, 'doctorServiceSceneName', sceneInfo.label)
         this.$set(row, 'describe', sceneInfo.describe)
         this.$set(row, 'courseName', '')
+        // 修改：在过滤后，对每个项处理label，取_之后的部分
+        const shenfenList_new = row.shenfenList?.filter(item =>
+          item.label?.split('_')[0].includes(sceneInfo.label) ?? false
+        )?.map(item => ({
+          ...item,
+          // 修改：截取_后的文字，没有下划线时返回原label
+          label: item.label?.split('_')[1] ?? item.label ?? '',
+          value: item.value?.split('_')[1] ?? item.value ?? ''
+        })) ?? [];
+        this.$set(row, 'shenfenList_new', shenfenList_new)
       }
       this.checkStandardAmountsIsBeyond(row)
     },
@@ -457,6 +508,7 @@ export default {
         this.$set(row, 'doctorLevelName', roleInfo.label)
         this.$set(row, 'doctorServiceSceneCode', '')
         this.$set(row, 'describe', '')
+
       }
       this.getSceneList(row)
     },
@@ -501,12 +553,16 @@ export default {
     checkStandardAmountsIsBeyond(data) {
       return Number(data.costAmount) > Number(data.standardAmount)
     },
-    // 检查场景有没有授课
+    // 优化后方法：检查场景是否有活动身份
     checkHasCourse(data) {
-      if (!data.doctorServiceSceneName) {
-        return
+      if (!data.identity || !Array.isArray(data.shenfenList_new)) {
+        return false;
       }
-      return data.doctorServiceSceneName.includes('授课')
+      // 使用some替代find，直接返回布尔值
+      return data.shenfenList_new.some(item =>
+        item.value === data.identity &&
+        item.label?.includes('授课') // 安全访问label属性
+      );
     },
     formatChangeType(val) {
       switch (val) {
@@ -528,7 +584,7 @@ export default {
           sums[index] = '合计'
           return
         }
-        if (index === 6) {
+        if (index === 7) {
           const values = data.map((item) => {
             if (item._newData) {
               return item?._newData[column.property]

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

@@ -34,7 +34,11 @@ export default {
       return this.attrs.showDiff || false
     },
     diffValue() {
-      return this.attrs.diffValue
+      if (this.isObjectValue) {
+        return this.getObjectValue(this.attrs.diffValue)
+      } else {
+        return this.attrs.diffValue
+      }
     },
     /**
      * 标签视图类型