Merge remote-tracking branch 'origin/1.0.1' into 1.0.1

k94314517

2024-05-08 0f409b25f91717e00e10c37738740b22583cb4ff

 company/src/components/business/ApplyChangeDetails.vue

@@ -19,7 +19,8 @@
              <div class="box_table_head_item">保险生效止期</div>
              <div class="box_table_head_item">加保人数</div>
              <div class="box_table_head_item">减保人数</div>
              <div class="box_table_head_item">批单生效期</div>
              <div class="box_table_head_item">批增生效日期</div>
              <div class="box_table_head_item">批减生效日期</div>
            </div>
            <div class="box_table_content "  >
              <div class="box_table_content_item box_table_content_header">{{ apply.companyName }}</div>
@@ -30,6 +31,7 @@
              <div class="box_table_content_item box_table_content_header">{{ model.addNum}}</div>
              <div class="box_table_content_item box_table_content_header">{{ model.delNum}}</div>
              <div class="box_table_content_item box_table_content_header">{{ model.applyStartTime}}</div>
              <div class="box_table_content_item box_table_content_header">{{ model.delValidTime}}</div>
            </div>
          </div>
            <div class="box_table">
@@ -41,29 +43,41 @@
                    <div class="box_table_head_item">序号</div>
                    <div class="box_table_head_item">员工姓名</div>
                    <div class="box_table_head_item">身份证号</div>
<!--
                    <div class="box_table_head_item">性别</div>
-->
                    <div class="box_table_head_item">派遣单位</div>
                    <div class="box_table_head_item">所属工种</div>
                  <div class="box_table_head_item">备注</div>
                    <div class="box_table_head_item">序号</div>
                    <div class="box_table_head_item">员工姓名</div>
                    <div class="box_table_head_item">身份证号</div>
<!--
                    <div class="box_table_head_item">性别</div>
-->
                    <div class="box_table_head_item">派遣单位</div>
                    <div class="box_table_head_item">所属工种</div>
                    <div class="box_table_head_item">备注</div>
                </div>
                <div class="box_table_content" v-for="(item, index) in detailList" :key="index">
                    <div class="box_table_content_item">{{item.add.id!=null?(index + 1):''}}</div>
                    <div class="box_table_content_item" >{{ item.add.memberName }}</div>
                    <div class="box_table_content_item">{{ item.add.memberIdcardNo }}</div>
<!--
                    <div class="box_table_content_item">{{  item.add.sex==0?"男":(item.add.sex==1?"女":"" )}}</div>
-->
                    <div class="box_table_content_item">{{ item.add.duName }}</div>
                    <div class="box_table_content_item">{{item.add.workTypeName}}</div>
                    <div class="box_table_content_item">{{item.add.remark}}</div>
                    <div class="box_table_content_item">{{item.del.id!=null?(index + 1):''}}</div>
                    <div class="box_table_content_item" >{{ item.del.memberName }}</div>
                    <div class="box_table_content_item">{{ item.del.memberIdcardNo }}</div>
<!--
                    <div class="box_table_content_item">{{ item.del.sex==0?"男":(item.del.sex==1?"女":"" ) }}</div>
-->
                    <div class="box_table_content_item">{{ item.del.duName }}</div>
                    <div class="box_table_content_item">{{item.del.workTypeName}}</div>
                    <div class="box_table_content_item">{{item.del.remark}}</div>
                </div>
            </div>
          <div class="box_table" v-if="type==1" style="border-top: 0px solid #b4bbc5;" >
@@ -134,7 +148,9 @@
      this.model = target2
      this.form.id = target2.id
      this.type = target3
      this.getDetailListDo()
      if(this.form.id){
        this.getDetailListDo()
      }
    },
    check (type) {
      this.form.dealBackApply = type
@@ -314,12 +330,12 @@
                    border-right: 1px solid #b4bbc5;
                    border-bottom: 1px solid #b4bbc5;
                    box-sizing: border-box;
                  &:nth-child(3) {
                    flex: 1.5;;
                  }
                  &:nth-child(9) {
                    flex: 1.5;;
                  }
                  //&:nth-child(3) {
                  //  flex: 1.5;;
                  //}
                  //&:nth-child(9) {
                  //  flex: 1.5;;
                  //}
                }
              .box_table_head_item5 {
                flex: 1;
@@ -334,7 +350,7 @@
                border-bottom: 1px solid #b4bbc5;
                box-sizing: border-box;
                &:nth-child(2) {
                   flex: 5.5;
                   flex: 5;
                }
              }
              .box_form_item {
@@ -370,15 +386,17 @@
                    justify-content: center;
                    font-size: 14px;
                    color: black;
                    word-wrap: break-word;
                    word-break: break-all;
                    border-right: 1px solid #b4bbc5;
                    border-bottom: 1px solid #b4bbc5;
                    box-sizing: border-box;
                &:nth-child(3) {
                  flex: 1.5;
                }
                &:nth-child(9) {
                  flex: 1.5;
                }
                //&:nth-child(3) {
                //  flex: 1.5;
                //}
                //&:nth-child(9) {
                //  flex: 1.5;
                //}
                }
            }
        }