Merge remote-tracking branch 'origin/master'

src/api/luckyDraw/LuckyDrawMemberService.js

@@ -22,11 +22,11 @@ export default class LuckyDrawMemberService {
       params: {id: id}
     })
   }
-  remove (id) {
+  remove (ids) {
     return request({
       url: '/luckyDraw/member/remove',
-      method: 'get',
-      params: {id: id}
+      method: 'delete',
+      params: {ids: ids}
     })
   }
 }

src/views/modules/cw/reportManagement/ReportManagementSignatureForm.vue

@@ -843,8 +843,8 @@
       },
       startForm (callback) {
         this.loading = true
-        this.projectReportService.queryById(this.inputForm.id).then(({data}) => {
-          if (data.signatureType === '1') {
+        if (this.inputForm.signatureType) {
+          if (this.inputForm.signatureType === '1') {
             this.projectReportService.findBySignatureId(this.inputForm.sid1).then(({data}) => {
               if (data.status !== '0' && data.status !== '1' && data.status !== '3') { // 审核状态不是“未发起”或“暂存”或“撤回”，就弹出提示
                 this.loading = false
@@ -855,7 +855,7 @@
               }
             })
           }
-          if (data.signatureType === '2') {
+          if (this.inputForm.signatureType === '2') {
             this.projectReportService.findBySignatureId(this.inputForm.sid2).then(({data}) => {
               if (data.status !== '0' && data.status !== '1' && data.status !== '3') { // 审核状态不是“未发起”或“暂存”或“撤回”，就弹出提示
                 this.loading = false
@@ -866,7 +866,7 @@
               }
             })
           }
-          if (data.signatureType === '3') {
+          if (this.inputForm.signatureType === '3') {
             this.projectReportService.findBySignatureId(this.inputForm.sid3).then(({data}) => {
               if (data.status !== '0' && data.status !== '1' && data.status !== '3') { // 审核状态不是“未发起”或“暂存”或“撤回”，就弹出提示
                 this.loading = false
@@ -877,7 +877,7 @@
               }
             })
           }
-        })
+        }
       },
       startFormTrue (callback) {
         this.loading = true

src/views/modules/luckyDraw/LuckyDrawEventsList.vue

@@ -66,7 +66,7 @@
               <el-button v-if="hasPermission('lucky_draw:events:edit')" type="text" size="small" @click="changeSwitch(scope.row)">
                 {{scope.row.switchFlag === '1' ? '关闭活动' : '开启活动'}}
               </el-button>
-              <el-button v-if="hasPermission('lucky_draw:events:edit')" type="text" size="small" @click="luckyDraw(scope.row.id)">抽奖</el-button>
+              <!--<el-button v-if="hasPermission('lucky_draw:events:edit')" type="text" size="small" @click="luckyDraw(scope.row.id)">抽奖</el-button>-->
               <el-button v-if="hasPermission('lucky_draw:events:del')" type="text" size="small" @click="del(scope.row.id)">删除</el-button>
 
             </template>

src/views/modules/luckyDraw/LuckyDrawMemberList.vue

@@ -12,13 +12,14 @@
         <el-input size="small" v-model="searchForm.phone" placeholder="请输入手机号" clearable></el-input>
       </el-form-item>
       <el-form-item label="部门" prop="officeName">
-        <el-select v-model="searchForm.officeName" placeholder="请选择是否收款" clearable>
+        <el-select v-model="searchForm.officeName" placeholder="请选择部门" clearable>
           <el-option label="工程一部" value="工程一部"></el-option>
           <el-option label="工程二部" value="工程二部"></el-option>
           <el-option label="工程三部" value="工程三部"></el-option>
           <el-option label="工程四部" value="工程四部"></el-option>
           <el-option label="工程五部" value="工程五部"></el-option>
           <el-option label="招标代理部" value="招标代理部"></el-option>
+          <el-option label="兴光评估" value="兴光评估"></el-option>
           <el-option label="其他" value="其他"></el-option>
         </el-select>
       </el-form-item>
@@ -29,6 +30,11 @@
       </el-form-item>
     </el-form>
     <div class="bg-white top" style="">
+      <vxe-toolbar   :refresh="{query: refreshList}" custom>
+        <template #buttons>
+          <el-button v-if="hasPermission('luckyDraw:member:del')" icon="el-icon-delete" type="danger"  size="small"  @click="del()" :disabled="$refs.luckyTable && $refs.luckyTable.getCheckboxRecords().length === 0" plain>删除</el-button>
+        </template>
+      </vxe-toolbar>
       <div style="height: calc(100% - 90px)">
         <vxe-table
           :key="tableKey"
@@ -47,6 +53,7 @@
           :sort-config="{remote:true}"
           :data="dataList"
           :checkbox-config="{}">
+          <vxe-column type="checkbox"  width="40px"></vxe-column>
           <vxe-column type="seq" width="60" title="序号"></vxe-column>
           <vxe-column min-width="160" align="center" title="活动" field="eventName"></vxe-column>
           <vxe-column min-width="160" align="center" title="姓名" field="name"></vxe-column>
@@ -63,8 +70,8 @@
           </vxe-column>
           <vxe-column title="操作" width="120px" fixed="right" align="center">
             <template  slot-scope="scope">
-              <el-button v-if="hasPermission('luckyDraw:member:edit')&&scope.row.createBy === $store.state.user.id" type="text"  size="small" @click="edit(scope.row.id)">修改</el-button>
-              <el-button v-if="hasPermission('luckyDraw:member:del')&&scope.row.createBy === $store.state.user.id" type="text"   size="small" @click="del(scope.row.id)">删除</el-button>
+              <el-button v-if="hasPermission('luckyDraw:member:edit')" type="text"  size="small" @click="edit(scope.row.id)">修改</el-button>
+              <el-button v-if="hasPermission('luckyDraw:member:del')" type="text"   size="small" @click="del(scope.row.id)">删除</el-button>
             </template>
           </vxe-column>
         </vxe-table>
@@ -196,6 +203,7 @@
       },
       // 删除
       del (id) {
+        console.log(123)
         let ids = id || this.$refs.clientTable.getCheckboxRecords().map(item => {
           return item.id
         }).join(',')

src/views/modules/luckyDraw/LuckyDrawMemberUpdateForm.vue

@@ -88,6 +88,10 @@
             value: '招标代理部'
           },
           {
+            label: '兴光评估',
+            value: '兴光评估'
+          },
+          {
             label: '其他',
             value: '其他'
           }