Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit

liukangdong

2024-09-18 6ef869b1adcf3a5bb8e4c3117dc507d173f13fd8

 admin/src/views/business/approvalReport.vue

@@ -26,29 +26,57 @@
              >
                <div class="head">{{ item.remark }}</div>
                <div class="content">
                  <div v-if="item.objIds && item.objIds.length === 1">
                    <span
                      >{{ item.objIds[0].name }}
                      {{ item.objIds[0].companyName }}</span
                    >
                    <span v-if="item.approveType == 0 && item.type == '0'">
                      或签</span
                    >
                    <span v-if="item.approveType == 1 && item.type == '0'">
                      会签</span
                    >
                  </div>
                  <div v-else-if="item.objIds && item.objIds.length > 1">
                    <span>{{ item.objIds[0].name }} 等</span>
                    <span v-if="item.approveType == 0 && item.type == '0'">
                      或签</span
                    >
                    <span v-if="item.approveType == 1 && item.type == '0'">
                      会签</span
                    >
                  </div>
                  <div v-else>请选择</div>
                  <i class="el-icon-arrow-right"></i>
                  <!-- 审批 -->
                  <template v-if="item.type == 0">
                    <template v-if="item.memberType == '0'">
                    <div>被访人</div>
                  </template>
                    <template v-if="item.memberType == '2'">
                      <div>部门主管</div>
                    </template>
                    <template v-if="item.memberType == '1'">
                      <div v-if="item.objIds && item.objIds.length === 1">
                        <span
                          >{{ item.objIds[0].name }}
                          {{ item.objIds[0].companyName }}</span
                        >
                        <span v-if="item.approveType == 0 && item.type == '0'">
                          或签</span
                        >
                        <span v-if="item.approveType == 1 && item.type == '0'">
                          会签</span
                        >
                      </div>
                      <div v-else-if="item.objIds && item.objIds.length > 1">
                        <span>{{ item.objIds[0].name }} 等</span>
                        <span v-if="item.approveType == 0 && item.type == '0'">
                          或签</span
                        >
                        <span v-if="item.approveType == 1 && item.type == '0'">
                          会签</span
                        >
                      </div>
                      <div v-else>请选择</div>
                      <i class="el-icon-arrow-right"></i>
                    </template>
                  </template>
                  <!-- 抄送 -->
                  <template v-if="item.type == 1">
                    <div v-if="item.objIds && item.objIds.length === 1">
                        <span
                          >{{ item.objIds[0].name }}
                          {{ item.objIds[0].companyName }}</span
                        >
                      </div>
                      <div v-else-if="item.objIds && item.objIds.length > 1">
                        <span>{{ item.objIds[0].name }} 等</span>
                      </div>
                      <div v-else>请选择</div>
                    <i
                      v-if="item.memberType == '1'"
                      class="el-icon-arrow-right"
                    ></i>
                  </template>
                </div>
              </div>
              <div class="arrows">
@@ -302,6 +330,8 @@
                  companyName: i.companyName
                }
              })
            }else{
              item.objIds = []
            }
          })
          this.apprList = arr