修改安全日报

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcSafeReportMapper.xml

@@ -38,7 +38,7 @@
         <where>
             <if test="projectId != null  and projectId != ''"> and sr.project_id = #{projectId}</if>
             <if test="reportDate != null "> and sr.report_date = #{reportDate}</if>
-            <if test="member != null  and member != ''"> and sr.member like concat('%', #{member}, '%')</if>
+            <if test="member != null  and member != ''"> and (find_in_set(sr.member, #{member}) or sr.reporter = #{member})</if>
             <if test="employee != null  and employee != ''"> and sr.employee like concat('%', #{employee}, '%')</if>
             <if test="content != null  and content != ''"> and sr.content = #{content}</if>
             <if test="reporter != null "> and sr.reporter = #{reporter}</if>

oa-ui/src/views/oa/deposit/contract.vue

@@ -32,18 +32,18 @@
 
     <el-table v-loading="loading" :data="depositList" @selection-change="handleSelectionChange">
       <el-table-column type="index" label="序号" width="55" align="center" />
-      <el-table-column label="保证金类型" align="center" prop="depositType" >
+      <!-- <el-table-column label="保证金类型" align="center" prop="depositType" >
         <template slot-scope="scope">
           <span>{{ scope.row.depositType == '0' ? '投标保证金' : '合同保证金' }}</span>
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column label="合同名称" align="center" prop="contract.contractName" />
       <!-- <el-table-column label="开户名称" align="center" prop="accountName" />
       <el-table-column label="开户银行" align="center" prop="accountBank" />
       <el-table-column label="银行卡号" align="center" prop="cardNumber" /> -->
       <el-table-column label="保证金形式" align="center" prop="depositWay" >
         <template slot-scope="scope">
-          <span>{{ scope.row.depositWay == '0' ? '电汇' : (scope.row.depositWay == '1' ? '现金' : '汇票') }}</span>
+          <span>{{ scope.row.depositWay == '1' ? '电汇' : (scope.row.depositWay == '2' ? '现金' : '汇票') }}</span>
         </template>
       </el-table-column>
       <el-table-column label="申请人" align="center" prop="applierUser.nickName" />

oa-ui/src/views/oa/deposit/tender.vue

@@ -1,8 +1,13 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="128px">
-      <el-form-item label="投标项目id" prop="tenderId">
-        <el-input v-model="queryParams.tenderId" placeholder="请输入投标项目id" clearable @keyup.enter.native="handleQuery" />
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="108px">
+      <el-form-item label="投标项目名称" prop="tenderId">
+        <el-select v-model="queryParams.tenderId" clearable filterable remote reserve-keyword placeholder="请输入投标项目名称"
+          :remote-method="remoteMethod" :loading="loading" style="width: 400px;" @change="handleQuery">
+          <el-option v-for="tender in tenderList" :key="tender.tenderId"
+            :label="tender.projectName" :value="tender.tenderId">
+          </el-option>
+        </el-select>
       </el-form-item>
       <el-form-item label="预计退还日期" prop="returnTime">
         <el-date-picker clearable v-model="queryParams.returnTime" type="date" value-format="yyyy-MM-dd"
@@ -44,18 +49,18 @@
 
     <el-table v-loading="loading" :data="depositList" @selection-change="handleSelectionChange">
       <el-table-column type="index" label="序号" width="55" align="center" />
-      <el-table-column label="保证金类型" align="center" prop="depositType" >
+      <!-- <el-table-column label="保证金类型" align="center" prop="depositType" >
         <template slot-scope="scope">
           <span>{{ scope.row.depositType == '0' ? '投标保证金' : '合同保证金' }}</span>
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column label="投标项目名称" align="center" prop="tender.projectName" />
       <!-- <el-table-column label="开户名称" align="center" prop="accountName" />
       <el-table-column label="开户银行" align="center" prop="accountBank" />
       <el-table-column label="银行卡号" align="center" prop="cardNumber" /> -->
       <el-table-column label="保证金形式" align="center" prop="depositWay"  >
         <template slot-scope="scope">
-          <span>{{ scope.row.depositWay == '0' ? '电汇' : (scope.row.depositWay == '1' ? '现金' : '汇票') }}</span>
+          <span>{{ scope.row.depositWay == '1' ? '电汇' : (scope.row.depositWay == '2' ? '现金' : '汇票') }}</span>
         </template>
       </el-table-column>
       <el-table-column label="申请人" align="center" prop="applierUser.nickName" />
@@ -196,6 +201,7 @@
 
 <script>
 import { listDeposit, getDeposit, delDeposit, addDeposit, updateDeposit } from "@/api/oa/deposit/deposit";
+import { listTender } from "@/api/oa/tender/tender"
 import depositForm from '../../flowable/form/finance/depositForm.vue';
 
 export default {
@@ -254,7 +260,8 @@ export default {
       },
       // 表单校验
       rules: {
-      }
+      },
+      tenderList:[]
     };
   },
   created() {
@@ -374,7 +381,16 @@ export default {
       this.download('oa/deposit/export', {
         ...this.queryParams
       }, `deposit_${new Date().getTime()}.xlsx`)
-    }
+    },
+    remoteMethod(val) {
+      listTender({
+        pageNum: 1,
+        pageSize: 20, 
+        projectNumber: val
+      }).then(res => {
+        this.tenderList = res.rows;
+      })
+    },
   }
 };
 </script>

oa-ui/src/views/oa/safe/report.vue

@@ -52,10 +52,6 @@
         <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
           v-hasPermi="['oa:report:edit']">修改</el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple && canDelete"
-          @click="handleDelete" v-hasPermi="['oa:report:remove']">删除</el-button>
-      </el-col>
       <el-col :span="1.5">
         <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
           v-hasPermi="['oa:report:export']">导出</el-button>
@@ -81,7 +77,7 @@
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
             v-hasPermi="['oa:report:edit']">修改</el-button>
-          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" :disabled="isDisabled(scope.row.reporter)"
             v-hasPermi="['oa:report:remove']">删除</el-button>
         </template>
       </el-table-column>
@@ -203,6 +199,7 @@ export default {
     /** 查询安全汇报列表 */
     getList() {
       this.loading = true;
+      this.queryParams.member = this.$store.state.user.id
       listSafeReport(this.queryParams).then(response => {
         let rows = response.rows;
         for (let i = 0; i < rows.length; i++) {
@@ -287,6 +284,7 @@ export default {
       this.reset();
       this.open = true;
       this.title = "添加安全汇报";
+      this.isSelect = false;
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -306,6 +304,13 @@ export default {
         this.title = "修改安全汇报";
       });
     },
+    isDisabled(reporter){
+      if(reporter == this.$store.state.user.id){
+        return false
+      }else{
+        return true
+      }
+    },
     /** 提交按钮 */
     submitForm() {
       this.$refs["form"].validate(valid => {