jiangping
2024-02-23 41a0e3b18e0b3ca51879d11b9c3c6f278486f631
Merge remote-tracking branch 'origin/master'
已修改8个文件
126 ■■■■■ 文件已修改
company/src/components/business/OperaInsuranceApplyWindow.vue 40 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
company/src/components/business/dispatchReview.vue 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
company/src/components/common/UploadFile.vue 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
company/src/components/enterprise/commissionDetails.vue 21 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
company/src/components/enterprise/directInsuranceDetails.vue 27 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
company/src/components/enterprise/entrustedInvoicingApplication.vue 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
company/src/views/business/applyChange.vue 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
company/src/views/business/switchCourt.vue 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
company/src/components/business/OperaInsuranceApplyWindow.vue
@@ -200,7 +200,8 @@
                        ref="table"
                        v-if="activeName === '0'"
                        style="width: 100%">
                        <el-table-column label="序号">
                        <el-table-column label="序号"
                                         align="center">
                            <template slot-scope="scope">
                                <span>{{scope.$index + 1}}</span>
                            </template>
@@ -208,9 +209,11 @@
                        <el-table-column
                            :key="Math.random()"
                            prop="memberName"
                            align="center"
                            label="员工姓名">
                        </el-table-column>
                        <el-table-column
                            align="center"
                            :key="Math.random()"
                            label="性别">
                            <template slot-scope="{row}">
@@ -221,30 +224,36 @@
                        <el-table-column
                            :key="Math.random()"
                            prop="idcardNo"
                            align="center"
                            label="身份证号">
                        </el-table-column>
                        <el-table-column
                            :key="Math.random()"
                            prop="duName"
                            align="center"
                            label="派遣单位">
                        </el-table-column>
                        <el-table-column
                            :key="Math.random()"
                            prop="workTypeName"
                            align="center"
                            label="所属工种">
                        </el-table-column>
                        <el-table-column
                            :key="Math.random()"
                            prop="startTime"
                            align="center"
                            label="保险生效起期">
                        </el-table-column>
                        <el-table-column
                            :key="Math.random()"
                            prop="endTime"
                            align="center"
                            label="保险生效止期">
                        </el-table-column>
                        <el-table-column
                            :key="Math.random()"
                            align="center"
                            prop="fee"
                            label="产生费用(元)">
                        </el-table-column>
@@ -255,12 +264,14 @@
                        ref="table"
                        v-if="activeName === '1'"
                        style="width: 100%">
                        <el-table-column label="序号">
                        <el-table-column label="序号"
                                         align="center">
                            <template slot-scope="scope">
                                <span>{{scope.$index + 1}}</span>
                            </template>
                        </el-table-column>
                        <el-table-column label="保单状态" :key="Math.random()">
                        <el-table-column label="保单状态" :key="Math.random()"
                                         align="center">
                            <template slot-scope="{row}">
                                <span :class="'change-status'+row.status" v-if="row.status === 0">待签署</span>
                                <span :class="'change-status'+row.status" v-if="row.status === 1">待审核</span>
@@ -273,29 +284,35 @@
                        <el-table-column
                            :key="Math.random()"
                            prop="applyCode"
                            align="center"
                            label="批单号">
                        </el-table-column>
                        <el-table-column
                            :key="Math.random()"
                            prop="addNum"
                            align="center"
                            label="增加人数(人)">
                        </el-table-column>
                        <el-table-column
                            :key="Math.random()"
                            prop="delNum"
                            align="center"
                            label="减少人数(人)">
                        </el-table-column>
                        <el-table-column
                            :key="Math.random()"
                            prop="createDate"
                            align="center"
                            label="提交时间">
                        </el-table-column>
                        <el-table-column
                            :key="Math.random()"
                            prop="applyStartTime"
                            align="center"
                            label="批单生效起期">
                        </el-table-column>
                        <el-table-column
                            align="center"
                            :key="Math.random()"
                            label="操作">
                            <template slot-scope="{row}">
@@ -309,12 +326,14 @@
                        ref="table"
                        v-if="activeName === '2'"
                        style="width: 100%">
                        <el-table-column label="序号">
                        <el-table-column label="序号"
                                         align="center">
                            <template slot-scope="scope">
                                <span>{{scope.$index + 1}}</span>
                            </template>
                        </el-table-column>
                        <el-table-column label="保单状态" :key="Math.random()">
                        <el-table-column
                            align="center" label="保单状态" :key="Math.random()">
                            <template slot-scope="{row}">
                                <span :class="'change-status'+row.status" v-if="row.status === 0">待签署</span>
                                <span :class="'change-status'+row.status" v-if="row.status === 1">待审核</span>
@@ -326,26 +345,31 @@
                        </el-table-column>
                        <el-table-column
                            :key="Math.random()"
                            align="center"
                            prop="applyCode"
                            label="批单号">
                        </el-table-column>
                        <el-table-column
                            :key="Math.random()"
                            prop="changeNum"
                            align="center"
                            label="换厂人数">
                        </el-table-column>
                        <el-table-column
                            :key="Math.random()"
                            prop="createDate"
                            align="center"
                            label="提交时间">
                        </el-table-column>
                        <el-table-column
                            :key="Math.random()"
                            prop="applyStartTime"
                            align="center"
                            label="批单生效起期">
                        </el-table-column>
                        <el-table-column
                            :key="Math.random()"
                            align="center"
                            label="操作">
                            <template slot-scope="{row}">
                                <el-button type="text" @click="$refs.OperaApplyChangeUnitDetailWindow.open('换厂详情', row)">查看详情</el-button>
@@ -748,8 +772,10 @@
  }
}
</script>
<style>
<style scoped>
 ::v-deep .el-tabs__item{
    font-weight: 600;
 }
</style>
<style lang="scss" scoped>
    .form {
company/src/components/business/dispatchReview.vue
@@ -14,7 +14,6 @@
          </div>
        </div>
      </div>
       <div class="box" v-for="(item, index) in duSolutionList" :key="index">
        <div   class="box_label">保险方案:{{item.solutionName}}</div>
        <el-table
@@ -104,10 +103,10 @@
                     flag = 1;
                     tempworktyps.push(item1);
                   }
                })
                  if(flag ==1){
                    this.duSolutionList.push({duWorktypeList:tempworktyps,solutionName:item.solutionName})
                  }
                })
            })
            console.log(this.form)
company/src/components/common/UploadFile.vue
@@ -110,17 +110,14 @@
  height: 90px !important;
}
::v-deep .el-upload-list__item {
  width: 90px !important;
  height: 90px !important;
  width: 80% !important;
  height: 50px !important;
}
.icon {
  -webkit-transform: translate(-50%,-50%);
  -ms-transform: translate(-50%,-50%);
  transform: translate(0%, -85%);
}
::v-deep .el-upload-list__item {
  width: 90px !important;
  height: 90px !important;
}
</style>
company/src/components/enterprise/commissionDetails.vue
@@ -10,29 +10,29 @@
            <div class="info_list">
                <div class="info_list_item">
                    <div class="info_list_item_label">开票名称:</div>
                    <div class="info_list_item_val">{{userInfo.company.name}}</div>
                    <div class="info_list_item_val">{{model.companyName}}</div>
                </div>
                <div class="info_list_item">
                    <div class="info_list_item_label">纳税人识别号:</div>
                    <div class="info_list_item_val">{{userInfo.company.code}}</div>
                    <div class="info_list_item_val">{{model.taxCode}}</div>
                </div>
                <div class="info_list_item">
                    <div class="info_list_item_label">开户行:</div>
                    <div class="info_list_item_val">{{userInfo.company.taxBank}}</div>
                    <div class="info_list_item_val">{{model.taxBank}}</div>
                </div>
                <div class="info_list_item">
                    <div class="info_list_item_label">账号:</div>
                    <div class="info_list_item_val">
                        {{userInfo.company.taxAccount}}
                        {{model.taxAccount}}
                    </div>
                </div>
                <div class="info_list_item" style="width: 100%;">
                    <div class="info_list_item_label">地址、电话:</div>
                    <div class="info_list_item_val">{{userInfo.company.invoiceAddr}} {{userInfo.company.phone}}</div>
                    <div class="info_list_item_val">{{model.taxAddr}}</div>
                </div>
                <div class="info_list_item" style="width: 100%;">
                    <div class="info_list_item_label">开票金额:</div>
                    <div class="info_list_item_val" style="color:rgba(249, 86, 1, 0.996078431372549);">{{totalPrice}}</div>
                    <div class="info_list_item_val" style="color:rgba(249, 86, 1, 0.996078431372549);">{{model.price}}</div>
                </div>
                <div class="list" style="width: 100%;" v-if="form.type === 0">
                    <div class="list_label">
@@ -40,7 +40,7 @@
                    </div>
                    <div class="list_val">
                        <div class="list_val_label">接收地址:</div>
                        <div class="list_val_info">{{form.addr}}</div>
                        <div class="list_val_info">{{model.addr}}</div>
                    </div>
                </div>
                <div class="list" style="width: 100%;" v-else>
@@ -49,7 +49,7 @@
                    </div>
                    <div class="list_val">
                        <div class="list_val_label">接收地址:</div>
                        <div class="list_val_info">{{form.addr}}</div>
                        <div class="list_val_info">{{model.addr}}</div>
                    </div>
                </div>
            </div>
@@ -111,7 +111,8 @@
                    id: null,
                    type: '',
                    addr: ''
                }
                },
              model:{}
            }
        },
        created () {
@@ -129,6 +130,7 @@
                this.visible = true
                this.list1 = []
                this.list2 = []
                this.model ={}
                this.$nextTick(() => {
                    for (const key in this.form) {
                        this.form[key] = target[key]
@@ -142,6 +144,7 @@
            getData() {
                getDetail(this.form.id)
                    .then(res => {
                      this.model =res
                        let price = 0
                        this.list1 = res.applyList
                        this.list2 = res.delTaxList
company/src/components/enterprise/directInsuranceDetails.vue
@@ -10,29 +10,29 @@
            <div class="info_list">
                <div class="info_list_item">
                    <div class="info_list_item_label">开票名称:</div>
                    <div class="info_list_item_val">{{userInfo.company.name}}</div>
                <div class="info_list_item_val">{{model.companyName}}</div>
                </div>
                <div class="info_list_item">
                    <div class="info_list_item_label">纳税人识别号:</div>
                    <div class="info_list_item_val">{{userInfo.company.code}}</div>
                <div class="info_list_item_val">{{model.taxCode}}</div>
                </div>
                <div class="info_list_item">
                    <div class="info_list_item_label">开户行:</div>
                    <div class="info_list_item_val">{{userInfo.company.taxBank}}</div>
                <div class="info_list_item_val">{{model.taxBank}}</div>
                </div>
                <div class="info_list_item">
                    <div class="info_list_item_label">账号:</div>
                    <div class="info_list_item_val">
                        {{userInfo.company.taxAccount}}
                  {{model.taxAccount}}
                    </div>
                </div>
                <div class="info_list_item" style="width: 100%;">
                    <div class="info_list_item_label">地址、电话:</div>
                    <div class="info_list_item_val">{{userInfo.company.invoiceAddr}} {{userInfo.company.phone}}</div>
                <div class="info_list_item_val">{{model.taxAddr}}</div>
                </div>
                <div class="info_list_item" style="width: 100%;">
                    <div class="info_list_item_label">开票金额:</div>
                    <div class="info_list_item_val" style="color:rgba(249, 86, 1, 0.996078431372549);">{{totalPrice}}</div>
                <div class="info_list_item_val" style="color:rgba(249, 86, 1, 0.996078431372549);">{{model.price}}</div>
                </div>
                <div class="list" style="width: 100%;" v-if="form.type === 0">
                    <div class="list_label">
@@ -40,7 +40,7 @@
                    </div>
                    <div class="list_val">
                        <div class="list_val_label">接收地址:</div>
                        <div class="list_val_info">{{form.addr}}</div>
                        <div class="list_val_info">{{model.addr}}</div>
                    </div>
                </div>
                <div class="list" style="width: 100%;" v-else>
@@ -49,7 +49,7 @@
                    </div>
                    <div class="list_val">
                        <div class="list_val_label">接收地址:</div>
                        <div class="list_val_info">{{form.addr}}</div>
                        <div class="list_val_info">{{model.addr}}</div>
                    </div>
                </div>
            </div>
@@ -149,7 +149,8 @@
                    id: null,
                    type: '',
                    addr: ''
                }
                },
              model:{}
            }
        },
        created () {
@@ -167,6 +168,7 @@
                this.visible = true
                this.list1 = []
                this.list2 = []
                this.model={}
                this.$nextTick(() => {
                    for (const key in this.form) {
                        this.form[key] = target[key]
@@ -181,6 +183,7 @@
                getDetail(this.form.id)
                    .then(res => {
                        let price = 0
                        this.model = res
                        this.list1 = res.applyList
                        this.list2 = res.delTaxList
                        if (this.list1 && this.list1.length > 0) {
@@ -202,7 +205,7 @@
                columns.forEach((column, index) => {
                    if (index === 0) {
                        sums[index] = '合计'
                    } else if (index == 4) {
                    } else if (index == 3) {
                        let price = 0
                        data.forEach(item => {
                            price += item.totalFee
@@ -218,7 +221,7 @@
                columns.forEach((column, index) => {
                    if (index === 0) {
                        sums[index] = '合计'
                    } else if (index == 5) {
                    } else if (index == 4) {
                        let price = 0
                        data.forEach(item => {
                            price += item.totalFee
@@ -236,7 +239,7 @@
    ::v-deep .el-table__footer-wrapper tbody td {
        cursor: pointer;
        text-align: center;
        &:nth-child(5) {
        &:nth-child(5),&:nth-child(4) {
            color:rgba(249, 86, 1, 0.996078431372549);
        }
    }
company/src/components/enterprise/entrustedInvoicingApplication.vue
@@ -28,7 +28,7 @@
                </div>
                <div class="info_list_item" style="width: 100%;">
                    <div class="info_list_item_label">地址、电话:</div>
                    <div class="info_list_item_val">{{userInfo.company.invoiceAddr}} {{userInfo.company.phone}}</div>
                    <div class="info_list_item_val">{{userInfo.company.taxAddr}}</div>
                </div>
                <div class="info_list_item" style="width: 100%;">
                    <div class="info_list_item_label">开票金额:</div>
@@ -38,14 +38,14 @@
                    <el-radio v-model="type" label="0">电子发票</el-radio>
                    <div class="list_val">
                        <div class="list_val_label">接收地址:</div>
                        <el-input v-model="val" :disabled="type === '1'" placeholder="111222333@qq.com"></el-input>
                        <el-input v-model="val" :disabled="type === '1'" placeholder="" ></el-input>
                    </div>
                </div>
                <div class="list" style="width: 100%;">
                    <el-radio v-model="type" label="1">纸质发票</el-radio>
                    <div class="list_val">
                        <div class="list_val_label">接收地址:</div>
                        <el-input v-model="val1" :disabled="type === '0'" placeholder="安徽省合肥市经济技术开发区莲花路以东、石门路以南莲花路1#     0551-63450845"></el-input>
                        <el-input v-model="val1" :disabled="type === '0'" placeholder=""></el-input>
                    </div>
                </div>
            </div>
@@ -139,14 +139,14 @@
            open (title, target) {
                this.title = title
                this.type = '0'
                this.val = ''
                this.val1 = ''
                this.visible = true
                this.$nextTick(() => {
                    for (const key in this.form) {
                        this.form[key] = target[key]
                    }
                })
              this.val = this.userInfo.company.invoiceEmail
              this.val1 = this.userInfo.company.invoiceAddr
            },
            confirm () {
                if (!this.val && !this.val1) {
company/src/views/business/applyChange.vue
@@ -5,8 +5,8 @@
      <el-form-item label="保单状态" prop="status">
        <el-select v-model="searchForm.status" placeholder="请选择" @change="search">
          <el-option label="全部" value=""></el-option>
          <el-option label="待签署" value="1"></el-option>
          <el-option label="待审核" value="0"></el-option>
          <el-option label="待签署" value="0"></el-option>
          <el-option label="待审核" value="1"></el-option>
          <el-option label="已生效" value="2"></el-option>
          <el-option label="申请退回" value="3"></el-option>
          <!--                    3 4 都是退回申请中-->
@@ -64,8 +64,8 @@
        </el-table-column>
        <el-table-column prop="status" label="保单状态" min-width="100px">
          <template slot-scope="{row}">
            <span  :class="'change-status'+row.status" v-if="row.status === 1">待签署</span>
            <span  :class="'change-status'+row.status" v-if="row.status === 0">待审核</span>
            <span  :class="'change-status'+row.status" v-if="row.status === 0">待签署</span>
            <span  :class="'change-status'+row.status" v-if="row.status === 1">待审核</span>
            <span  :class="'change-status'+row.status" v-if="row.status === 2">已生效</span>
            <span  :class="'change-status'+row.status" v-if="row.status === 3 || row.status === 4">退回申请</span>
            <span  :class="'change-status'+row.status" v-if="row.status ===5 || row.status === 8">已退回</span>
company/src/views/business/switchCourt.vue
@@ -5,8 +5,8 @@
      <el-form-item label="保单状态" prop="status">
        <el-select v-model="searchForm.status" placeholder="请选择" @change="search">
          <el-option label="全部" value=""></el-option>
          <el-option label="待签署" value="1"></el-option>
          <el-option label="待审核" value="0"></el-option>
          <el-option label="待签署" value="0"></el-option>
          <el-option label="待审核" value="1"></el-option>
          <el-option label="已生效" value="2"></el-option>
          <el-option label="申请退回" value="3"></el-option>
          <!--                    3 4 都是退回申请中-->
@@ -64,8 +64,8 @@
        </el-table-column>
        <el-table-column prop="status" label="保单状态" min-width="100px">
          <template slot-scope="{row}">
            <span :class="'change-status'+ row.status" v-if="row.status === 1">待签署</span>
            <span :class="'change-status'+ row.status" v-if="row.status === 0">待审核</span>
            <span :class="'change-status'+ row.status" v-if="row.status === 0">待签署</span>
            <span :class="'change-status'+ row.status" v-if="row.status === 1">待审核</span>
            <span :class="'change-status'+ row.status" v-if="row.status === 2">已生效</span>
            <span :class="'change-status'+ row.status" v-if="row.status === 3 || row.status === 4">退回申请</span>
            <span :class="'change-status'+ row.status" v-if="row.status ===5 || row.status === 8">已退回</span>