mrshi

MrShi

2024-02-23 e4be5ba9eea9fe8408f3a7048a315b3767b33f49

mrshi

 company/src/components/business/OperaApplyChangeCheckWindow.vue

@@ -30,7 +30,7 @@
                        </el-radio-group>
                    </div>
                </div>
                <div class="form_item">
                <div class="form_item" v-if="form.selectRadio === 1">
                    <div class="form_item_label"><span>*</span>批单生效起期：</div>
                    <div class="form_item_val">
                        <el-date-picker
@@ -52,7 +52,7 @@
                    </div>
                </div>
                <div class="form_item">
                    <div class="form_item_label">上传批单：</div>
                    <div class="form_item_label"><span>*</span>上传批单：</div>
                    <div class="form_item_val">
                      <UploadFile :uploadData="{ folder: 'apply',fileType:'.pdf' }" :fileList="form.fileList1" @uploadSuccess="baoxianFileUploaded" />
                    </div>
@@ -200,14 +200,50 @@
     },
    doSubmit(){
      if (this.flag == 1) {
          if (!this.form.backCheckInfo) {
              this.$message.warning('请输入退回说明')
              return
          }
        this.backDo()
      } else if (this.flag == 3) {
          if (this.form.selectRadio === 1 && !this.form.applyStartTime) {
              this.$message.warning('请选择批单生效起期')
              return
          }
          if (!this.form.validCode) {
              this.$message.warning('请输入批单号')
              return
          }
          if (!this.form.pidanFile) {
              this.$message.warning('请上传批单')
              return
          }
        this.uploadPidan()
      } else if (this.flag == 4) {
          if (!this.form.editValidCode) {
              this.$message.warning('请输入批单号')
              return
          }
          if (!this.form.editPidanFile) {
              this.$message.warning('请上传批单')
              return
          }
          if (!this.form.editCheckInfo) {
              this.$message.warning('请输入修改原因')
              return
          }
        this.editPidan()
      } else if (this.flag == 5) {
          if (!this.form.dealBackInfo) {
              this.$message.warning('请输入说明')
              return
          }
        this.dealBackApply(1)
      } else if (this.flag == 6) {
          if (!this.form.dealBackInfo) {
              this.$message.warning('请输入退回说明')
              return
          }
        this.dealBackApply(0)
      }
    },
@@ -215,7 +251,7 @@
       if(this.form.selectRadio == 0){
         this.form.applyStartTime = this.model.validTime
       }else{

        this.form.applyStartTime = ''
       }
    },
    baoxianFileUploaded(data){
@@ -343,7 +379,7 @@
            }
            .form_item_label {
                flex-shrink: 0;
                width: 170px;
                width: 150px;
                color: black;
                font-size: 14px;
                span {

 company/src/components/business/OperaCompanyDescWindow.vue

@@ -60,7 +60,7 @@
                    <div class="info_list_item_val">{{form.invoiceEmail || '-'}}</div>
                </div>
                <div class="info_list_item" style="width: 100%;">
                    <div class="info_list_item_label">电子发票接收地址：</div>
                    <div class="info_list_item_label">纸质发票接收地址：</div>
                    <div class="info_list_item_val">{{form.invoiceAddr || '-'}}</div>
                </div>
            </div>

 company/src/components/business/OperaCompanyWindow.vue

@@ -50,15 +50,10 @@
            <el-form-item label="纸质发票接收地址" prop="invoiceAddr">
                <el-input v-model="form.invoiceAddr" placeholder="请输入" v-trim/>
            </el-form-item>
<<<<<<< HEAD
            <el-form-item label="营业执照" prop="businessImg">
                <div style="width: 100%; height: 100px; display: flex; align-items: center;">
                    <UploadAvatarImage :uploadData="{ folder: 'company' }" :file="form.file" @uploadSuccess="result" />
                </div>
=======
            <el-form-item label="营业执照" prop="businessImg"  style="height: 120px">
                <UploadAvatarImage :uploadData="{ folder: 'company' }" :file="form.file" @uploadSuccess="result" />
>>>>>>> c421d2deeec5530d8060d8e06b5b86bb02e72dbf
            </el-form-item>
            <el-form-item label="法人身份证" prop="idcardImgList"  style="height: 120px">
                <div style="width: 100%; display: flex; align-items: center;">
@@ -67,15 +62,10 @@
                    <UploadAvatarImage :uploadData="{ folder: 'company' }" :file="form.file2" @uploadSuccess="result2" />
                </div>
            </el-form-item>
<<<<<<< HEAD
            <el-form-item label="电子签章" prop="signImg">
                <div style="width: 100%; height: 100px; display: flex; align-items: center;">
                    <UploadAvatarImage :uploadData="{ folder: 'company' }" :file="form.file3" @uploadSuccess="result3" />
                </div>
=======
            <el-form-item label="电子签章" prop="signImg" style="height: 120px">
                <UploadAvatarImage :uploadData="{ folder: 'company' }" :file="form.file3" @uploadSuccess="result3" />
>>>>>>> c421d2deeec5530d8060d8e06b5b86bb02e72dbf
            </el-form-item>
        </el-form>
        <el-button type="primary" style="margin-bottom: 15px;" @click="add" v-if="form.type !== 1">添加</el-button>

 company/src/components/business/OperaInsuranceApplyCheckWindow.vue

@@ -205,6 +205,9 @@
       }
       if(flag == 4){
         this.visible4 = true
         this.$nextTick(() => {
           this.$refs.form4.resetFields()
         })
       }
       if(flag == 5){
         this.visible5 = true

 company/src/components/business/OperaInsuranceApplyWindow.vue

@@ -267,6 +267,7 @@
                                <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>
                                <span :class="'change-status'+row.status" v-if="row.status === 6">已关闭</span>
                            </template>
                        </el-table-column>
                        <el-table-column
@@ -291,7 +292,7 @@
                        </el-table-column>
                        <el-table-column
                            :key="Math.random()"
                            prop="startTime"
                            prop="applyStartTime"
                            label="批单生效起期">
                        </el-table-column>
                        <el-table-column
@@ -320,6 +321,7 @@
                                <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>
                                <span :class="'change-status'+row.status" v-if="row.status === 6">已关闭</span>
                            </template>
                        </el-table-column>
                        <el-table-column
@@ -339,7 +341,7 @@
                        </el-table-column>
                        <el-table-column
                            :key="Math.random()"
                            prop="startTime"
                            prop="applyStartTime"
                            label="批单生效起期">
                        </el-table-column>
                        <el-table-column
@@ -457,7 +459,7 @@
          endTimeS: '',
          startTimeE: '',
          startTimeS: '',
          types: ''
          type: ''
      },
      visible1: false,
      visible2: false,
@@ -504,7 +506,7 @@
        this.formInline.endTimeS = ''
        this.formInline.startTimeE = ''
        this.formInline.startTimeS = ''
        this.formInline.types = ''
        this.formInline.type = ''
        this.activeName = '0'
        this.getDetail()
        this.getList()
@@ -622,7 +624,7 @@
                      endTimeS: this.formInline.endTimeS,
                      startTimeE: this.formInline.startTimeE,
                      startTimeS: this.formInline.startTimeS,
                      types: this.formInline.types
                      type: this.formInline.type
                  }
              }).then(response => {
                  this.download(response)
@@ -664,7 +666,7 @@
                     status: this.formInline.applyStatus,
                     endTimeE: this.formInline.endTimeS,
                     endTimeS: this.formInline.startTimeS,
                     types: this.formInline.types
                     type: this.formInline.type
                 }
             }).then(res => {
                 if (this.activeName === '1') {
@@ -685,9 +687,9 @@
      handleClick(e) {
            this.activeName = e.index
            if (e.index === '1') {
                this.formInline.types = 0
                this.formInline.type = 0
            } else if (e.index === '2') {
                this.formInline.types = 1
                this.formInline.type = 1
            }
            this.resetting()
      },

 company/src/components/business/OperaSettleClaimsCheckWindow.vue

@@ -25,20 +25,20 @@
                <el-form-item label="结案内容：" prop="doneInfo">
                  <el-input type="textarea" v-model="form.doneInfo" @change="changeAccount" placeholder="请输入" v-trim/>
                </el-form-item>
                <el-form-item label="医疗理赔(元)：" prop="ylClaimAccount">
                <el-form-item label="医疗理赔(元)：" prop="ylClaimAccount">{{form.ylClaimAccount}}
                  <el-input type="number" v-model="form.ylClaimAccount"  @change="changeAccount" placeholder="请输入" v-trim/>
                </el-form-item>
                <el-form-item label="误工理赔(元)：" prop="wgClaimAccount">
                <el-form-item label="误工理赔(元)：" prop="wgClaimAccount">{{form.wgClaimAccount}}
                  <el-input type="number" v-model="form.wgClaimAccount" @change="changeAccount"  placeholder="请输入" v-trim/>
                </el-form-item>
                <el-form-item label="伤残理赔(元)：" prop="scClaimAccount">
                <el-form-item label="伤残理赔(元)：" prop="scClaimAccount">{{form.scClaimAccount}}
                  <el-input type="number" v-model="form.scClaimAccount" @change="changeAccount"  placeholder="请输入" v-trim/>
                </el-form-item>
                <el-form-item label="死亡理赔(元)：" prop="swClaimAccount">
                <el-form-item label="死亡理赔(元)：" prop="swClaimAccount">{{form.swClaimAccount}}
                  <el-input type="number" v-model="form.swClaimAccount"  @change="changeAccount"  placeholder="请输入" v-trim/>
                </el-form-item>
                <el-form-item label="总金额："  >
                  <el-input type="number" readonly v-model="form.totalAccount" placeholder="请输入" v-trim/>
                  <el-input type="number" disabled v-model="form.totalAccount" placeholder="" v-trim/>
                </el-form-item>
              </el-form>
            <div v-if="visible5 ==true"  class="form">
@@ -117,19 +117,19 @@
      },
      rules4: {
        doneInfo: [
          { required: true, message: '请输入' }
          { required: true, message: '请输入', trigger: 'blur' }
        ],
        ylClaimAccount: [
            { required: true, message: '请输入' }
            { required: true, message: '请输入', trigger: 'blur' }
        ],
        wgClaimAccount: [
            { required: true, message: '请输入' }
            { required: true, message: '请输入', trigger: 'blur' }
        ],
        scClaimAccount: [
            { required: true, message: '请输入' }
            { required: true, message: '请输入', trigger: 'blur' }
        ],
        swClaimAccount: [
            { required: true, message: '请输入' }
            { required: true, message: '请输入', trigger: 'blur' }
        ]
      }
    }
@@ -185,10 +185,18 @@
      }
    },
     changeAccount(){
        if (this.form.swClaimAccount) {
       this.form.swClaimAccount = parseFloat(this.form.swClaimAccount).toFixed(2)
        }
         if (this.form.scClaimAccount) {
       this.form.scClaimAccount = parseFloat(this.form.scClaimAccount).toFixed(2)
         }
         if (this.form.wgClaimAccount) {
       this.form.wgClaimAccount = parseFloat(this.form.wgClaimAccount).toFixed(2)
         }
         if (this.form.ylClaimAccount) {
       this.form.ylClaimAccount = parseFloat(this.form.ylClaimAccount).toFixed(2)
         }
      this.form.totalAccount = parseFloat( this.form.scClaimAccount || 0) + parseFloat( this.form.swClaimAccount || 0)
         + parseFloat( this.form.wgClaimAccount|| 0)
         + parseFloat( this.form.ylClaimAccount|| 0)
@@ -211,7 +219,6 @@
        })
      } else if (this.type === 4) {
        this.$refs.form4.validate((valid) => {
          // debugger
          if (!valid) {
            return
          }

 company/src/components/business/OperaSettleClaimsWindow.vue

@@ -167,7 +167,7 @@
                    <div class="desc_list_item_videos" v-if="model.reportFileList && model.reportFileList.length > 0">
                        <div class="desc_list_item_imgs_video" v-for="(item, index) in model.reportFileList" :key="index">
                            <img :src="item.fileurlFull" v-if="item.type === 0" />
                            <video controls autoplay :src="item.fileurlFull" v-if="item.type === 1"></video>
                            <video controls :src="item.fileurlFull" v-if="item.type === 1"></video>
                        </div>
                    </div>
                    <div v-else class="desc_list_item_videos">-</div>
@@ -213,7 +213,7 @@
                  <template   v-if="(model.relationFileList==null|| model.relationFileList.length==0) && (model.status ==1 || model.status ==4)">
                    <span style="height: 40px; width:100%;text-align:center;color: #8c939d;font-size: 12px">暂无相关材料</span>
                  </template>
                    <upload v-if="model.status !=1 && model.status !=4" width="100px" height="100px" :list="[]" accept=".png,.jpg,.jpeg,.mp4,.word,.xlsx,.xls,.pdf,.excel" folder="settle" @success="claimsUploadFile($event, 2)" />
                    <upload v-if="model.status !=1 && model.status !=4" width="100px" height="100px" :list="[]" accept=".png,.jpg,.jpeg,.mp4,.word,.xlsx,.xls,.pdf,.excel" folder="settle" @loading="loading = true" @success="claimsUploadFile($event, 2)" />
<!--                    <div class="desc_data_list_item">-->
<!--                      <UploadFileCommon :uploadData="{ folder: 'settle' }" />-->
<!--                      <div class="desc_data_list_item_upload">-->
@@ -254,7 +254,7 @@
                  <template   v-if="(model.outpatientFileList==null|| model.outpatientFileList.length==0) && (model.status ==2 || model.status ==4)">
                    <span style="height: 40px; width:100%;text-align:center;color: #8c939d;font-size: 12px">暂无相关材料</span>
                  </template>
                    <upload v-if="model.status !=1 && model.status !=4" width="100px" height="100px" :list="[]" accept=".png,.jpg,.jpeg,.mp4,.word,.xlsx,.xls,.pdf,.excel" folder="settle" @success="claimsUploadFile($event, 3)" />
                    <upload v-if="model.status !=1 && model.status !=4" width="100px" height="100px" :list="[]" accept=".png,.jpg,.jpeg,.mp4,.word,.xlsx,.xls,.pdf,.excel" folder="settle" @loading="loading = true" @success="claimsUploadFile($event, 3)" />
<!--                    <div class="desc_data_list_item">-->
<!--                        <div class="desc_data_list_item_img" style="cursor: pointer; background: #8c939d;">-->
<!--                            <i class="el-icon-plus"></i>-->
@@ -287,7 +287,7 @@
                  <template   v-if="(model.hospitalFileList==null|| model.hospitalFileList.length==0) && (model.status ==2 || model.status ==4)">
                    <span style="height: 40px; width:100%;text-align:center;color: #8c939d;font-size: 12px">暂无相关材料</span>
                  </template>
                    <upload v-if="model.status !=1 && model.status !=4" width="100px" height="100px" :list="[]" accept=".png,.jpg,.jpeg,.mp4,.word,.xlsx,.xls,.pdf,.excel" folder="settle" @success="claimsUploadFile($event, 4)" />
                    <upload v-if="model.status !=1 && model.status !=4" width="100px" height="100px" :list="[]" accept=".png,.jpg,.jpeg,.mp4,.word,.xlsx,.xls,.pdf,.excel" folder="settle" @loading="loading = true" @success="claimsUploadFile($event, 4)" />
<!--                    <div class="desc_data_list_item">-->
<!--                        <div class="desc_data_list_item_img" style="cursor: pointer; background: #8c939d;">-->
<!--                            <i class="el-icon-plus"></i>-->
@@ -320,7 +320,7 @@
                  <template   v-if="(model.disabilityFileList==null|| model.disabilityFileList.length==0) && (model.status ==2 || model.status ==4)">
                    <span style=" height: 40px;width:100%;text-align:center;color: #8c939d;font-size: 12px">暂无相关材料</span>
                  </template>
                    <upload  v-if="model.status !=1 && model.status !=4" width="100px" height="100px" :list="[]" accept=".png,.jpg,.jpeg,.mp4,.word,.xlsx,.xls,.pdf,.excel" folder="settle" @success="claimsUploadFile($event, 5)" />
                    <upload  v-if="model.status !=1 && model.status !=4" width="100px" height="100px" :list="[]" accept=".png,.jpg,.jpeg,.mp4,.word,.xlsx,.xls,.pdf,.excel" folder="settle" @loading="loading = true" @success="claimsUploadFile($event, 5)" />
<!--                    <div class="desc_data_list_item">-->
<!--                      <UploadFileCommon :uploadData="{ folder: 'apply',fileType:'.pdf' }" :fileList="form.fileList1" @uploadSuccess="baoxianFileUploaded" />-->
<!--&lt;!&ndash;                      <div class="desc_data_list_item_img" style="cursor: pointer; background: #8c939d;">-->
@@ -357,7 +357,7 @@
                  <template   v-if="(model.compensationFileList==null|| model.compensationFileList.length==0) && (model.status ==2 || model.status ==4)">
                    <span style=" height: 40px;width:100%;text-align:center;color: #8c939d;font-size: 12px">暂无相关材料</span>
                  </template>
                    <upload v-if="model.status !=1 && model.status !=4" width="100px" height="100px" :list="[]" accept=".png,.jpg,.jpeg,.mp4,.word,.xlsx,.xls,.pdf,.excel" folder="settle" @success="claimsUploadFile($event, 6)" />
                    <upload v-if="model.status !=1 && model.status !=4" width="100px" height="100px" :list="[]" accept=".png,.jpg,.jpeg,.mp4,.word,.xlsx,.xls,.pdf,.excel" folder="settle" @loading="loading = true" @success="claimsUploadFile($event, 6)" />
<!--                    <div class="desc_data_list_item">-->
<!--                        <div class="desc_data_list_item_img" style="cursor: pointer; background: #8c939d;">-->
<!--                            <i class="el-icon-plus"></i>-->
@@ -545,7 +545,6 @@
            this.$emit('success')
          },
          claimsUploadFile(e, objType) {
              this.loading = true
                claimsUploadFile({
                    id: this.model.id,
                    objType,
@@ -833,19 +832,14 @@
                        word-break: break-all;
                        span {
                            &:nth-child(1) {
                                width: 100%;
                                word-break: break-all;
                                width: 160px;
                                white-space: nowrap;
                                overflow: hidden;
                                text-overflow: ellipsis;
                                font-size: 14px;
                                color: black;
                                padding-right: 30px;
                                box-sizing: border-box;
                                overflow: hidden;
                                text-overflow: ellipsis;
                                white-space: normal;
                                word-wrap: break-word;
                                -webkit-line-clamp: 2; /* Webkit引擎 */
                                -webkit-box-orient: vertical; /* Webkit引擎 */
                                -moz-line-clamp: 2; /* Firefox浏览器 */
                            }
                            &:nth-child(2) {
                                width: 100%;

 company/src/components/business/OperaSolutionsWindow.vue

@@ -154,6 +154,8 @@
            var validType = (rule, value, callback) => {
                if (this.form.validType === 0 && !value) {
                    return callback(new Error('延迟天数不能为空'));
                } else if (!/^[0-9]*[1-9][0-9]*$/.test(value)) {
                    return callback(new Error('延迟天数只能为正整数'));
                }
                callback();
            }
@@ -308,7 +310,7 @@
            },
            // 查询全部保险公司
            allCompany() {
                all({ dataType: 2 })
                all({ dataType: 2, status: 0 })
                    .then(res => {
                        console.log(res)
                        this.company = res

 company/src/components/business/OperaTaxesWindow.vue

@@ -51,11 +51,8 @@
                    <div class="info_list_item_val" style="color:rgba(249, 86, 1, 0.996078431372549);">{{ model.price }}</div>
                </div>
            </div>
<<<<<<< HEAD
            <el-table v-if="model.applyType == 0"
=======
            <el-table v-if="model.applyType ==0"
>>>>>>> c421d2deeec5530d8060d8e06b5b86bb02e72dbf
            <el-table
                v-if="model.applyType ==0"
                :data="tableData"
                border
                show-summary
@@ -88,7 +85,6 @@
                  </template>
                </el-table-column>
            </el-table>
<<<<<<< HEAD
          <el-table
            v-if="model.applyType == 1"
            :data="tableData1"
@@ -96,14 +92,6 @@
            show-summary
            :summary-method="getSummaries"
            style="width: 100%; margin-bottom: 20px;">
=======
          <el-table v-if="model.applyType ==1"
                    :data="tableData1"
                    border
                    show-summary
                    :summary-method="getSummaries"
                    style="width: 100%; margin-bottom: 20px;">
>>>>>>> c421d2deeec5530d8060d8e06b5b86bb02e72dbf
            <el-table-column
                label="保单"
                align="center"
@@ -139,7 +127,8 @@
              </template>
            </el-table-column>
          </el-table>
            <el-table v-if="model.applyType == 1"
            <el-table
                v-if="model.applyType == 1"
                :data="tableData2"
                border
                show-summary
@@ -178,6 +167,7 @@
                </el-table-column>
            </el-table>
        </div>
        <span style="font-size: 14px;" v-if="model.status === 2">退回原因：{{model.cancelInfo}} 开票员-{{model.cancelUserId}} {{model.cancelUserName}}</span>
      <el-dialog
          title="上传发票"
          :visible.sync="visible1"
@@ -285,10 +275,11 @@
        if (res.applyType == 0) {
          this.tableData=(res.applyList)
        } else {
            console.log(res.applyList)
            console.log(res.delTaxList)
          this.tableData1=(res.applyList)
          this.tableData2=(res.delTaxList)
        }
        console.log(this.tableData)
      }).catch(err => {
      })
    },
@@ -391,7 +382,7 @@
                font-size: 14px;
                margin-bottom: 20px;
                .info_list_item_label {
                    width: 150px;
                    width: 100px;
                    flex-shrink: 0;
                }
                .info_list_item_val {

 company/src/components/business/modification.vue

@@ -22,13 +22,14 @@
            <el-table-column
                align="center"
                label="保险方案">
                <template slot-scope="{row}">
                    <el-select v-model="row.solution" placeholder="请选择">
                <template slot-scope="scope">
<!--                    :value="{ id:item.id, baseId: item.baseId }"-->
                    <el-select v-model="scope.row.solution.id" @change="changeSolution($event, scope.$index)" placeholder="请选择">
                        <el-option
                            v-for="item in programme"
                            :key="item.id"
                            :label="item.name"
                            :value="{id:item.id,baseId:item.baseId}">
                            :value="item.id">
                        </el-option>
                    </el-select>
                </template>
@@ -93,6 +94,15 @@
            })
        },
        methods: {
            changeSolution(e, index) {
                let baseId = ''
                this.programme.forEach(item => {
                    if (item.id === e) {
                        baseId = item.baseId
                    }
                })
                this.form.solutionList[index].solution.baseId = baseId
            },
            confirm() {
                this.isWorking = true
                updateSolutions(this.form)
@@ -110,7 +120,7 @@
            },
            // 获取全部方案
            getAll() {
                all({ dataType: 0 })
                all({ dataType: 2 })
                    .then(res => {
                        this.programme = res
                    })
@@ -126,11 +136,12 @@
                    .then(resa => {
                        that.form.solutionList = resa.map(item => {
                            return {
                                solution: {id: item.baseSolutionId, baseId: item.solutionId },
                                solution: {id: item.solutionId, baseId: item.solutionBaseId },
                                canAdd: item.canAdd,
                                canReduce: item.canReduce
                            }
                        })
                        console.log(that.form.solutionList)
                        that.visible = true
                    })
            },

 company/src/components/common/UploadAvatarImage.vue

@@ -10,7 +10,7 @@
      :on-success="handleAvatarSuccess"
      :on-error="uploadError"
      :before-upload="beforeAvatarUpload">
      <img v-if=" file.imgurlfull" :src="file.imgurlfull" :style="customStyle" class="avatar">
      <img v-if=" file.imgurlfull" style="width: 100%;" :src="file.imgurlfull" :style="customStyle" class="avatar">
      <div v-else :style="customStyle">
        <i class="el-icon-plus avatar-uploader-icon"></i>
        <div class="tips-style">{{ tipsLabel }}</div>
@@ -68,7 +68,7 @@
</script>

<style lang="scss" scoped>
$image-width: 100px;
$image-width: 90px;
.avatar-uploader {
  width: $image-width;
  height: $image-width;
@@ -78,8 +78,6 @@
  border-radius: 6px;
  cursor: pointer;
  position: relative;
  width: $image-width;
  height: $image-width;
  overflow: hidden;
}
.avatar-uploader .el-upload:hover {
@@ -94,8 +92,8 @@
  text-align: center;
}
.avatar {
  width: $image-width;
  height: $image-width;
  width: 100% !important;
  height: auto !important;
  display: block;
}
.tips-style {

 company/src/components/common/upload.vue

@@ -57,6 +57,7 @@
            },
            getFile(e) {
                if (e.target && e.target.files.length > 0) {
                    this.$emit('loading')
                    const formdate = new FormData()
                    formdate.append('file', e.target.files[0])
                    formdate.append('folder', this.folder)

 company/src/components/enterprise/OperaDispatchUnitWindow.vue

@@ -184,8 +184,12 @@
      // 编辑
      this.$nextTick(() => {
        for (const key in this.form) {
            console.log(key)
            // if (key !== 'saveDuSolutionDTOList') {
          this.form[key] = target[key]
            // }
        }
        console.log(this.form)
      })
    },
      // 确认新建
@@ -227,18 +231,6 @@
          this.$refs.form.validate((valid) => {
              if (!valid) {
                  return
              }
              for (let i = 0; i < this.form.saveDuSolutionDTOList.length; i++) {
                if (!this.form.saveDuSolutionDTOList[i].solutionId) {
                    this.$message.warning(`第${i + 1}项保险方案为空！`)
                    return
                }
                for (let a = 0; a < this.form.saveDuSolutionDTOList[i].saveDuWorkTypeDTOList.length; a++) {
                    if (!this.form.saveDuSolutionDTOList[i].saveDuWorkTypeDTOList[a].workTypeId) {
                        this.$message.warning(`第${i + 1}项保险方案第${a + 1}项工种为空！`)
                        return
                    }
                }
              }
              // 调用新建接口
              this.isWorking = true

 company/src/components/enterprise/additionSubtractionApplication.vue

@@ -184,6 +184,7 @@
    import { all } from '@/api/business/solutions'
    import { getDetail } from '@/api/business/insuranceApply'
    import { create, getChangeCountCyclePriceVO } from '@/api/business/applyChange'
    import { getDate } from '@/utils/util'
    export default {
        name: 'additionSubtractionApplication',
        extends: BaseOpera,
@@ -279,16 +280,20 @@
                getDetail(this.form.id)
                    .then(res => {
                        this.list.push(res)
                        this.item = res
                        this.endTime = res.endTime
                        this.form.solutionId = res.solutionId
                        this.form.solutionsName = res.solutionsName
                        this.pickerOptions = {
                            disabledDate(time) {
                                // - 8.64e7
                                if (getDate()) {

                                }
                                return time.getTime() > new Date(res.endTime).getTime() || time.getTime() < new Date(res.lastChangeDate ? res.lastChangeDate : res.startTime).getTime()
                            }
                        };
                        this.changeSolution1(res.solutionId)
                        // this.changeSolution1(res.solutionId)
                    })
            },
            getSummaries(param) {
@@ -428,6 +433,7 @@
            // 切换方案
            changeSolution1(e) {
                this.company.forEach(item => {
                    console.log(item.id + '-----' + e)
                    if (item.id === e) {
                        console.log(item)
                        this.item = item
@@ -516,7 +522,6 @@
                this.seleData = e.map(item => item.name)
            },
            getValue(list) {
                console.log(list)
                if (this.activeName === '0') {
                    this.form.addDetailList.push(...list)
                } else {

 company/src/utils/util.js

@@ -67,3 +67,11 @@
  return age;
}

// 获取当前日期
export function getDate() {
  let currentDate = new Date();
  let year = currentDate.getFullYear(); // 获取当前年份
  let month = currentDate.getMonth() + 1; // 获取当前月份，注意月份从0开始，所以要加1
  let day = currentDate.getDate(); // 获取当前日期
  return `${year}-${month}-${day}`
}

 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="0"></el-option>
          <el-option label="待审核" value="1"></el-option>
          <el-option label="待签署" value="1"></el-option>
          <el-option label="待审核" value="0"></el-option>
          <el-option label="已生效" value="2"></el-option>
          <el-option label="申请退回" value="3"></el-option>
          <!--                    3 4 都是退回申请中-->
@@ -14,7 +14,7 @@
          <el-option label="已关闭" value="6"></el-option>
        </el-select>
      </el-form-item>
      <el-form-item label="投保企业" prop="companyId">
      <el-form-item label="投保企业" prop="companyId">{{searchForm.companyId}}
        <el-select v-model="searchForm.companyId" placeholder="请选择" @change="search">
          <el-option
              v-for="item in companyList"
@@ -24,7 +24,7 @@
          </el-option>
        </el-select>
      </el-form-item>
      <el-form-item label="保险方案" prop="baseSolutionsId">
      <el-form-item label="保险方案" prop="baseSolutionsId">{{searchForm.baseSolutionsId}}
        <el-select v-model="searchForm.baseSolutionsId" placeholder="请选择" @change="search">
          <el-option
              v-for="item in solutionList"
@@ -64,12 +64,12 @@
        </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 === 0">待签署</span>
            <span  :class="'change-status'+row.status" v-if="row.status === 1">待审核</span>
            <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 === 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>
            <span  :class="'change-status'+row.status" v-if="row.status ===7">已关闭</span>
            <span  :class="'change-status'+row.status" v-if="row.status ===6">已关闭</span>
          </template>
        </el-table-column>
        <el-table-column prop="companyName" label="投保企业" min-width="100px"></el-table-column>
@@ -121,6 +121,8 @@
        solutionsId: '',
        createDateE: '',
        createDateS: '',
        companyId: '',
        baseSolutionsId: '',
        time: []
      },
      solutionList:[],

 company/src/views/business/company.vue

@@ -16,7 +16,7 @@
        <!-- 表格和分页 -->
        <template v-slot:table-wrap>
            <ul class="toolbar" v-permissions="['business:company:create']">
                <li><el-button type="primary" @click="$refs.operaCompanyWindow.open('新建企业',null)" v-permissions="['business:company:create']">新建企业</el-button></li>
                <li><el-button type="primary" @click="$refs.operaCompanyWindow.open('新建企业')" v-permissions="['business:company:create']">新建企业</el-button></li>
            </ul>
            <el-table
                v-loading="isWorking.search"

 company/src/views/business/insuranceApply.vue

@@ -28,16 +28,16 @@
                <el-select v-model="searchForm.baseSolutionId" placeholder="请选择" @change="search">
                    <el-option
                        v-for="item in solutionList"
                        :key="item.id"
                        :key="item.baseId"
                        :label="item.name"
                        :value="item.id">
                        :value="item.baseId">
                    </el-option>
                </el-select>
            </el-form-item>
            <el-form-item label="提交日期" prop="createDate">
            <el-form-item label="提交日期" prop="time">
                <el-date-picker
                    v-model="searchForm.createDate"
                    @change="search"
                    v-model="searchForm.time"
                    @change="changeTime"
                    type="daterange"
                    range-separator="至"
                    value-format="yyyy-MM-dd"
@@ -112,6 +112,7 @@
            searchForm: {
                createTimeS: '',
                createTimeE: '',
                time: [],
                baseSolutionId: '',
                companyId: '',
                statusCollect: ''
@@ -131,6 +132,23 @@
        this.loadSelectList()
    },
    methods:{
        // 搜索框重置
        reset () {
            this.$refs.searchForm.resetFields()
            this.searchForm.createTimeS = ''
            this.searchForm.createTimeE = ''
            this.search()
        },
        changeTime(e) {
            if (e.length > 0) {
                this.searchForm.createTimeS = e[0]
                this.searchForm.createTimeE = e[1]
            } else {
                this.searchForm.createTimeS = ''
                this.searchForm.createTimeE = ''
            }
            this.search()
        },
        // handlePageChange() {
        //   this.search()
        // },

 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="0"></el-option>
          <el-option label="待审核" value="1"></el-option>
          <el-option label="待签署" value="1"></el-option>
          <el-option label="待审核" value="0"></el-option>
          <el-option label="已生效" value="2"></el-option>
          <el-option label="申请退回" value="3"></el-option>
          <!--                    3 4 都是退回申请中-->
@@ -64,12 +64,12 @@
        </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 === 0">待签署</span>
            <span  :class="'change-status'+row.status" v-if="row.status === 1">已签章</span>
            <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 === 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>
            <span  :class="'change-status'+row.status" v-if="row.status ===7">已关闭</span>
            <span :class="'change-status'+ row.status" v-if="row.status ===6">已关闭</span>
          </template>
        </el-table-column>
        <el-table-column prop="companyName" label="投保企业" min-width="100px"></el-table-column>
@@ -119,6 +119,8 @@
        solutionsId: '',
        createDateE: '',
        createDateS: '',
        baseSolutionsId: '',
        companyId: '',
        time: []
      },
      solutionList:[],

 company/src/views/business/taxes.vue

@@ -86,7 +86,7 @@
                    <template slot-scope="{row}">
                        <el-button v-if="row.status == 0 && userInfo.type === 0" type="text" @click="$refs.OperaTaxesUploadWindow.open('上传发票',row)">上传发票</el-button>
                        <el-button v-if="row.status == 1 && userInfo.type === 0" type="text" @click="$refs.OperaTaxesUploadWindow.open('修改发票',row)">修改发票</el-button>
                        <el-button type="text" @click="$refs.OperaTaxesWindow.open('开票申请详情',row)">申请详情</el-button>
                        <el-button type="text" @click="$refs.OperaTaxesWindow.open('开票详情',row)">申请详情</el-button>
                    </template>
                </el-table-column>
            </el-table>
@@ -185,12 +185,13 @@
      },
      changeTime(e) {
          if (e.length > 0) {
              this.searchForm.startDate = e[0]
              this.searchForm.endDate = e[1]
              this.searchForm.startDate = e[0] + ' 00:00:00'
              this.searchForm.endDate = e[1] + ' 23:59:59'
          } else {
              this.searchForm.startDate = ''
              this.searchForm.endDate = ''
          }
          this.search()
      },
    handleRemove (file, fileList) {
      console.log(file, fileList)

 platform/src/api/business/company.js

@@ -17,17 +17,12 @@
    return request.post('/business/company/updateById', data)
}

<<<<<<< HEAD
// 查询全部数据(账号分配企业使用)
export function pageAll (data) {
=======

export function pageAll (data) {
    return request.post('/business/company/list', data)
}
// 查询全部数据(账号分配企业使用)
export function allForFp (data) {
>>>>>>> c421d2deeec5530d8060d8e06b5b86bb02e72dbf
    return request.post('/business/company/pageAll', data)
}


 platform/src/api/business/solutions.js

@@ -36,11 +36,8 @@
export function listForCompany (data) {
    return request.post('/business/companySolution/listForCompany', data)
}
<<<<<<< HEAD

// 根据历史版本查询当前最新启用版本
export function getNewVersion (id) {
    return request.get(`/business/solutions/getNewVersion?solutionId=${id}`)
}
=======
>>>>>>> c421d2deeec5530d8060d8e06b5b86bb02e72dbf

 platform/src/components/system/role/MenuConfigWindow.vue

@@ -50,12 +50,8 @@
     * @role 角色对象
     */
    open (role) {
<<<<<<< HEAD
      if (this.userInfo.type === 1) {
        fetchTree1({})
=======
      fetchMenuList({})
>>>>>>> c421d2deeec5530d8060d8e06b5b86bb02e72dbf
        .then(records => {
          this.role = role
          this.menus = records

 platform/src/layouts/AppLayout.vue

@@ -13,15 +13,9 @@
        <div style="height:10px;"></div>
        <main>
          <transition name="fade">
<<<<<<< HEAD
<!--            <keep-alive>-->
              <router-view></router-view>
<!--            </keep-alive>-->
=======
            <keep-alive>
              <router-view></router-view>
            </keep-alive>
>>>>>>> c421d2deeec5530d8060d8e06b5b86bb02e72dbf
          </transition>
        </main>
      </el-main>

 platform/src/views/business/dispatchUnit.vue

@@ -2,11 +2,7 @@
  <TableLayout :permissions="['business:dispatchunit:query']">
    <!-- 搜索表单 -->
    <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
<<<<<<< HEAD
      <el-form-item label="所属业" prop="companyId">
=======
      <el-form-item label="所属企业" prop="companyId">
>>>>>>> c421d2deeec5530d8060d8e06b5b86bb02e72dbf
        <el-select v-model="searchForm.companyId" placeholder="请选择" @change="search">
          <el-option
              v-for="item in companyList"

 platform/src/views/login.vue

@@ -1,5 +1,4 @@
<template>
<<<<<<< HEAD
    <div class="wrap">
        <div class="introduce">
            <h2>预选清单查询系统</h2>
@@ -30,21 +29,6 @@
                </template>
            </div>
            <el-button :loading="loading" @click="login">登&nbsp;&nbsp;录</el-button>
=======
  <div class="wrap">
    <div class="introduce">
      <h2>预选清单查询系统</h2>
    </div>
    <div class="login">
      <h1>系统登录&nbsp;/&nbsp;LOGIN IN</h1>
      <div class="info-input">
        <el-input v-model="username" placeholder="请输入用户名" prefix-icon="el-icon-user-solid" maxlength="50" v-trim/>
        <el-input v-model="password" placeholder="请输入密码" type="password" prefix-icon="eva-icon-password" maxlength="30" show-password/>
        <div class="captcha-input">
          <el-input v-model="captcha.value" placeholder="图片验证码" prefix-icon="eva-icon-shield" maxlength="4" @keypress.enter.native="login"/>
          <img v-if="!captcha.loading" :src="captcha.uri" @click="refreshCaptcha">
          <span v-else><i class="el-icon-loading"></i></span>
>>>>>>> c421d2deeec5530d8060d8e06b5b86bb02e72dbf
        </div>
    </div>
</template>

 platform/src/views/system/role.vue

@@ -45,12 +45,8 @@
          min-width="270"
          fixed="right"
        >
<<<<<<< HEAD
<!--          v-if="isAdmin || (row.code !== adminCode && userInfo.roles.findIndex(code => code === row.code) === -1)"-->
          <template slot-scope="{row}">
=======
          <template v-if="isAdmin || (row.code !== adminCode && userInfo.roles.findIndex(code => code === row.code) === -1)" slot-scope="{row}">
>>>>>>> c421d2deeec5530d8060d8e06b5b86bb02e72dbf
            <el-button type="text" @click="$refs.operaRoleWindow.open('编辑角色', row)" icon="el-icon-edit" v-permissions="['system:role:update']">编辑</el-button>
            <el-button type="text" @click="$refs.permissionConfigWindow.open(row)" v-permissions="['system:role:createRolePermission']">配置权限</el-button>
            <el-button type="text" @click="$refs.menuConfigWindow.open(row)" icon="el-icon-menu" v-permissions="['system:role:createRoleMenu']">授权菜单</el-button>

 platform/vue.config.js

@@ -3,11 +3,7 @@
// const outputDir = process.env.VUE_APP_CONTEXT_PATH.substring(1, process.env.VUE_APP_CONTEXT_PATH.length)
module.exports = {
  publicPath: './',
<<<<<<< HEAD
  outputDir: 'yyb_web',
=======
  outputDir: 'dest',
>>>>>>> c421d2deeec5530d8060d8e06b5b86bb02e72dbf
  assetsDir: 'static',
  lintOnSave: false,
  devServer: {