Merge remote-tracking branch 'origin/master'

nidapeng

2024-03-14 7ad3d376d3ccb029bb8077725aa70747b0ebb2ad

 company/src/components/business/OperaCompanyWindow.vue

@@ -16,17 +16,17 @@
            <el-form-item label="法人姓名" prop="legalName">
                <el-input v-model="form.legalName" placeholder="请输入" v-trim/>
            </el-form-item>
            <el-form-item label="绑定手机号" prop="phone" v-if="form.type !== 1">
            <el-form-item label="绑定手机号" prop="phone" v-if="!form.id">
                <div style="width: 100%; display: flex; align-items: center;">
                    <el-input v-model="form.phone" maxlength="11" type="number" style="flex: 1;" placeholder="请输入" v-trim/>
                    <el-button type="primary" style="flex-shrink: 0; margin-left: 15px;" @click="send" v-if="num === 0">发送验证码</el-button>
                    <el-button type="primary" style="flex-shrink: 0; margin-left: 15px;" v-else>{{num}}s</el-button>
                </div>
            </el-form-item>
            <el-form-item label="验证码" prop="captche" v-if="form.type !== 1">
            <el-form-item label="验证码" prop="captche" v-if="!form.id">
                <el-input v-model="form.captche" placeholder="请输入" v-trim/>
            </el-form-item>
            <el-form-item label="公司账号" prop="username" v-if="form.type !== 1">
            <el-form-item label="公司账号" prop="username" v-if="!form.id">
                <el-input v-model="form.username" placeholder="请输入" v-trim/>
            </el-form-item>
            <el-form-item label="认证邮箱" prop="email" >
@@ -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,20 +62,15 @@
                    <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-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>-->
        </el-form>
        <el-button type="primary" style="margin-bottom: 15px;" @click="add" v-if="form.type !== 1">添加</el-button>
        <el-button type="primary" style="margin-bottom: 15px;" @click="add" v-if="!form.id">添加</el-button>
        <el-table
            v-if="form.type !== 1"
            v-if="!form.id"
            :data="form.solutionList"
            border
            style="width: 100%">
@@ -171,6 +161,7 @@
          }
        ],
        type: '0',
        actionType: '0',
        file: {
          imgurl: '',
          imgurlfull: ''
@@ -208,9 +199,9 @@
        phone: [
          { required: true, message: '请输入手机号' }
        ],
        taxAccount: [
          { required: true, message: '请输入手机号' }
        ],
        // taxAccount: [
        //   { required: true, message: '请输入银行卡' }
        // ],
        email: [
          { required: true, message: '请输入认证邮箱' }
        ],
@@ -227,7 +218,6 @@
          { required: true, message: '请输入公司账号' }
        ]
      },

      programme: []
    }
  },