Merge remote-tracking branch 'origin/master'

jiangping

2024-02-04 14cbe4f1e07a9b542176edff4f682fcbc6d5c220

Merge remote-tracking branch 'origin/master'

 company/src/assets/style/style.scss

@@ -82,15 +82,15 @@
.settle-status0,.settle-status2,.settle-status3,
.tax-status0,
.du-status0 {
  color: #216EEE;
  color: #216EEE  !important;
}
  .apply-status1 , .apply-status4, .apply-status6, .apply-status7, .apply-status8,
.change-status3,.change-status4,.change-status5,.change-status8,
.settle-status1,
.tax-status2,
.du-status2 {
  color: #F95601;
  color: #F95601 !important;
}
  .apply-status5,.change-status7,.settle-status7,.tax-status1,.du-status1  {
  color: #00BA92;
  .apply-status5,.change-status7,.settle-status7,.tax-status1,.du-status1,.settle-status4  {
  color: #00BA92  !important;
}

 company/src/components/business/OperaApplyChangeDetailWindow.vue

@@ -11,14 +11,12 @@
                <div class="desc_item_label">
                    <div class="desc_item_label_left">
                        <span>投保企业：{{ apply.companyName }}</span>
                        <span v-if="model.status === 0">保单状态：待签署</span>
                        <span v-if="model.status === 1">保单状态：待审核</span>
                        <span v-if="model.status === 2">保单状态：已上传批单</span>
                        <span v-if="model.status === 1">保单状态：已签章</span>
                        <span v-if="model.status === 2">保单状态：已生效</span>
                        <span v-if="model.status === 3 || model.status === 4">保单状态：退回申请</span>
                        <span v-if="model.status === 5 || model.status === 8">保单状态：已退回</span>
                        <span v-if="model.status === 7 || model.status === 6">保单状态：已关闭</span>
                        <span v-if="model.status === 0">保单状态：<span  :class="'change-status'+model.status" >待签署</span></span>
                        <span v-if="model.status === 1">保单状态：<span  :class="'change-status'+model.status" >待审核</span></span>
                        <span v-if="model.status === 2">保单状态：<span  :class="'change-status'+model.status" >已生效</span></span>
                        <span v-if="model.status === 3 || model.status === 4">保单状态：<span  :class="'change-status'+model.status" >退回申请</span></span>
                        <span v-if="model.status === 5 || model.status === 8">保单状态：<span  :class="'change-status'+model.status" >已退回</span></span>
                        <span v-if="model.status === 7 || model.status === 6">保单状态：<span  :class="'change-status'+model.status" >已关闭</span></span>
                        <span>提交时间：{{ model.createDate }}</span>
                    </div>
                  <div class="desc_item_label_right">

 company/src/components/business/OperaApplyChangeUnitDetailWindow.vue

@@ -11,12 +11,12 @@
                <div class="desc_item_label">
                    <div class="desc_item_label_left">
                        <span>投保企业：{{ apply.companyName }}</span>
                      <span v-if="model.status === 0">保单状态：待签署</span>
                      <span v-if="model.status === 1">保单状态：待审核</span>
                      <span v-if="model.status === 2">保单状态：已生效</span>
                      <span v-if="model.status === 3 || model.status === 4">保单状态：退回申请</span>
                      <span v-if="model.status ===5 || model.status === 8">保单状态：已退回</span>
                      <span v-if="model.status ===7">保单状态：已关闭</span>
                    <span v-if="model.status === 0">保单状态：<span  :class="'change-status'+model.status" >待签署</span></span>
                    <span v-if="model.status === 1">保单状态：<span  :class="'change-status'+model.status" >待审核</span></span>
                    <span v-if="model.status === 2">保单状态：<span  :class="'change-status'+model.status" >已生效</span></span>
                    <span v-if="model.status === 3 || model.status === 4">保单状态：<span  :class="'change-status'+model.status" >退回申请</span></span>
                    <span v-if="model.status === 5 || model.status === 8">保单状态：<span  :class="'change-status'+model.status" >已退回</span></span>
                    <span v-if="model.status === 7 || model.status === 6">保单状态：<span  :class="'change-status'+model.status" >已关闭</span></span>
                        <span>提交时间：{{ model.createDate }}</span>
                    </div>
                  <div class="desc_item_label_right">

 company/src/components/business/OperaInsuranceApplyWindow.vue

@@ -19,7 +19,7 @@
                <div class="desc_item_label">
                    <div class="desc_item_label_left">
                        <span>投保企业：{{ model.companyName }}</span>
                        <span>保单状态：{{ model.statusInfo }}</span>
                      <span>保单状态：<span  :class="'apply-status'+model.status" >{{ model.statusInfo }}</span></span>
                        <span>提交时间：{{ model.createDate }}</span>
                    </div>
                  <div class="desc_item_label_right">

 company/src/components/business/OperaSettleClaimsWindow.vue

@@ -18,6 +18,12 @@
                    <span class="desc_label_left_code">
                        报案号：{{ model.reportNum || '-' }}
                    </span>
                    <span class="desc_label_left_code">
                      状态：
                      <span  :class="'settle-status'+model.status" v-if="model.status==0 || model.status==2|| model.status==3">处理中 </span>
                      <span  :class="'settle-status'+model.status" v-if="model.status==1">已撤案 </span>
                      <span  :class="'settle-status'+model.status" v-if="model.status==4">已结案 </span>
                    </span>
                </div>
                <div class="desc_label_right">
                    <template v-if="userInfo.type === 0">
@@ -444,7 +450,7 @@
              list: [],
              model: {},
              activeName: 'first',
              reverse: false
              reverse: false,
            }
        },
        computed: {

 company/src/components/business/dispatchReview.vue

@@ -41,9 +41,9 @@
              <el-table-column
                  label="状态">
                <template slot-scope="{row}">
                  <span :class="'du-status'+row.status" v-if="row.status === 0">待审核</span>
                  <span :class="'du-status'+row.status"  v-if="row.status === 1">审核通过</span>
                  <span :class="'du-status'+row.status"  v-if="row.status === 2">审核不通过</span>
                  <span :class="'du-status'+row.status" v-if="row.unitStatus === 0">待审核</span>
                  <span :class="'du-status'+row.status"  v-if="row.unitStatus === 1">审核通过</span>
                  <span :class="'du-status'+row.status"  v-if="row.unitStatus === 2">审核不通过</span>
                </template>
              </el-table-column>
            </el-table>

 company/src/components/business/dispatchUnitDetailsPlat.vue

@@ -23,13 +23,13 @@
                </div>
                <div class="info_list_item">
                    <div class="info_list_item_label">派遣单位状态：</div>
                    <div class="info_list_item_val" :class="'du-status'+row.status"  v-if="form.unitStatus === 0">待审核</div>
                    <div class="info_list_item_val" :class="'du-status'+form.unitStatus"  v-if="form.unitStatus === 0">待审核</div>
                    <div class="info_list_item_val"    v-if="form.unitStatus === 1">
                      <span :class="'du-status'+row.worktypeStatus"  style="color:#2E68EC;" v-if="form.worktypeStatus  ==null||form.worktypeStatus === 0">工种待审</span>
                      <span  :class="'du-status'+row.worktypeStatus"  v-if="form.worktypeStatus === 1">审核通过</span>
                      <span :class="'du-status'+row.worktypeStatus"  v-if="form.worktypeStatus === 2">工种审核不通过</span>
                      <span :class="'du-status'+form.worktypeStatus"  style="color:#2E68EC;" v-if="form.worktypeStatus  ==null||form.worktypeStatus === 0">工种待审</span>
                      <span  :class="'du-status'+form.worktypeStatus"  v-if="form.worktypeStatus === 1">审核通过</span>
                      <span :class="'du-status'+form.worktypeStatus"  v-if="form.worktypeStatus === 2">工种审核不通过</span>
                     </div>
                    <div class="info_list_item_val"  :class="'du-status'+row.status" v-if="form.unitStatus === 2">审核不通过</div>
                    <div class="info_list_item_val"  :class="'du-status'+form.unitStatus" v-if="form.unitStatus === 2">审核不通过</div>
                </div>
                <div class="info_list_item">
                    <div class="info_list_item_label">派遣单位详述：</div>

 company/src/views/business/dispatchUnit.vue

@@ -36,13 +36,13 @@
        <el-table-column prop="name" label="派遣单位" min-width="100px"></el-table-column>
        <el-table-column label="派遣单位状态" min-width="100px">
          <template slot-scope="{row}">
            <span :class="'du-status'+row.status" v-if="row.unitStatus === 0">待审核</span>
            <span :class="'du-status'+row.unitStatus" v-if="row.unitStatus === 0">待审核</span>
            <span v-if="row.unitStatus === 1">
                            <span :class="'du-status'+row.worktypeStatus"   v-if="row.worktypeStatus ==null || row.worktypeStatus === 0">工种待审</span>
                            <span :class="'du-status'+row.worktypeStatus"  v-else-if="row.worktypeStatus === 1">审核通过</span>
                            <span :class="'du-status'+row.worktypeStatus"   v-else-if="row.worktypeStatus === 2">工种审核不通过</span>
                        </span>
            <span :class="'du-status'+row.status"  v-if="row.unitStatus === 2">审核不通过</span>
            <span :class="'du-status'+row.unitStatus"  v-if="row.unitStatus === 2">审核不通过</span>
          </template>
        </el-table-column>
        <el-table-column prop="createDate" label="提交日期" min-width="100px"></el-table-column>

 company/src/views/business/dispatchUnitReview.vue

@@ -36,13 +36,13 @@
                <el-table-column prop="name" label="派遣单位" min-width="100px"></el-table-column>
                <el-table-column label="派遣单位状态" min-width="100px">
                    <template slot-scope="{row}">
                      <span :class="'du-status'+row.status" v-if="row.unitStatus === 0">待审核</span>
                      <span :class="'du-status'+row.unitStatus" v-if="row.unitStatus === 0">待审核</span>
                      <span v-if="row.unitStatus === 1">
                            <span :class="'du-status'+row.worktypeStatus"   v-if="row.worktypeStatus ==null || row.worktypeStatus === 0">工种待审</span>
                            <span :class="'du-status'+row.worktypeStatus"  v-else-if="row.worktypeStatus === 1">审核通过</span>
                            <span :class="'du-status'+row.worktypeStatus"   v-else-if="row.worktypeStatus === 2">工种审核不通过</span>
                        </span>
                      <span :class="'du-status'+row.status"  v-if="row.unitStatus === 2">审核不通过</span>
                      <span :class="'du-status'+row.unitStatus"  v-if="row.unitStatus === 2">审核不通过</span>
                    </template>
                </el-table-column>
                <el-table-column prop="createDate" label="提交日期" min-width="100px"></el-table-column>