提交一把

jiangping

2024-06-25 949a78c71ddb5c45c1643131b3c1e27f377dd20f

提交一把

 company/.env.developmentCom

@@ -9,6 +9,6 @@
# VUE_APP_API = 'https://dmtest.ahapp.net/yyb_admin_api/'

#VUE_APP_API = 'http://localhost:10031/'
VUE_APP_API = 'http://192.168.0.135:10031/'
#VUE_APP_API = 'http://192.168.0.135:10031/'

#VUE_APP_API = 'https://www.yyb.red/yyb_web_api/'
VUE_APP_API = 'https://www.yyb.red/yyb_web_api/'

 company/src/components/business/ApplyChangeDetails1.vue

@@ -7,7 +7,7 @@
        @confirm="confirm"
    >
        <div class="box">
          <div class="top">
          <div class="top" style="border-right: 1px solid #b4bbc5;">
            {{title}}
          </div>
          <div class="box_table">
@@ -225,6 +225,7 @@
                    height: 50px;
                    background: #f2f2f2;
                    display: flex;
                  padding: 10px;
                    align-items: center;
                    justify-content: center;
                    font-size: 14px;
@@ -242,7 +243,7 @@
              .box_table_head_item5 {
                flex: 1;
                height: 50px;
                background: #f2f2f2;
                background: #f2f2f2;padding: 10px;
                display: flex;
                align-items: center;
                justify-content: center;
@@ -276,7 +277,7 @@
                width: 100%;
                display: flex;
                align-items: center;
                border-left: 1px solid #b4bbc5;
               /* border-left: 1px solid #b4bbc5;*/
                .box_table_content_header{
                  border-bottom: 0px solid #b4bbc5 !important;
                }

 company/src/components/business/UnionChangeDetails.vue

@@ -7,7 +7,7 @@
        @confirm="confirm"
    >
        <div class="box">
          <div class="top">
          <div class="top" style="border-right: 1px solid #b4bbc5;">
            {{title}}
          </div>
          <div class="box_table">

 company/src/components/business/detailsPolicyholder.vue

@@ -7,7 +7,7 @@
        @confirm="confirm"
    >
        <div class="box">
            <div class="top">
            <div class="top" style="border-right: 1px solid #b4bbc5;">
                {{title}}
            </div>
            <div class="box_table">
@@ -42,9 +42,9 @@
                    <div class="box_table_content_item" >{{index + 1}}</div>
                    <div class="box_table_content_item">{{ item.memberName }}</div>
                    <div class="box_table_content_item" style="flex:2"><span>{{ item.idCard }}</span></div>
                    <div class="box_table_content_item" >{{ getGender(item.idCard) }}</div>
                    <div class="box_table_content_item" >{{ item.sex==0?'男':'女' }}</div>
                    <div class="box_table_content_item" style="flex:2" ><span>{{ item.duName }}</span></div>
                    <div class="box_table_content_item" style="flex:2"> <span>{{ item.workTypeName}}</span></span></div>
                    <div class="box_table_content_item" style="flex:2"> <span>{{ item.workTypeName}}</span></div>
                    <div class="box_table_content_item" style="align-items: baseline;cursor: pointer; " :title="item.remark">
                      <span> {{ item.remark}}</span>
                    </div>

 company/src/components/enterprise/addEmployeeWithDu.vue

@@ -79,7 +79,7 @@
      this.visible = true
      this.tempIndex = tempIndex
      this.solutionId = obj.solutionId
      this.dispatching=[]
      this.dispatching = []
      this.list = [
        {
          memberName: '',
@@ -120,7 +120,7 @@
        })
    },
    selectChangeWT (index) {
      this.list[index].workTypeName =null
      this.list[index].workTypeName = null
      this.list[index].options.forEach(item => {
        if (item.id === this.list[index].worktypeId) {
          this.list[index].workTypeName = item.name
@@ -167,6 +167,13 @@
          this.$message.warning(`第${i + 1}项员工身份证不合法`)
          return
        }
        const s=parseInt(this.list[i].idCard.substring(16,17))
        // const s = parseInt(this.list[i].idCard.slice(16, 1))
        if (s % 2 === 0) {
          this.list[i].sex = 1
        } else {
          this.list[i].sex = 0
        }
      }
      // 判断详情列表数据身份证是否有重复
      let next = true
@@ -181,6 +188,7 @@
        this.list.forEach(item => {
          item.fee = this.price
        })
        console.log(this.list)
        this.$emit('result', this.list)
        this.visible = false
      } else {