update

src/components/vInput/vInput.vue

@@ -1,61 +1,25 @@
 <template>
-  <div class="vInputCom">
-    <el-form
-      ref="form"
-      :model="form"
-      label-width="0px"
-      label-position="left" :inline="true"
-      @submit.native.prevent>
+<div class="vInputCom">
+    <el-form ref="form" :model="form" label-width="0px" label-position="left" :inline="true" @submit.native.prevent>
         <el-form-item v-for="(item,index) in list" :key="index" :prop="item.props">
 
-          <!-- date -->
-          <el-date-picker
-          v-if="item.type==='date'"
-          v-model="date"
-          type="daterange"
-          class="date"
-          size="small"
-          :style="item.style"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-          value-format="yyyy-MM-dd HH:mm:ss"
-          :default-time="['00:00:00', '23:59:59']"
-          :placeholder="item.placeholder">
-          </el-date-picker>
+            <!-- date -->
+            <el-date-picker v-if="item.type==='date'" v-model="date" type="daterange" class="date" size="small" :style="item.style" start-placeholder="开始日期" end-placeholder="结束日期" value-format="yyyy-MM-dd HH:mm:ss" :default-time="['00:00:00', '23:59:59']" :placeholder="item.placeholder">
+            </el-date-picker>
 
-          <!-- select -->
-          <el-select
-          class="select"
-          v-else-if="item.type==='select'"
-          v-model="form[item.props]"
-          :style="item.style"
-          clearable
-          size="small"
-          :placeholder="item.placeholder">
-            <el-option
-            v-for="child in item.options"
-            :key="child.value"
-            :label="child.label"
-            :value="child.value">
-            </el-option>
-          </el-select>
+            <!-- select -->
+            <el-select class="select" v-else-if="item.type==='select'" v-model="form[item.props]" :style="item.style" clearable size="small" :placeholder="item.placeholder">
+                <el-option v-for="child in item.options" :key="child.value" :label="child.label" :value="child.value">
+                </el-option>
+            </el-select>
 
-          <!-- input -->
-          <el-input
-          v-else
-          :maxlength="item.max"
-          size="small"
-          @keyup.enter.native="search"
-          prefix-icon="el-icon-search"
-          v-model.trim="form[item.props]"
-          :placeholder="item.placeholder"
-          :style="item.style"
-          >
-          </el-input>
+            <!-- input -->
+            <el-input v-else :maxlength="item.max" size="small" @keyup.enter.native="search" prefix-icon="el-icon-search" v-model.trim="form[item.props]" :placeholder="item.placeholder" :style="item.style">
+            </el-input>
 
         </el-form-item>
 
-      <!-- <span class="input_btn">
+        <!-- <span class="input_btn">
         <el-button
         class="search_btn"
         @click="search()"
@@ -67,19 +31,15 @@
       </span> -->
         <!-- btnGroup -->
         <el-form-item>
-          <span class="tool" v-for="(item,index) in btn" :key="index">
-            <el-button
-            :icon="item.icon"
-            size="small"
-            @click="btnMethods(item)"
-            >{{item.name}}
-            </el-button>
-            <span class="prompt" v-if="item.message">{{item.message}}</span>
-          </span>
+            <span class="tool" v-for="(item,index) in btn" :key="index">
+                <el-button :icon="item.icon" size="small" :type="item.type" @click="btnMethods(item)">{{item.name}}
+                </el-button>
+                <span class="prompt" v-if="item.message">{{item.message}}</span>
+            </span>
         </el-form-item>
 
     </el-form>
-  </div>
+</div>
 </template>
 
 <script>
@@ -129,7 +89,7 @@ export default {
 }
 </script>
 
-<style lang='scss' scoped>
+<style lang="scss" scoped>
 // .date{
 //   width: 250px!important;
 // }
@@ -137,17 +97,18 @@ export default {
 //   width: 170px!important;
 // }
 // @import './vInput.scss';
-.prompt{
-  // display: block;
-  width: 100px;
-  line-height: 18px;
-  word-wrap:break-word!important;
-  word-break:break-all;
-  color:#bbb;
-  background-color: #fff;
-  font-size: 10px;
+.prompt {
+    // display: block;
+    width: 100px;
+    line-height: 18px;
+    word-wrap: break-word !important;
+    word-break: break-all;
+    color: #bbb;
+    background-color: #fff;
+    font-size: 10px;
 }
-.tool{
-  padding: 0 5px;
+
+.tool {
+    padding: 0 5px;
 }
 </style>

src/components/vTable/vTable.vue

@@ -1,111 +1,66 @@
 <template>
-  <div class="vTableCom">
-    <el-table
-      ref="multipleTable"
-      :data="tableList"
-      header-row-class-name="tableHeader"
-      header-cell-class-name="tableHeader"
-      @selection-change="handleSelectionChange"
-      @sort-change='sortthiscolumn'
-      size="mini"
-      :row-class-name="tableRowClassName"
-      style="width: 100%">
-
-      <!-- selection -->
-      <el-table-column
-        v-if="table.selection"
-        align="center"
-        :fixed="table.fixed"
-        type="selection"
-        width="55">
-      </el-table-column>
-
-      <!-- column -->
-      <el-table-column
-        align="center"
-        :width="item.width"
-        :prop="item.props"
-        :label="item.label"
-        :sortable="item.sortable?'custom':false"
-        v-for="(item,index) in table.column"
-        :key="index">
-        <template slot-scope="scope">
-
-          <!-- slot 自定义插槽 可以用一个变量来接受item和scope (在订单列表中有使用，可以查看使用方法)-->
-          <slot v-if="item.type==='slot'" name="slot" :item="item" :scope="scope.row"></slot>
-
-          <!-- date -->
-          <span v-else-if="item.type==='date'">
-            <span v-if="item.format==='YMD'">{{$utils.formatYMD(scope.row[item.props])}}</span>
-            <span v-else>{{$utils.format(scope.row[item.props])}}</span>
-          </span>
-
-          <span v-else-if="item.type==='imgList'">
-            <el-image
-              v-for="i in scope.row[item.props]"
-              :key="i.id"
-              style="width: 70px; height: 70px"
-              :src="$img+i.imgPath"
-              :preview-src-list="scope.row[item.props].map(it => $img+it.imgPath)">
-            </el-image>
-          </span>
-
-          <el-popover
-            placement="left"
-            v-else-if="item.type==='cover'"
-            width="200"
-            trigger="hover">
-            <img slot="reference" class="img" :src="scope.row[item.props]" alt="">
-            <img class="w-100" :src="scope.row[item.props]" alt="">
-          </el-popover>
-
-          <!-- pic -->
-          <el-popover
-            placement="left"
-            v-else-if="item.type==='pic'"
-            width="200"
-            trigger="hover">
-            <img slot="reference" class="img" :src="$img+scope.row[item.props]" alt="">
-            <img class="w-100" :src="$img+scope.row[item.props]" alt="">
-          </el-popover>
-
-          <!-- <span v-else-if="item.state">{{item.state[scope.row[item.props]]}}</span> -->
-
-          <!-- option -->
-          <span v-else-if="item.options">{{item.options[scope.row[item.props]]}}</span>
-
-          <span v-else-if="item.html" v-html="scope.row[item.props]"></span>
-
-          <!-- normal -->
-          <span v-else>{{scope.row[item.props]}}</span>
-
-        </template>
-      </el-table-column>
-
-      <!-- handle -->
-      <el-table-column
-      label="操作"
-      v-if="table.handle"
-      :fixed="table.fixed && 'right'"
-      :width="table.width"
-      align="center">
-        <template slot-scope="scope">
-          <el-button-group style="display:flex;justify-content: center;">
-            <el-button
-              v-for="(item,index) in table.handle.filter(item => scope.row[item.props] === item.key)"
-              :key="index"
-              size="small"
-              style="margin:0px;"
-              class="btn handelBtn"
-              @click="handleMethods(scope.$index, scope.row, item)">
-              {{item.title}}
-              <!-- v-if="scope.row[item.props]===item.key" -->
-            </el-button>
-          </el-button-group>
-        </template>
-      </el-table-column>
+<div class="vTableCom">
+    <el-table ref="multipleTable" :data="tableList" header-row-class-name="tableHeader" header-cell-class-name="tableHeader" @selection-change="handleSelectionChange" @sort-change='sortthiscolumn' size="mini" :row-class-name="tableRowClassName" style="width: 100%">
+
+        <!-- selection -->
+        <el-table-column v-if="table.selection" align="center" :fixed="table.fixed" type="selection" width="55">
+        </el-table-column>
+
+        <!-- column -->
+        <el-table-column align="center" :width="item.width" :prop="item.props" :label="item.label" :sortable="item.sortable?'custom':false" v-for="(item,index) in table.column" :key="index">
+            <template slot-scope="scope">
+
+                <!-- slot 自定义插槽 可以用一个变量来接受item和scope (在订单列表中有使用，可以查看使用方法)-->
+                <slot v-if="item.type==='slot'" name="slot" :item="item" :scope="scope.row"></slot>
+
+                <!-- date -->
+                <span v-else-if="item.type==='date'">
+                    <span v-if="item.format==='YMD'">{{$utils.formatYMD(scope.row[item.props])}}</span>
+                    <span v-else>{{$utils.format(scope.row[item.props])}}</span>
+                </span>
+
+                <span v-else-if="item.type==='imgList'">
+                    <el-image v-for="i in scope.row[item.props]" :key="i.id" style="width: 70px; height: 70px" :src="$img+i.imgPath" :preview-src-list="scope.row[item.props].map(it => $img+it.imgPath)">
+                    </el-image>
+                </span>
+
+                <el-popover placement="left" v-else-if="item.type==='cover'" width="200" trigger="hover">
+                    <img slot="reference" class="img" :src="scope.row[item.props]" alt="">
+                    <img class="w-100" :src="scope.row[item.props]" alt="">
+                </el-popover>
+
+                <!-- pic -->
+                <el-popover placement="left" v-else-if="item.type==='pic'" width="200" trigger="hover">
+                    <img slot="reference" class="img" :src="$img+scope.row[item.props]" alt="">
+                    <img class="w-100" :src="$img+scope.row[item.props]" alt="">
+                </el-popover>
+
+                <!-- <span v-else-if="item.state">{{item.state[scope.row[item.props]]}}</span> -->
+
+                <!-- option -->
+                <span v-else-if="item.options">{{item.options[scope.row[item.props]]}}</span>
+
+                <span v-else-if="item.html" v-html="scope.row[item.props]"></span>
+
+                <!-- normal -->
+                <span v-else>{{scope.row[item.props]}}</span>
+
+            </template>
+        </el-table-column>
+
+        <!-- handle -->
+        <el-table-column label="操作" v-if="table.handle" :fixed="table.fixed && 'right'" :width="table.width" align="center">
+            <template slot-scope="scope">
+                <el-button-group style="display:flex;justify-content: center;">
+                    <el-button v-for="(item,index) in table.handle.filter(item => scope.row[item.props] === item.key)" :key="index" size="small" :type="item.type" style="margin:0px;" class="btn handelBtn" @click="handleMethods(scope.$index, scope.row, item)">
+                        {{item.title}}
+                        <!-- v-if="scope.row[item.props]===item.key" -->
+                    </el-button>
+                </el-button-group>
+            </template>
+        </el-table-column>
     </el-table>
-  </div>
+</div>
 </template>
 
 <script>
@@ -150,8 +105,7 @@ export default {
       orderItem: {}
     }
   },
-  mounted () {
-  },
+  mounted () {},
   methods: {
     handleMethods (index, item, v) {
       this.$emit(v.method, item)
@@ -159,13 +113,20 @@ export default {
     handleSelectionChange (val) {
       this.id && this.$emit('selection-change', val.map(item => item[this.id]))
     },
-    tableRowClassName ({ row, rowIndex }) {
+    tableRowClassName ({
+      row,
+      rowIndex
+    }) {
       if (this.errorList.includes(rowIndex)) {
         return 'error-row'
       }
       return ''
     },
-    sortthiscolumn ({ column, prop, order }) {
+    sortthiscolumn ({
+      column,
+      prop,
+      order
+    }) {
       this.orderItem = order
         ? {
           [prop]: order === 'ascending' ? 'ASC' : 'DESC'
@@ -178,11 +139,9 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-    @import './vTable.scss';
-</style>
-
-<style lang='scss'>
+@import './vTable.scss';
+</style><style lang="scss">
 .el-table .error-row {
-  background: rgba($color: red, $alpha: 0.3);
+    background: rgba($color: red, $alpha: 0.3);
 }
 </style>

src/views/candidateManage/candidateAll.vue

@@ -223,6 +223,10 @@ export default {
           props: 'delivererPhone'
         },
         {
+          label: '邮箱',
+          props: 'delivererMail'
+        },
+        {
           label: '面试应聘职位',
           props: 'positionName'
         },

src/views/candidateManage/candidateList.vue

@@ -219,18 +219,18 @@ export default {
         method: 'search'
       },
       {
-        name: '标记通过',
+        name: '通过',
         type: 'success',
         method: 'through'
       },
       {
-        name: '标记淘汰',
+        name: '淘汰',
         type: 'danger',
         method: 'eliminate'
       },
       {
-        name: '标记待定',
-        type: 'danger',
+        name: '待定',
+        type: 'warning',
         method: 'undetermined'
       }
       ],
@@ -251,7 +251,7 @@ export default {
         method: 'search'
       },
       {
-        name: '标记通过',
+        name: '通过',
         type: 'success',
         method: 'through'
       },
@@ -267,12 +267,12 @@ export default {
         method: 'search'
       },
       {
-        name: '标记通过',
+        name: '通过',
         type: 'success',
         method: 'through'
       },
       {
-        name: '标记淘汰',
+        name: '淘汰',
         type: 'danger',
         method: 'eliminate'
       }
@@ -323,6 +323,10 @@ export default {
           props: 'delivererPhone'
         },
         {
+          label: '邮箱',
+          props: 'delivererMail'
+        },
+        {
           label: '通知面试时间',
           props: 'sendMailTime'
         },
@@ -343,19 +347,19 @@ export default {
           type: 'info'
         },
         {
-          title: '标记通过',
+          title: '通过',
           method: 'through',
           type: 'success'
         },
         {
-          title: '标记淘汰',
+          title: '淘汰',
           method: 'eliminate',
           type: 'danger'
         },
         {
-          title: '标记待定',
+          title: '待定',
           method: 'undetermined',
-          type: 'danger'
+          type: 'warning'
         },
         {
           title: '修改信息',
@@ -405,6 +409,10 @@ export default {
           props: 'delivererPhone'
         },
         {
+          label: '邮箱',
+          props: 'delivererMail'
+        },
+        {
           label: '被标记未通过时间',
           props: 'rejectTime'
         },
@@ -420,7 +428,7 @@ export default {
           type: 'info'
         },
         {
-          title: '标记通过',
+          title: '通过',
           method: 'through',
           type: 'success'
         },
@@ -432,7 +440,7 @@ export default {
         {
           title: '修改信息',
           method: 'update',
-          type: 'info'
+          type: 'warning'
         }
         ]
       },
@@ -475,6 +483,10 @@ export default {
         {
           label: '联系电话',
           props: 'delivererPhone'
+        },
+        {
+          label: '邮箱',
+          props: 'delivererMail'
         }
         ],
         width: 420,
@@ -489,19 +501,19 @@ export default {
           type: 'info'
         },
         {
-          title: '标记通过',
+          title: '通过',
           method: 'through',
           type: 'success'
         },
         {
-          title: '标记淘汰',
+          title: '淘汰',
           method: 'eliminate',
           type: 'danger'
         },
         {
           title: '修改信息',
           method: 'update',
-          type: 'info'
+          type: 'warning'
         }
         ]
       }
@@ -825,19 +837,19 @@ export default {
             type: 'info'
           },
           {
-            title: '标记通过',
+            title: '通过',
             method: 'through',
             type: 'success'
           },
           {
-            title: '标记淘汰',
+            title: '淘汰',
             method: 'eliminate',
             type: 'danger'
           },
           {
-            title: '标记待定',
+            title: '待定',
             method: 'undetermined',
-            type: 'danger'
+            type: 'warning'
           },
           {
             title: '修改信息',

src/views/candidateManage/mailManage.vue

@@ -9,7 +9,6 @@
 <template>
 <div class="mailManage">
     <el-card class="box-card">
-        <div class="title">收件邮箱</div>
         <el-form ref="form51" :model="form51" :rules="rules" label-width="140px" label-position="left">
             <el-form-item label="51job邮箱" prop="cmpMailAccount">
                 <el-input v-model.trim="form51.cmpMailAccount"></el-input>
@@ -64,26 +63,6 @@
                 <el-button type="primary" @click="determine(2)">验证并使用</el-button>
             </el-form-item>
         </el-form>
-        <div class="title">发件邮箱</div>
-        <el-form ref="form" :model="form" :rules="rules" label-width="140px" label-position="left">
-            <el-form-item label="发件邮箱" prop="cmpMailAccount">
-                <el-input v-model.trim="form.cmpMailAccount"></el-input>
-            </el-form-item>
-            <el-form-item label="密码" prop="cmpMailPassword">
-                <el-input v-model.trim="form.cmpMailPassword" show-password></el-input>
-            </el-form-item>
-            <el-form-item label="邮箱类型">
-                <el-radio-group v-model="form.cmpMailType">
-                    <el-radio :label="0">阿里</el-radio>
-                    <el-radio :label="1">网易</el-radio>
-                    <el-radio :label="2">QQ</el-radio>
-                </el-radio-group>
-            </el-form-item>
-            <el-form-item class="button-grounp">
-                <el-button type="primary" @click="submit">验证并使用</el-button>
-            </el-form-item>
-            <div class="info">提示：接受简历的邮箱地址或者密码变更后，需要在本页面修改并点击重新验证，生效时间约30分钟至1小时；如未生效，请联系平台管理员。</div>
-        </el-form>
     </el-card>
 </div>
 </template>
@@ -129,36 +108,29 @@ export default {
           list[0] && Object.assign(this.form51, list[0])
           list[1] && Object.assign(this.formzl, list[1])
           list[2] && Object.assign(this.form58, list[2])
-          this.form = res.list.some(item => item.useType === 1) ? res.list.find(item => item.useType === 1) : {}
-        })
-    }
-    let submit = () => {
-      let a
-      this.$refs['form'].validate((valid) => {
-        a = valid
-      })
-      if (!a) return
-      let reqdata = this.form
-      reqdata.useType = 1
-      let url = reqdata.id ? '/companyAccount/updateCompanyAccount' : '/companyAccount/saveReceiverMail'
-      this.$api
-        .post(url, {
-          reqdata
-        })
-        .then((res) => {
-          this.$message({
-            type: 'success',
-            message: '验证发件邮箱成功!'
-          })
-          // try {
-          //   res.list.forEach((item, index) => {
-          //     this[index === 0 ? 'form51' : index === 1 ? 'formzl' : 'form58'] = item
-          //   })
-          // } catch (error) {
-          //   console.log(error)
-          // }
+          // this.form = res.list.some(item => item.useType === 1) ? res.list.find(item => item.useType === 1) : {}
         })
     }
+    // let submit = () => {
+    //   let a
+    //   this.$refs['form'].validate((valid) => {
+    //     a = valid
+    //   })
+    //   if (!a) return
+    //   let reqdata = this.form
+    //   reqdata.useType = 1
+    //   let url = reqdata.id ? '/companyAccount/updateCompanyAccount' : '/companyAccount/saveReceiverMail'
+    //   this.$api
+    //     .post(url, {
+    //       reqdata
+    //     })
+    //     .then((res) => {
+    //       this.$message({
+    //         type: 'success',
+    //         message: '验证发件邮箱成功!'
+    //       })
+    //     })
+    // }
     return {
       form51: {
         cmpMailAccount: '',
@@ -175,14 +147,13 @@ export default {
         cmpMailPassword: '',
         cmpMailType: 0
       },
-      form: {
-        cmpMailAccount: '',
-        cmpMailPassword: '',
-        cmpMailType: 0
-      },
+      // form: {
+      //   cmpMailAccount: '',
+      //   cmpMailPassword: '',
+      //   cmpMailType: 0
+      // },
       determine,
       queryDate,
-      submit,
       rules: {
         cmpMailAccount: [{
           required: true,

src/views/candidateManage/resumeList.vue

@@ -197,18 +197,18 @@ export default {
         method: 'search'
       },
       {
-        name: '标记待定',
-        type: 'success',
+        name: '待定',
+        type: 'warning',
         method: 'undetermined'
       },
       {
-        name: '标记通过',
-        type: 'primary',
+        name: '通过',
+        type: 'success',
         method: 'through'
       },
       {
-        name: '标记淘汰',
-        type: 'warning',
+        name: '淘汰',
+        type: 'danger',
         method: 'eliminate'
       },
       {
@@ -256,6 +256,10 @@ export default {
         {
           label: '联系电话',
           props: 'delivererPhone'
+        },
+        {
+          label: '邮箱',
+          props: 'delivererMail'
         }
         ],
         width: 500,
@@ -265,19 +269,19 @@ export default {
           type: 'info'
         },
         {
-          title: '标记待定',
+          title: '待定',
           method: 'undetermined',
-          type: 'success'
+          type: 'warning'
         },
         {
-          title: '标记通过',
+          title: '通过',
           method: 'through',
-          type: 'primary'
+          type: 'success'
         },
         {
-          title: '标记淘汰',
+          title: '淘汰',
           method: 'eliminate',
-          type: 'warning'
+          type: 'danger'
         },
         {
           title: '删除',
@@ -287,7 +291,7 @@ export default {
         {
           title: '修改信息',
           method: 'update',
-          type: 'info'
+          type: 'warning'
         }
         ]
       },
@@ -335,6 +339,10 @@ export default {
         {
           label: '联系电话',
           props: 'delivererPhone'
+        },
+        {
+          label: '邮箱',
+          props: 'delivererMail'
         }
         ],
         width: 360,
@@ -674,29 +682,29 @@ export default {
           type: 'info'
         },
         {
-          title: '标记待定',
+          title: '待定',
           method: 'undetermined',
-          type: 'success'
+          type: 'warning'
         },
         {
-          title: '标记通过',
+          title: '通过',
           method: 'through',
-          type: 'primary'
+          type: 'success'
         },
         {
-          title: '标记淘汰',
+          title: '淘汰',
           method: 'eliminate',
-          type: 'warning'
+          type: 'danger'
         },
         {
-          title: '标记待定',
+          title: '待定',
           method: 'undetermined',
-          type: 'warning'
+          type: 'danger'
         },
         {
           title: '修改信息',
           method: 'update',
-          type: 'info'
+          type: 'update'
         }
         ]
           : this.isCollapse === 1 ? [{
@@ -705,9 +713,9 @@ export default {
             type: 'info'
           },
           {
-            title: '标记淘汰',
+            title: '淘汰',
             method: 'eliminate',
-            type: 'warning'
+            type: 'danger'
           },
           {
             title: '通知面试',
@@ -717,7 +725,7 @@ export default {
           {
             title: '修改信息',
             method: 'update',
-            type: 'info'
+            type: 'warning'
           }
           ]
             : this.isCollapse === 2 ? [{
@@ -726,9 +734,9 @@ export default {
               type: 'info'
             },
             {
-              title: '标记通过',
+              title: '通过',
               method: 'through',
-              type: 'primary'
+              type: 'success'
             },
             {
               title: '删除',
@@ -738,7 +746,7 @@ export default {
             {
               title: '修改信息',
               method: 'update',
-              type: 'info'
+              type: 'warning'
             }
             ] : [{
               title: '查看简历',
@@ -751,19 +759,19 @@ export default {
             //   type: 'success'
             // },
             {
-              title: '标记通过',
+              title: '通过',
               method: 'through',
-              type: 'primary'
+              type: 'success'
             },
             {
-              title: '标记淘汰',
+              title: '淘汰',
               method: 'eliminate',
-              type: 'warning'
+              type: 'danger'
             },
             {
               title: '修改信息',
               method: 'update',
-              type: 'info'
+              type: 'warning'
             }
             ]
       )
@@ -776,18 +784,18 @@ export default {
           method: 'search'
         },
         {
-          name: '标记待定',
-          type: 'success',
+          name: '待定',
+          type: 'warning',
           method: 'undetermined'
         },
         {
-          name: '标记通过',
-          type: 'primary',
+          name: '通过',
+          type: 'success',
           method: 'through'
         },
         {
-          name: '标记淘汰',
-          type: 'warning',
+          name: '淘汰',
+          type: 'danger',
           method: 'eliminate'
         },
         {
@@ -807,8 +815,8 @@ export default {
             method: 'notice'
           },
           {
-            name: '标记淘汰',
-            type: 'warning',
+            name: '淘汰',
+            type: 'danger',
             method: 'eliminate'
           }
           ]
@@ -818,8 +826,8 @@ export default {
               method: 'search'
             },
             {
-              name: '标记通过',
-              type: 'primary',
+              name: '通过',
+              type: 'success',
               method: 'through'
             },
             {
@@ -834,8 +842,8 @@ export default {
                 method: 'search'
               },
               {
-                name: '标记通过',
-                type: 'primary',
+                name: '通过',
+                type: 'success',
                 method: 'through'
               },
               {

src/views/companyManage/basicInfo.vue

@@ -9,13 +9,26 @@
 <template>
 <div class="basicInfo">
     <el-card class="box-card">
-        <el-form ref="form" :model="form" label-width="140px" label-position="left">
-            <el-form-item label="公司名称">
+        <el-form ref="form" :model="form" label-width="140px" :rules="rules" label-position="left">
+            <el-form-item label="公司名称" prop="companyName">
                 <el-input disabled v-model.trim="form.companyName"></el-input>
             </el-form-item>
             <el-form-item label="公司地址">
                 <el-input v-model.trim="form.companyAddress"></el-input>
             </el-form-item>
+            <el-form-item label="发件邮箱" prop="cmpMailAccount">
+                <el-input v-model.trim="form.cmpMailAccount"></el-input>
+            </el-form-item>
+            <el-form-item label="密码" prop="cmpMailPassword">
+                <el-input v-model.trim="form.cmpMailPassword" show-password></el-input>
+            </el-form-item>
+            <el-form-item label="邮箱类型">
+                <el-radio-group v-model="form.cmpMailType">
+                    <el-radio :label="0">阿里</el-radio>
+                    <el-radio :label="1">网易</el-radio>
+                    <el-radio :label="2">QQ</el-radio>
+                </el-radio-group>
+            </el-form-item>
             <el-form-item label="公司简介">
                 <editor-bar class="editor" v-model.trim="form.companyIntroduce"></editor-bar>
             </el-form-item>
@@ -32,7 +45,26 @@ import EditorBar from '../../components/wangEnduit/wangEnduit'
 export default {
   data () {
     return {
-      form: {}
+      form: {
+        cmpMailType: 0
+      },
+      rules: {
+        companyAddress: [{
+          required: true,
+          message: '请输入公司名称',
+          trigger: 'blur'
+        }],
+        cmpMailAccount: [{
+          required: true,
+          message: '请输入邮箱账号',
+          trigger: 'blur'
+        }],
+        cmpMailPassword: [{
+          required: true,
+          message: '请输入邮箱密码',
+          trigger: 'blur'
+        }]
+      }
     }
   },
   components: {
@@ -40,8 +72,18 @@ export default {
   },
   created () {
     this.getDetails()
+    this.queryEmail()
   },
   methods: {
+    queryEmail () {
+      this.$api
+        .post('/companyAccount/queryCompanyAccountList', {
+          reqdata: {}
+        })
+        .then((res) => {
+          this.form = Object.assign({}, this.form, res.list.some(item => item.useType === 1) ? res.list.find(item => item.useType === 1) : {})
+        })
+    },
     getDetails () {
       let url = '/companyInfo/queryCompanyInfo'
       let reqdata = {}
@@ -50,10 +92,16 @@ export default {
           reqdata
         })
         .then((res) => {
-          this.form = res.object
+          this.form = Object.assign({}, this.form, res.object)
         })
     },
     determine () {
+      console.log(this.form.cmpMailAccount)
+      let a
+      this.$refs['form'].validate((valid) => {
+        a = valid
+      })
+      if (!a) return
       let url = '/companyInfo/updateCompanyInfo'
       let reqdata = this.form
       this.$api
@@ -61,7 +109,20 @@ export default {
           reqdata
         })
         .then((res) => {
-          this.getDetails()
+          let reqdata = this.form
+          reqdata.useType = 1
+          let url = reqdata.id ? '/companyAccount/updateCompanyAccount' : '/companyAccount/saveReceiverMail'
+          this.$api
+            .post(url, {
+              reqdata
+            })
+            .then((res) => {
+              this.$message({
+                message: '修改成功！',
+                type: 'success'
+              })
+              this.getDetails()
+            })
         })
     }
   }

src/views/companyManage/formManage.vue

@@ -265,6 +265,6 @@ export default {
 }
 
 .p10 {
-    padding: 8px;
+    padding: 8px 0 8px 0;
 }
 </style>

src/views/companyManage/procedureManage.vue

@@ -8,7 +8,7 @@
 -->
 <template>
 <div class="indexPage">
-    <v-input :btn="btn" :list="list" @add="add"></v-input>
+    <v-input :btn="btn" :list="list" @add="add" @addVideo="addVideo"></v-input>
     <v-table :table="table" :tableList="tableList" :sortType="true" :queryData="queryData" @details="details" @editor="editor" @del="del"></v-table>
     <!-- :prop="'questionList.' + index + '.questionName'" -->
     <v-pager @page="callPage" :total="totalrecords"></v-pager>
@@ -87,7 +87,13 @@ export default {
         name: '添加',
         type: 'success',
         method: 'add'
-      }],
+      },
+      {
+        name: '添加视频',
+        type: 'primary',
+        method: 'addVideo'
+      }
+      ],
       table: {
         column: [{
           label: '编号',
@@ -174,6 +180,11 @@ export default {
           console.log(this.form)
         })
     },
+    addVideo () {
+      this.$router.push({
+        name: 'videoManage'
+      })
+    },
     details (row) {
       this.getDetails(row)
       this.state = 2