Merge branch 'master' of http://gitlab.yiboshi.com/XuJun/yn-science-front

src/views/report/expert/index.vue

@@ -14,6 +14,13 @@
           <a-select-option value="女">女</a-select-option>
         </a-select>
       </a-form-item>
+      <a-form-item>
+        <a-select v-model="searchForm.reportState" style="width: 130px" placeholder="上报状态">
+          <a-select-option value="">--请选择上报状态--</a-select-option>
+          <a-select-option value="1">未上报</a-select-option>
+          <a-select-option value="2">已上报</a-select-option>
+        </a-select>
+      </a-form-item>
       <a-form-item v-if="isShow">
         <a-input v-model="searchForm.unitName" placeholder="单位" :maxLength="100" style="width: 130px" />
       </a-form-item>
@@ -47,13 +54,16 @@
       <template slot="spec" slot-scope="record">
         <span v-for="data in record.specList" :key="data.id" :color="'green'">{{data.specName+' '}}</span>
       </template>
+      <template slot="reportState" slot-scope="record">
+        <span v-if="record.reportState===2">已上报</span>
+        <span v-else>未上报</span>
+      </template>
       <template slot="stateSwitch" slot-scope="record">
         <a-switch checked-children="启用" un-checked-children="停用" :checked="checkedState(record)" @change="switchChange($event,record)" />
       </template>
       <template slot="option" slot-scope="record">
+        <a-button v-if="record.reportState!==2" type="link" size="small" @click="recordClick(record,'report')">上报</a-button>
         <a-button type="link" size="small" @click="recordClick(record,'edit')">修改</a-button>
-        <a-button type="link" size="small" @click="recordClick(record,'reset')">重置密码</a-button>
-        <a-button type="link" size="small" @click="recordClick(record,'report')">上报</a-button>
         <a-button type="link" size="small" @click="recordClick(record,'del')">删除</a-button>
       </template>
     </a-table>
@@ -93,6 +103,7 @@ export default {
         { title: '评审专业', scopedSlots: { customRender: 'spec' }, width: '10%', },
         { title: '单位', dataIndex: 'unitName', align: 'center' },
         { title: '用户名', dataIndex: 'username', align: 'center' },
+        { title: '上报状态', scopedSlots: { customRender: 'reportState' }, align: 'center' },
         { title: '状态', scopedSlots: { customRender: 'stateSwitch' }, align: 'center' },
         { title: '操作', scopedSlots: { customRender: 'option' }, align: 'center', fixed: 'right', width: '180px', },
       ],
@@ -285,4 +296,4 @@ export default {
     },
   }
 }
-</script>
\ No newline at end of file
+</script>