Merge remote-tracking branch 'origin/master'

jiangping

2024-08-09 249a271a867df4802a8d59371e0ff10d3eb54298

 admin/src/views/operation/serviceCar/apprConfig.vue

@@ -2,8 +2,8 @@
  <TableLayout>
    <template v-slot:table-wrap>
      <el-tabs v-model="activeType" @tab-click="handleClick">
        <el-tab-pane label="室内用车" name="3"></el-tab-pane>
        <el-tab-pane label="室外用车" name="4"></el-tab-pane>
        <el-tab-pane label="市内用车" name="3"></el-tab-pane>
        <el-tab-pane label="市外用车" name="4"></el-tab-pane>
      </el-tabs>
      <div class="config">
        <div class="config_list">
@@ -30,18 +30,54 @@
              >
                <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 == '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">
@@ -72,12 +108,12 @@
            <template v-if="apprList[activeIndex].type == '1'">
              <div class="config_data_item_reviewed_content">
                <div
                  v-for="mem in apprList[activeIndex].objIds"
                  v-for="mem, memIndex in apprList[activeIndex].objIds"
                  :key="mem.id"
                  class="config_data_item_reviewed_content_item"
                >
                  <span>{{ mem.name }}</span>
                  <i class="el-icon-close"></i>
                  <i @click="memDel(memIndex)" class="el-icon-close"></i>
                </div>
                <span class="add" @click="selStaff">+添加</span>
              </div>
@@ -120,7 +156,7 @@
              <div class="config_data_item_reviewed_r">
                <span>被访人的</span>
                <el-select
                  v-model="apprList[activeIndex].level"
                  v-model="apprList[activeIndex].objLevel"
                  placeholder="请选择"
                  style="margin: 0 20px 0 10px"
                >
@@ -164,14 +200,15 @@
            <div>允许修改"驾驶员"</div>
            <el-switch
              class="ml10"
              active-value="0"
              inactive-value="1"
              :active-value="1"
              :inactive-value="0"
              v-model="apprList[activeIndex].driverParam"
            ></el-switch>
          </div>
          <div class="config_data_submit">
            <el-button
              @click="onSubmit"
              :loading="subLoading"
              style="background: #435ebe"
              type="primary"
              >保存配置项</el-button
@@ -252,6 +289,7 @@
  data () {
    return {
      activeType: '3',
      subLoading: false,
      apprList: [
        { remark: '审批人', active: false, type: '0', objIds: [] },
        { remark: '抄送人', active: false, type: '1', objIds: [] }
@@ -332,13 +370,15 @@
          item.objIds = ''
        }
      })
      this.subLoading = true
      approveTemplSave({
        type: activeType,
        paramList: temp
      }).then(res => {
        // if (res.code === 200) {
        this.subLoading = false
        this.$tip.success('保存成功')
        // }
      }, () => {
        this.subLoading = false
      })
    },
    handleDel () {