Merge branch 'master' of http://219.147.85.210:8080/gmcs/HongHu-PSM

ruoyi-ui/src/views/expert/tender/list.vue

@@ -1,22 +1,21 @@
 <template>
   <div class="app-container">
     <el-table v-loading="loading" :data="list">
-      <el-table-column label="序号" align="center" prop="orderNum" width="80">
+      <el-table-column label="序号" align="center" prop="orderNum" width="60">
         <template slot-scope="scope">
           {{ scope.$index + 1 + (query.pageNum - 1) * query.pageSize }}
         </template>
       </el-table-column>
-      <el-table-column label="项目编号" align="center" prop="sCode" width="250" />
-      <el-table-column label="项目名称" align="center" prop="sName" width="400" />
-      <el-table-column label="采购单位" align="center" prop="sUnit" width="400" />
-      <el-table-column label="项目状态" align="center" prop="sProjectState" width="250">
+      <el-table-column label="项目编号" align="center" prop="sCode" width="170" />
+      <el-table-column label="项目名称" align="center" prop="sName" min-width="150" />
+      <el-table-column label="采购单位" align="center" prop="sUnit" min-width="150" />
+      <el-table-column label="项目状态" align="center" prop="sProjectState">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.bid_tender_state" :value="scope.row.sProjectState" />
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right">
         <template slot-scope="scope">
-
           <router-link :to="'/expert/expertTenderDetail?type=details&sid=' + scope.row.sid">
             <el-button size="mini" type="text" icon="el-icon-view">查看</el-button>
           </router-link>

ruoyi-ui/src/views/tender/tender1/bidding.vue

@@ -89,11 +89,7 @@
       </el-table>
     </div>
     <div v-if="currentName === '专家'" class="div2">
-      <!-- <el-tabs v-model="activeName2">
-        <el-tab-pane label="组建评标委员会" name="expert" style="font-size: 16px"> -->
       <CompExpert v-if="tender && tender.sid" :tender="tender"></CompExpert>
-      <!-- </el-tab-pane>
-      </el-tabs> -->
     </div>
     <div v-if="currentName === '评标'" class="div2">
       <el-tabs v-model="activeName3">

ruoyi-ui/src/views/tender/tender1/components/CompExpert.vue

@@ -14,6 +14,9 @@
       <el-button v-if="queryParams.status == 1 && checkRole(['operator', 'commander'])" type="primary" plain
         icon="el-icon-bell" @click="batchNotification"
         :disabled="multipleSelection && multipleSelection.length == 0">批量通知专家</el-button>
+      <el-button v-if="queryParams.status == 1 && checkRole(['operator', 'commander'])" type="danger" plain
+        icon="el-icon-delete" @click="handleDelete()"
+        :disabled="multipleSelection && multipleSelection.length == 0">批量删除</el-button>
 
       <el-table v-if="checkRole(['operator', 'commander'])" v-loading="loading" :data="committeeList"
         @selection-change="handleSelectionChange" style="margin-top: 12px">
@@ -204,33 +207,38 @@ export default {
     },
     handleSelectionChange (val) {
       this.multipleSelection = val
+    },
+
+    batchNotification () {
       this.expertPhoneList = []
 
       this.multipleSelection.forEach(item => {
         this.expertPhoneList.push(item.bsExpert.jPhone)
       })
-    },
 
-    batchNotification () {
-      sendCall({
-        "sid": this.queryParams.sid,
-        "startTime": this.queryParams.startTime,
-        "position": this.queryParams.xArea,
-        "phoneList": this.expertPhoneList
-      })
-        .then(res => {
-          if (res.code == 200) {
-            this.$message({
-              type: 'success',
-              message: '通知成功!'
-            });
-          } else {
-            this.$modal.msgError("通知失败，请联系管理员！！！");
-          }
-        })
-        .catch(err => {
-          this.$modal.msgError("通知失败，请联系管理员！！！");
+      if (this.expertPhoneList && this.expertPhoneList.length > 0) {
+        sendCall({
+          "sid": this.queryParams.sid,
+          "startTime": this.queryParams.startTime,
+          "position": this.queryParams.xArea,
+          "phoneList": this.expertPhoneList
         })
+          .then(res => {
+            if (res.code == 200) {
+              this.$message({
+                type: 'success',
+                message: '通知成功!'
+              });
+            } else {
+              this.$modal.msgError("通知失败，请联系管理员！！！");
+            }
+          })
+          .catch(err => {
+            this.$modal.msgError("通知失败，请联系管理员！！！");
+          })
+      } else {
+        this.$modal.msgError("请选择专家后通知");
+      }
     },
 
     /** 查询评标委员会列表 */
@@ -246,14 +254,29 @@ export default {
     },
 
     /** 删除按钮操作 */
-    handleDelete (row) {
-      const pbIds = row.pbId || this.ids;
-      this.$modal.confirm('是否确认删除评标委员会中姓名为"' + row.bsExpert.jName + '"的专家？').then(function () {
-        return delCommittee(pbIds);
-      }).then(() => {
-        this.getExerptList(this.queryParams.sid);
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => { });
+    handleDelete(row) {
+      if (row) {
+        this.$modal.confirm('是否确认删除评标委员会中姓名为"' + row.bsExpert.jName + '"的专家？').then(function () {
+          return delCommittee(row.pbId);
+        }).then(() => {
+          this.getExerptList(this.queryParams.sid);
+          this.$modal.msgSuccess("删除成功");
+        }).catch(() => { });
+      } else {
+        const pbIds = []
+
+        this.multipleSelection.forEach(item => {
+          console.log(item);
+          pbIds.push(item.pbId)
+        })
+
+        this.$modal.confirm('是否确认批量删除？').then(function () {
+          return delCommittee(pbIds);
+        }).then(() => {
+          this.getExerptList(this.queryParams.sid);
+          this.$modal.msgSuccess("删除成功");
+        }).catch(() => { });
+      }
     },
 
     // 查询抽取申请列表