Merge remote-tracking branch 'origin/master'

nidapeng

2024-03-14 7ad3d376d3ccb029bb8077725aa70747b0ebb2ad

 company/src/components/business/OperaCompanyWindow.vue

@@ -23,10 +23,10 @@
                    <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" >
@@ -68,9 +68,9 @@
<!--                </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%">
@@ -161,6 +161,7 @@
          }
        ],
        type: '0',
        actionType: '0',
        file: {
          imgurl: '',
          imgurlfull: ''
@@ -217,7 +218,6 @@
          { required: true, message: '请输入公司账号' }
        ]
      },

      programme: []
    }
  },