Merge branch 'dev' into songshankun/adjust-style

songshankun

2023-10-10 5d0120d2e8a6e5cd2e1e95d4c5ffeecf5fc1c4a6

 src/views/service/serviceFollowup/DetailServiceFollowup.vue

@@ -17,11 +17,11 @@
        <div class="tab-view">
          <el-tabs v-model="activeName" @tab-click="tabsClick">
            <el-tab-pane label="详情" name="first"></el-tab-pane>
            <el-tab-pane label="附件管理" name="annex">
              <!-- <template slot="label">
            <!-- <el-tab-pane label="附件管理" name="annex"> -->
            <!-- <template slot="label">
                <div>跟进记录<el-badge type="primary" :value="2"> </el-badge></div>
              </template> -->
            </el-tab-pane>
            <!-- </el-tab-pane> -->
          </el-tabs>
        </div>
        <div v-if="activeName === 'first'" class="detail">
@@ -40,7 +40,7 @@
                    <div class="content-data">{{ item.leftValue ? item.leftValue : "--" }}</div>
                  </div>
                  <div v-if="item.rightStr" class="right">
                    <div class="content-title">{{ item.rightStr }}</div>
                    <div class="content-title">{{ item.rightStr + "：" }}</div>
                    <div class="content-data">{{ item.rightValue ? item.rightValue : "--" }}</div>
                  </div>
                </li>
@@ -59,14 +59,14 @@
                <li>
                  <div class="left remark">
                    <div class="content-title">{{ "备注：" }}</div>
                    <div class="content-data">{{ "备注内容" }}</div>
                    <div class="content-data">{{ detailConfig.infomation.remark }}</div>
                  </div>
                </li>
              </ul>
            </div>
          </div>
          <!-- 附件信息 -->
          <div class="basic-info">
          <!-- <div class="basic-info">
            <div class="basic-info-label" @click="expandClick('annex')">
              <i v-if="isAnnexExpand" class="el-icon-arrow-down"></i>
              <i v-else class="el-icon-arrow-up"></i>
@@ -82,7 +82,7 @@
                </li>
              </ul>
            </div>
          </div>
          </div> -->
        </div>
        <div v-if="activeName === 'annex'" class="second">
          <!-- <SubOrder :isDetail="true" /> -->
@@ -140,32 +140,26 @@
        {
          leftStr: "回访人",
          leftValue: item.Member.username,
          rightStr: "项目计划",
          rightValue: ""
          rightStr: "满意度",
          rightValue: item.satisfaction.name
        },
        {
          leftStr: "满意度",
          leftValue: item.satisfaction.name,
          rightStr: "及时率",
          rightValue: item.timelyRate.name
          leftStr: "及时率",
          leftValue: item.timelyRate.name,
          rightStr: "解决率",
          rightValue: item.solveRate.name
        },
        {
          leftStr: "解决率",
          leftValue: item.solveRate.name,
          rightStr: "原服务人员",
          rightValue: item.oldMember.username
          leftStr: "原服务人员",
          leftValue: item.oldMember.username,
          rightStr: "服务人员是否来过",
          rightValue: item.isVisit.name
        },
        {
          leftStr: "服务人员是否来过",
          leftValue: item.isVisit.name,
          rightStr: "创建时间",
          rightValue: ""
        },
        {
          leftStr: "修改时间",
          leftValue: "",
          rightStr: "",
          rightValue: ""
          leftStr: "创建时间",
          leftValue: item.createTime,
          rightStr: "修改时间",
          rightValue: item.updateTime
        }
      ]
    },