提交代码

ruoyi-ui/src/api/project/checkDetection.js

@@ -1,6 +1,6 @@
 import request from '@/utils/request'
 
-// 查询材料送检列表
+// 查询材料取样复试列表
 export function listCheckDetection(query) {
   return request({
     url: '/project/checkDetection/list',
@@ -9,7 +9,7 @@ export function listCheckDetection(query) {
   })
 }
 
-// 查询材料送检详细
+// 查询材料取样复试详细
 export function getCheckDetection(id) {
   return request({
     url: '/project/checkDetection/' + id,
@@ -17,7 +17,7 @@ export function getCheckDetection(id) {
   })
 }
 
-// 新增材料送检
+// 新增材料取样复试
 export function addCheckDetection(data) {
   return request({
     url: '/project/checkDetection',
@@ -26,7 +26,7 @@ export function addCheckDetection(data) {
   })
 }
 
-// 修改材料送检
+// 修改材料取样复试
 export function updateCheckDetection(data) {
   return request({
     url: '/project/checkDetection',
@@ -34,11 +34,28 @@ export function updateCheckDetection(data) {
     data: data
   })
 }
+// 取样复试登记结果
+export function updateCheckDetectionResult(data) {
+  return request({
+    url: '/project/checkDetection/editResult',
+    method: 'post',
+    data: data
+  })
+}
 
-// 删除材料送检
+// 删除材料取样复试
 export function delCheckDetection(id) {
   return request({
     url: '/project/checkDetection/' + id,
     method: 'delete'
   })
 }
+
+//材料取样复试统计
+export function findCheckDetectionCount(query) {
+  return request({
+    url: '/project/checkDetection/findCheckDetectionCount',
+    method: 'get',
+    params: query
+  })
+}

ruoyi-ui/src/api/publics.js

@@ -45,6 +45,14 @@ const queryUnitList = (query) => {
     })
 }
 
+const selectProjectAllUnitUser = (query) => {
+    return request({
+      url: '/publics/selectProjectAllUnitUser',
+      method: 'get',
+      params: query
+    })
+}
+
 const selectProjectUnitUser = (query) => {
     return request({
       url: '/publics/selectProjectUnitUser',
@@ -60,6 +68,7 @@ export default{
     getMyProjectList,
     getUserList,
     queryUnitList,
+    selectProjectAllUnitUser,
     selectProjectUnitUser,
 }
 

ruoyi-ui/src/views/project/checkDetection/checkDetectionDrawer.vue

@@ -0,0 +1,724 @@
+<template>
+  <div class="app-container">
+    <el-drawer
+      v-if="onOpen"
+      :visible.sync="onOpen"
+      direction="rtl"
+      size="60%"
+      style="padding-left: 20px"
+    >
+      <template slot="title">
+        <div>{{ drawerTitle + " 【材料取样复试】" }}</div>
+      </template>
+      <el-tabs
+        v-model="unitActiveName"
+        style="margin-left: 20px; margin-right: 20px"
+        @tab-click="getList"
+      >
+        <el-tab-pane
+          v-for="(it, idx) in nodes"
+          :label="it.unitName + ''"
+          :name="it.unitId + ''"
+          :key="idx"
+        ></el-tab-pane>
+      </el-tabs>
+      <el-row
+        :gutter="10"
+        class="mb8"
+        style="margin-left: 25px; margin-top: 10px; margin-right: 0px"
+      >
+        <el-col :span="1.5">
+          <el-button
+            type="primary"
+            plain
+            icon="el-icon-plus"
+            size="mini"
+            @click="handleAdd"
+            v-hasPermi="['project:checkDetection:add']"
+            >添加</el-button
+          >
+        </el-col>
+        <el-col :span="1.5">
+          <el-button
+            type="success"
+            plain
+            icon="el-icon-edit"
+            size="mini"
+            :disabled="single"
+            @click="handleUpdate"
+            v-hasPermi="['project:checkDetection:edit']"
+            >修改</el-button
+          >
+        </el-col>
+        <el-col :span="1.5">
+          <el-button
+            type="danger"
+            plain
+            icon="el-icon-delete"
+            size="mini"
+            :disabled="multiple"
+            @click="handleDelete"
+            v-hasPermi="['project:checkDetection:remove']"
+            >删除</el-button
+          >
+        </el-col>
+        <right-toolbar
+          :showSearch.sync="showSearch"
+          @queryTable="getList"
+        ></right-toolbar>
+      </el-row>
+      <el-tabs
+        v-model="activeName"
+        @tab-click="handleClick"
+        style="margin-left: 25px; margin-right: 25px"
+      >
+        <el-tab-pane :label="tabs.all" name="all"></el-tab-pane>
+        <el-tab-pane :label="tabs.sjz" name="sjz"></el-tab-pane>
+        <el-tab-pane :label="tabs.ywc" name="ywc"></el-tab-pane>
+        <el-table
+          v-loading="loading"
+          :data="checkDetectionList"
+          @selection-change="handleSelectionChange"
+        >
+          <el-table-column type="selection" width="55" align="center" />
+          <el-table-column label="送检类型" align="center" prop="checkType">
+            <template slot-scope="scope">
+              <dict-tag
+                :options="dict.type.check_detection_check_type"
+                :value="scope.row.checkType"
+              />
+            </template>
+          </el-table-column>
+          <el-table-column
+            label="材料名称"
+            align="center"
+            prop="materialName"
+            width="100"
+            show-overflow-tooltip
+          />
+          <el-table-column
+            label="使用部位"
+            align="center"
+            prop="usePosition"
+            width="120"
+            show-overflow-tooltip
+          />
+          <el-table-column
+            label="取样数量"
+            align="center"
+            prop="sampleNum"
+            width="80"
+            show-overflow-tooltip
+          />
+          <el-table-column label="合格证" align="center" prop="qualifiedFlag">
+            <template slot-scope="scope">
+              <el-tag v-if="scope.row.qualifiedFlag == 'Y'" type="success">已提供</el-tag>
+              <el-tag v-if="scope.row.qualifiedFlag == 'N'" type="danger">未提供</el-tag>
+            </template>
+          </el-table-column>
+          <el-table-column
+            label="见证人"
+            align="left"
+            prop="witnessUser"
+            width="120"
+            show-overflow-tooltip
+          >
+            <template slot-scope="scope">
+              <div>{{ scope.row.witnessUserName }}</div>
+              <div>{{ scope.row.witnessUser }}</div>
+            </template>
+          </el-table-column>
+          <el-table-column
+            label="实验室名称"
+            align="center"
+            prop="laboratoryName"
+            width="120"
+            show-overflow-tooltip
+          />
+          <el-table-column label="送检时间" align="center" prop="checkTime" width="95">
+            <template slot-scope="scope">
+              <span>{{ parseTime(scope.row.checkTime, "{y}-{m}-{d}") }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="检测结果" align="center" prop="detectionResult">
+            <template slot-scope="scope">
+              <dict-tag
+                :options="dict.type.project_checking_result"
+                :value="scope.row.detectionResult"
+              />
+            </template>
+          </el-table-column>
+          <el-table-column
+            label="操作"
+            align="center"
+            width="120"
+            class-name="small-padding fixed-width"
+          >
+            <template slot-scope="scope">
+              <el-button
+                v-if="scope.row.checkState == '2'"
+                size="mini"
+                type="text"
+                icon="el-icon-paperclip"
+                @click="handledownload(scope.row)"
+                v-hasPermi="['project:surProjectSpecial:list']"
+                >下载检测报告</el-button
+              >
+              <el-button
+                v-if="scope.row.checkState == '1'"
+                size="mini"
+                type="text"
+                icon="el-icon-edit-outline"
+                @click="handleUpdateResult(scope.row)"
+                style="margin-left: 8px"
+                v-hasPermi="['project:checkDetection:editResult']"
+                >登记检测结果</el-button
+              >
+              <el-button
+                v-if="scope.row.checkState == '1'"
+                size="mini"
+                type="text"
+                icon="el-icon-edit"
+                @click="handleUpdate(scope.row)"
+                v-hasPermi="['project:checkDetection:edit']"
+                >修改</el-button
+              >
+              <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-delete"
+                @click="handleDelete(scope.row)"
+                v-hasPermi="['project:checkDetection:remove']"
+                >删除</el-button
+              >
+            </template>
+          </el-table-column>
+        </el-table>
+        <pagination
+          v-show="total > 0"
+          :total="total"
+          :page.sync="queryParams.pageNum"
+          :limit.sync="queryParams.pageSize"
+          @pagination="getList"
+        />
+      </el-tabs>
+      <el-dialog
+        :title="title"
+        v-if="open"
+        :visible.sync="open"
+        width="680px"
+        append-to-body
+        :close-on-click-modal="false"
+        :close-on-press-escape="false"
+      >
+        <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+          <el-form-item label="项目名称" prop="projectName">
+            <el-input
+              v-model="form.projectName"
+              placeholder="请输入项目名称"
+              :disabled="true"
+            />
+          </el-form-item>
+          <el-form-item label="单位名称" prop="deptName">
+            <el-input
+              v-model="form.deptName"
+              placeholder="请输入单位名称"
+              :disabled="true"
+            />
+          </el-form-item>
+          <el-form-item label="送检类型" prop="checkType">
+            <el-select
+              v-model="form.checkType"
+              placeholder="请选择送检类型"
+              style="width: 100%"
+            >
+              <el-option
+                v-for="dict in dict.type.check_detection_check_type"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="材料名称" prop="materialName">
+            <el-input v-model="form.materialName" placeholder="请输入材料名称" />
+          </el-form-item>
+          <el-form-item label="使用部位" prop="usePosition">
+            <el-input v-model="form.usePosition" placeholder="请输入使用部位" />
+          </el-form-item>
+          <el-form-item label="取样数量" prop="sampleNum">
+            <el-input v-model="form.sampleNum" placeholder="请输入取样数量" />
+          </el-form-item>
+          <el-form-item label="提供合格证" prop="qualifiedFlag">
+            <el-select
+              v-model="form.qualifiedFlag"
+              placeholder="请选择提供合格证"
+              style="width: 100%"
+            >
+              <el-option
+                v-for="dict in dict.type.sys_yes_no"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="见证人" prop="witnessUser">
+            <el-select
+              v-model="form.witnessUser"
+              placeholder="请选择见证人"
+              filterable
+              style="width: 100%"
+              @change="selectWitnessUser"
+            >
+              <el-option-group
+                v-for="group in deptUserData"
+                :key="group.unitId + ''"
+                :label="group.unitName + ' [' + group.unitTypeName + '] '"
+              >
+                <el-option
+                  v-for="item in group.userinfoList"
+                  :key="item.phonenumber"
+                  :label="item.nickName + ' [' + item.jobTypeName + '] '"
+                  :value="item.phonenumber"
+                >
+                </el-option>
+              </el-option-group>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="实验室名称" prop="laboratoryName">
+            <el-input v-model="form.laboratoryName" placeholder="请输入实验室名称" />
+          </el-form-item>
+          <el-form-item label="送检时间" prop="checkTime">
+            <el-date-picker
+              clearable
+              v-model="form.checkTime"
+              type="date"
+              value-format="yyyy-MM-dd"
+              placeholder="请选择送检时间"
+            >
+            </el-date-picker>
+          </el-form-item>
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </el-dialog>
+
+      <!-- 材料取样复试等级结果 -->
+      <el-dialog
+        :title="title"
+        v-if="resultopen"
+        :visible.sync="resultopen"
+        width="680px"
+        append-to-body
+        :close-on-click-modal="false"
+        :close-on-press-escape="false"
+      >
+        <el-form
+          ref="resultform"
+          :model="resultform"
+          :rules="resultrules"
+          label-width="100px"
+        >
+          <el-form-item label="项目名称">
+            <el-input
+              v-model="resultform.projectName"
+              placeholder="请输入项目名称"
+              :disabled="true"
+            />
+          </el-form-item>
+          <el-form-item label="单位名称">
+            <el-input
+              v-model="resultform.deptName"
+              placeholder="请输入单位名称"
+              :disabled="true"
+            />
+          </el-form-item>
+          <el-form-item label="送检类型">
+            <el-select
+              v-model="resultform.checkType"
+              placeholder="请选择送检类型"
+              style="width: 100%"
+              :disabled="true"
+            >
+              <el-option
+                v-for="dict in dict.type.check_detection_check_type"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="材料名称">
+            <el-input
+              v-model="resultform.materialName"
+              placeholder="请输入材料名称"
+              :disabled="true"
+            />
+          </el-form-item>
+          <el-form-item label="实验室名称">
+            <el-input
+              v-model="resultform.laboratoryName"
+              placeholder="请输入实验室名称"
+              :disabled="true"
+            />
+          </el-form-item>
+          <el-form-item label="送检时间">
+            <el-input
+              v-model="resultform.checkTime"
+              placeholder="请输入实送检时间"
+              :disabled="true"
+            />
+          </el-form-item>
+          <el-form-item label="检测结果" prop="detectionResult">
+            <el-radio
+              v-model="resultform.detectionResult"
+              v-for="dict in dict.type.project_checking_result"
+              :label="dict.value"
+              :key="dict.value"
+              border
+              size="small"
+              >{{ dict.label }}</el-radio
+            >
+          </el-form-item>
+          <el-form-item label="检测报告" prop="detectionFile">
+            <FileUpload
+              v-model="resultform.detectionFile"
+              :limit="2"
+              @input="fileInput"
+              :fileType="['pdf', 'png', 'jpg', 'jpeg']"
+            />
+          </el-form-item>
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button type="primary" @click="submitResultForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </el-dialog>
+    </el-drawer>
+  </div>
+</template>
+
+<script>
+import {
+  listCheckDetection,
+  getCheckDetection,
+  delCheckDetection,
+  addCheckDetection,
+  updateCheckDetection,
+  findCheckDetectionCount,
+  updateCheckDetectionResult,
+} from "@/api/project/checkDetection";
+
+export default {
+  props: {},
+  dicts: ["sys_yes_no", "project_checking_result", "check_detection_check_type"],
+  data() {
+    return {
+      showViewer: false,
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 总条数
+      total: 0,
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 是否显示弹出层
+      open: false,
+      resultopen: false,
+      // 弹出层标题
+      title: "",
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 20,
+        projectId: null,
+        deptId: null,
+        activeName: null,
+      },
+      // 表单参数
+      form: {},
+      resultform: {},
+      activeName: "sjz",
+      // 表单校验
+      rules: {
+        checkType: [{ required: true, message: "请选择送检类型", trigger: "blur" }],
+        materialName: [
+          { required: true, message: "请输入送检材料名称", trigger: "blur" },
+          { max: 100, message: "送检材料名称最多100字符", trigger: "blur" },
+        ],
+        usePosition: [
+          { required: true, message: "请输入使用部位", trigger: "blur" },
+          { max: 100, message: "使用部位最多100字符", trigger: "blur" },
+        ],
+        usePosition: [
+          { required: true, message: "请输入使用部位", trigger: "blur" },
+          { max: 100, message: "使用部位最多100字符", trigger: "blur" },
+        ],
+        sampleNum: [
+          { required: true, message: "请输入取样数量", trigger: "blur" },
+          { max: 100, message: "取样数量最多100字符", trigger: "blur" },
+        ],
+        qualifiedFlag: [
+          { required: true, message: "请选择是否提供合格证", trigger: "blur" },
+        ],
+        witnessUser: [
+          { required: true, message: "请选择监理单位见证人", trigger: "blur" },
+        ],
+        laboratoryName: [
+          { required: true, message: "请输入实验室名称", trigger: "blur" },
+          { max: 100, message: "实验室名称最多100字符", trigger: "blur" },
+        ],
+        checkTime: [{ required: true, message: "请选择送检时间", trigger: "blur" }],
+      },
+      resultrules: {
+        detectionResult: [{ required: true, message: "请选择检测结果", trigger: "blur" }],
+        detectionFile: [{ required: true, message: "请上传检测报告", trigger: "blur" }],
+      },
+      deptUserData: [],
+      tabs: {
+        all: "全部数据（0）",
+        sjz: "送检中（0）",
+        ywc: "已完成（0）",
+      },
+      project: null,
+      nodes: [],
+      unitActiveName: "",
+      onOpen: false,
+      drawerTitle: "",
+    };
+  },
+  computed: {},
+  watch: {},
+  created() {},
+  mounted() {},
+  beforeDestroy() {},
+  methods: {
+    fileInput(files) {
+      let fileUrls = "";
+      if (files.length > 0) {
+        fileUrls = "";
+        files.forEach((item) => {
+          fileUrls += "," + item.url;
+        });
+        fileUrls = fileUrls.substring(1);
+      }
+      this.resultform.detectionFile = fileUrls;
+    },
+    show(project) {
+      this.project = project;
+      this.drawerTitle = project.projectName;
+      this.onOpen = true;
+      this.queryParams.projectId = project.id;
+      this.$api.publics
+        .queryUnitList({
+          projectId: project.id,
+          unitTypes: "2,4".split(","),
+        })
+        .then((d) => {
+          this.nodes = d.rows;
+          if (d.rows.length > 0) {
+            this.unitActiveName = this.nodes[0].unitId + "";
+            this.getList();
+          } else {
+            this.checkDetectionList = [];
+          }
+        });
+    },
+    /** 查询特种人员列表 */
+    getList() {
+      this.loading = true;
+      this.queryParams.deptId = this.unitActiveName;
+      this.queryParams.activeName = this.activeName;
+      this.queryCount(this.queryParams);
+      listCheckDetection(this.queryParams).then((response) => {
+        this.checkDetectionList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    queryCount(query) {
+      findCheckDetectionCount(query).then((response) => {
+        if (response && response.data) {
+          let check1 = 0;
+          let check2 = 0;
+          if (response.data.check1) {
+            check1 += response.data.check1;
+          }
+          if (response.data.check2) {
+            check2 += response.data.check2;
+          }
+          this.tabs.sjz = "送检中（" + check1 + "）";
+          this.tabs.ywc = "已完成（" + check2 + "）";
+          this.tabs.all = "全部数据（" + (check1 + check2) + "）";
+        }
+      });
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map((item) => item.id);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        projectId: null,
+        deptId: null,
+        name: null,
+        sex: null,
+        age: null,
+        phoneNumber: null,
+        idNumber: null,
+        isCredential: null,
+        credentialNumber: null,
+        credentialExpirationTime: null,
+        credentialFile: null,
+        isDel: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null,
+        remark: null,
+        credentialType: null,
+        specialType: null,
+      };
+      this.files = [];
+      this.resetForm("form");
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.credential = false;
+      this.form.projectId = this.project.id;
+      this.form.projectName = this.project.projectName;
+      this.form.deptId = this.unitActiveName;
+      this.open = true;
+      this.title = "添加特种人员";
+      //查询单位人员
+      this.$api.publics
+        .selectProjectUnitUser({
+          unitType: "4",
+          projectId: this.project.id,
+        })
+        .then((d) => {
+          this.deptUserData = d.data;
+        });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.resultopen = false;
+      this.reset();
+    },
+    // 页签点击
+    handleClick() {
+      this.queryParams.activeName = this.activeName;
+      this.getList();
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids;
+      getCheckDetection(id).then((response) => {
+        this.form = response.data;
+        this.files = this.form.credentialFile;
+        this.open = true;
+        this.title = "修改项目特种人员";
+      });
+      //查询单位人员
+      this.$api.publics
+        .selectProjectUnitUser({
+          unitType: "4",
+          projectId: this.project.id,
+        })
+        .then((d) => {
+          this.deptUserData = d.data;
+        });
+    },
+    /** 登记结果按钮操作 */
+    handleUpdateResult(row) {
+      this.reset();
+      getCheckDetection(row.id).then((response) => {
+        this.resultform = response.data;
+        this.resultopen = true;
+        this.title = "取样复试登记检测结果";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateCheckDetection(this.form).then((response) => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addCheckDetection(this.form).then((response) => {
+              this.$modal.msgSuccess("添加成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 登记取样复试结果 */
+    submitResultForm() {
+      this.$refs["resultform"].validate((valid) => {
+        if (valid) {
+          // 修改取样复试检测结果
+          this.resultform.checkState = "2";
+          updateCheckDetectionResult(this.resultform).then((response) => {
+            this.$modal.msgSuccess("登记结果成功");
+            this.resultopen = false;
+            this.getList();
+          });
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal
+        .confirm('是否确认删除特种人员编号为"' + ids + '"的数据项？')
+        .then(function () {
+          return delCheckDetection(ids);
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
+    },
+    /** 选择见证人*/
+    selectWitnessUser(val) {
+      this.deptUserData.forEach((item) => {
+        item.userinfoList.forEach((u) => {
+          if (u.phonenumber == val) {
+            this.form.witnessUserName = u.nickName + " [" + u.jobTypeName + "] ";
+          }
+        });
+      });
+    },
+    /** 下载附件 */
+    handleDownload(row) {
+      this.files = row.measureFiles.split(",");
+      this.files.forEach((item) => {
+        this.$download.resource(item);
+      });
+    },
+  },
+};
+</script>
+<style lang="scss" scoped></style>

ruoyi-ui/src/views/project/checkDetection/index.vue

@@ -1,18 +1,25 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form
-      <el-form-item label="项目主键" prop="projectId">
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="68px"
+    >
+      <el-form-item label="项目名称" prop="projectName">
         <el-input
-          v-model="queryParams.projectId"
+          v-model="queryParams.projectName"
-          placeholder="请输入项目主键"
+          placeholder="请输入项目名称"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="单位主键" prop="deptId">
+      <el-form-item label="单位名称" prop="deptName">
         <el-input
-          v-model="queryParams.deptId"
+          v-model="queryParams.deptName"
-          placeholder="请输入单位主键"
+          placeholder="请输入单位名称"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -27,6 +34,31 @@
           />
         </el-select>
       </el-form-item>
+      <el-form-item label="检测结果" prop="detectionResult">
+        <el-select
+          v-model="queryParams.detectionResult"
+          placeholder="请选择检测结果"
+          clearable
+        >
+          <el-option
+            v-for="dict in dict.type.project_checking_result"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="送检时间">
+        <el-date-picker
+          v-model="daterangeCheckTime"
+          style="width: 240px"
+          value-format="yyyy-MM-dd"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        ></el-date-picker>
+      </el-form-item>
       <el-form-item label="材料名称" prop="materialName">
         <el-input
           v-model="queryParams.materialName"
@@ -43,23 +75,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="取样数量" prop="sampleNum">
+      <el-form-item label="见证人" prop="witnessUserName">
-        <el-input
-          v-model="queryParams.sampleNum"
-          placeholder="请输入取样数量"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="取样人名称" prop="sampleUserName">
-        <el-input
-          v-model="queryParams.sampleUserName"
-          placeholder="请输入取样人名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="见证人名称" prop="witnessUserName">
         <el-input
           v-model="queryParams.witnessUserName"
           placeholder="请输入见证人名称"
@@ -67,7 +83,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="实验室名称" prop="laboratoryName">
+      <el-form-item label="实验室" prop="laboratoryName">
         <el-input
           v-model="queryParams.laboratoryName"
           placeholder="请输入实验室名称"
@@ -75,43 +91,16 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="送检时间">
-        <el-date-picker
-          v-model="daterangeCheckTime"
-          style="width: 240px"
-          value-format="yyyy-MM-dd"
-          type="daterange"
-          range-separator="-"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-        ></el-date-picker>
-      </el-form-item>
-      <el-form-item label="送检状态" prop="checkState">
-        <el-input
-          v-model="queryParams.checkState"
-          placeholder="请输入送检状态"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="检测结果" prop="detectionResult">
-        <el-select v-model="queryParams.detectionResult" placeholder="请选择检测结果" clearable>
-          <el-option
-            v-for="dict in dict.type.project_checking_result"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery"
+          >搜索</el-button
+        >
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           type="primary"
           plain
@@ -119,8 +108,9 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['project:checkDetection:add']"
-        >新增</el-button>
+          >新增</el-button
-      </el-col>
+        >
+      </el-col> -->
       <el-col :span="1.5">
         <el-button
           type="success"
@@ -130,7 +120,8 @@
           :disabled="single"
           @click="handleUpdate"
           v-hasPermi="['project:checkDetection:edit']"
-        >修改</el-button>
+          >修改</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -141,7 +132,8 @@
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['project:checkDetection:remove']"
-        >删除</el-button>
+          >删除</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -151,68 +143,160 @@
           size="mini"
           @click="handleExport"
           v-hasPermi="['project:checkDetection:export']"
-        >导出</el-button>
+          >导出</el-button
+        >
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
-
+    <el-tabs v-model="activeName" @tab-click="handleClick">
-    <el-table v-loading="loading" :data="checkDetectionList" @selection-change="handleSelectionChange">
+      <el-tab-pane :label="tabs.all" name="all"></el-tab-pane>
+      <el-tab-pane :label="tabs.sjz" name="sjz"></el-tab-pane>
+      <el-tab-pane :label="tabs.ywc" name="ywc"></el-tab-pane
+    ></el-tabs>
+    <el-table
+      v-loading="loading"
+      :data="checkDetectionList"
+      @selection-change="handleSelectionChange"
+    >
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="主键" align="center" prop="id" />
+      <el-table-column
-      <el-table-column label="项目主键" align="center" prop="projectId" />
+        label="项目名称"
-      <el-table-column label="单位主键" align="center" prop="deptId" />
+        align="center"
+        prop="projectName"
+        fixed="left"
+        width="200"
+        show-overflow-tooltip
+      />
+      <el-table-column
+        label="单位名称"
+        align="center"
+        prop="deptName"
+        width="180"
+        show-overflow-tooltip
+      />
       <el-table-column label="送检类型" align="center" prop="checkType">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.check_detection_check_type" :value="scope.row.checkType"/>
+          <dict-tag
+            :options="dict.type.check_detection_check_type"
+            :value="scope.row.checkType"
+          />
         </template>
       </el-table-column>
-      <el-table-column label="材料名称" align="center" prop="materialName" />
+      <el-table-column
-      <el-table-column label="使用部位" align="center" prop="usePosition" />
+        label="材料名称"
-      <el-table-column label="取样数量" align="center" prop="sampleNum" />
+        align="center"
-      <el-table-column label="提供合格证" align="center" prop="qualifiedFlag">
+        prop="materialName"
+        width="100"
+        show-overflow-tooltip
+      />
+      <el-table-column
+        label="使用部位"
+        align="center"
+        prop="usePosition"
+        width="120"
+        show-overflow-tooltip
+      />
+      <el-table-column
+        label="取样数量"
+        align="center"
+        prop="sampleNum"
+        width="80"
+        show-overflow-tooltip
+      />
+      <el-table-column label="合格证" align="center" prop="qualifiedFlag">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.qualifiedFlag"/>
+          <el-tag v-if="scope.row.qualifiedFlag == 'Y'" type="success">已提供</el-tag>
+          <el-tag v-if="scope.row.qualifiedFlag == 'N'" type="danger">未提供</el-tag>
         </template>
       </el-table-column>
-      <el-table-column label="代表数量" align="center" prop="represenNum" />
+      <el-table-column
-      <el-table-column label="取样人" align="center" prop="sampleUser" />
+        label="见证人"
-      <el-table-column label="取样人名称" align="center" prop="sampleUserName" />
+        align="left"
-      <el-table-column label="见证人" align="center" prop="witnessUser" />
+        prop="witnessUser"
-      <el-table-column label="见证人名称" align="center" prop="witnessUserName" />
+        width="140"
-      <el-table-column label="实验室名称" align="center" prop="laboratoryName" />
+        show-overflow-tooltip
-      <el-table-column label="送检时间" align="center" prop="checkTime" width="180">
+      >
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.checkTime, '{y}-{m}-{d}') }}</span>
+          <div>{{ scope.row.witnessUserName }}</div>
+          <div>{{ scope.row.witnessUser }}</div>
         </template>
       </el-table-column>
-      <el-table-column label="送检状态" align="center" prop="checkState">
+      <el-table-column
+        label="实验室名称"
+        align="center"
+        prop="laboratoryName"
+        width="150"
+        show-overflow-tooltip
+      />
+      <el-table-column label="送检时间" align="center" prop="checkTime" width="95">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.check_detection_check_type" :value="scope.row.checkState"/>
+          <span>{{ parseTime(scope.row.checkTime, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
       <el-table-column label="检测结果" align="center" prop="detectionResult">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.project_checking_result" :value="scope.row.detectionResult"/>
+          <dict-tag
+            :options="dict.type.project_checking_result"
+            :value="scope.row.detectionResult"
+          />
         </template>
       </el-table-column>
-      <el-table-column label="检测报告" align="center" prop="detectionFile" />
+      <el-table-column label="提交用户" align="center" prop="createBy" width="110" />
-      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="提交时间" align="center" prop="createTime" width="95">
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.checkTime, "{y}-{m}-{d}") }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="登记结果用户" align="center" prop="updateBy" width="110" />
+      <el-table-column label="登记结果时间" align="center" prop="updateTime" width="110">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.checkTime, "{y}-{m}-{d}") }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="操作"
+        align="center"
+        fixed="right"
+        class-name="small-padding fixed-width"
+        width="150"
+      >
         <template slot-scope="scope">
           <el-button
+            v-if="scope.row.checkState == '2'"
+            size="mini"
+            type="text"
+            icon="el-icon-paperclip"
+            @click="handledownload(scope.row)"
+            v-hasPermi="['project:surProjectSpecial:list']"
+            >下载检测报告</el-button
+          >
+          <el-button
+            v-if="scope.row.checkState == '1'"
+            size="mini"
+            type="text"
+            icon="el-icon-edit-outline"
+            @click="handleUpdateResult(scope.row)"
+            style="margin-left: 8px"
+            v-hasPermi="['project:checkDetection:editResult']"
+            >登记检测结果</el-button
+          >
+          <el-button
+            v-if="scope.row.checkState == '1'"
             size="mini"
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['project:checkDetection:edit']"
-          >修改</el-button>
+            >修改</el-button
+          >
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['project:checkDetection:remove']"
-          >删除</el-button>
+            >删除</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
@@ -225,17 +309,29 @@
       @pagination="getList"
     />
 
-    <!-- 添加或修改材料送检对话框 -->
+    <!-- 添加或修改材料取样复试对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="680px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
-        <el-form-item label="项目主键" prop="projectId">
+        <el-form-item label="项目名称" prop="projectName">
-          <el-input v-model="form.projectId" placeholder="请输入项目主键" />
+          <el-input
+            v-model="form.projectName"
+            placeholder="请输入项目名称"
+            :disabled="true"
+          />
         </el-form-item>
-        <el-form-item label="单位主键" prop="deptId">
+        <el-form-item label="单位名称" prop="deptName">
-          <el-input v-model="form.deptId" placeholder="请输入单位主键" />
+          <el-input
+            v-model="form.deptName"
+            placeholder="请输入单位名称"
+            :disabled="true"
+          />
         </el-form-item>
         <el-form-item label="送检类型" prop="checkType">
-          <el-select v-model="form.checkType" placeholder="请选择送检类型">
+          <el-select
+            v-model="form.checkType"
+            placeholder="请选择送检类型"
+            style="width: 100%"
+          >
             <el-option
               v-for="dict in dict.type.check_detection_check_type"
               :key="dict.value"
@@ -254,7 +350,11 @@
           <el-input v-model="form.sampleNum" placeholder="请输入取样数量" />
         </el-form-item>
         <el-form-item label="提供合格证" prop="qualifiedFlag">
-          <el-select v-model="form.qualifiedFlag" placeholder="请选择提供合格证">
+          <el-select
+            v-model="form.qualifiedFlag"
+            placeholder="请选择提供合格证"
+            style="width: 100%"
+          >
             <el-option
               v-for="dict in dict.type.sys_yes_no"
               :key="dict.value"
@@ -263,66 +363,155 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="代表数量" prop="represenNum">
-          <el-input v-model="form.represenNum" placeholder="请输入代表数量" />
-        </el-form-item>
-        <el-form-item label="取样人" prop="sampleUser">
-          <el-input v-model="form.sampleUser" placeholder="请输入取样人" />
-        </el-form-item>
-        <el-form-item label="取样人名称" prop="sampleUserName">
-          <el-input v-model="form.sampleUserName" placeholder="请输入取样人名称" />
-        </el-form-item>
         <el-form-item label="见证人" prop="witnessUser">
-          <el-input v-model="form.witnessUser" placeholder="请输入见证人" />
+          <el-select
-        </el-form-item>
+            v-model="form.witnessUser"
-        <el-form-item label="见证人名称" prop="witnessUserName">
+            placeholder="请选择见证人"
-          <el-input v-model="form.witnessUserName" placeholder="请输入见证人名称" />
+            filterable
+            style="width: 100%"
+            @change="selectWitnessUser"
+          >
+            <el-option-group
+              v-for="group in deptUserData"
+              :key="group.unitId + ''"
+              :label="group.unitName + ' [' + group.unitTypeName + '] '"
+            >
+              <el-option
+                v-for="item in group.userinfoList"
+                :key="item.phonenumber"
+                :label="item.nickName + ' [' + item.jobTypeName + '] '"
+                :value="item.phonenumber"
+              >
+              </el-option>
+            </el-option-group>
+          </el-select>
         </el-form-item>
         <el-form-item label="实验室名称" prop="laboratoryName">
           <el-input v-model="form.laboratoryName" placeholder="请输入实验室名称" />
         </el-form-item>
         <el-form-item label="送检时间" prop="checkTime">
-          <el-date-picker clearable
+          <el-date-picker
+            clearable
             v-model="form.checkTime"
             type="date"
             value-format="yyyy-MM-dd"
-            placeholder="请选择送检时间">
+            placeholder="请选择送检时间"
+          >
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="送检状态" prop="checkState">
-          <el-input v-model="form.checkState" placeholder="请输入送检状态" />
-        </el-form-item>
-        <el-form-item label="检测结果" prop="detectionResult">
-          <el-select v-model="form.detectionResult" placeholder="请选择检测结果">
-            <el-option
-              v-for="dict in dict.type.project_checking_result"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="检测报告" prop="detectionFile">
-          <file-upload v-model="form.detectionFile"/>
-        </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" placeholder="请输入备注" />
-        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+
+    <!-- 材料取样复试等级结果 -->
+    <el-dialog
+      :title="title"
+      v-if="resultopen"
+      :visible.sync="resultopen"
+      width="680px"
+      append-to-body
+    >
+      <el-form
+        ref="resultform"
+        :model="resultform"
+        :rules="resultrules"
+        label-width="100px"
+      >
+        <el-form-item label="项目名称">
+          <el-input
+            v-model="resultform.projectName"
+            placeholder="请输入项目名称"
+            :disabled="true"
+          />
+        </el-form-item>
+        <el-form-item label="单位名称">
+          <el-input
+            v-model="resultform.deptName"
+            placeholder="请输入单位名称"
+            :disabled="true"
+          />
+        </el-form-item>
+        <el-form-item label="送检类型">
+          <el-select
+            v-model="resultform.checkType"
+            placeholder="请选择送检类型"
+            style="width: 100%"
+            :disabled="true"
+          >
+            <el-option
+              v-for="dict in dict.type.check_detection_check_type"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="材料名称">
+          <el-input
+            v-model="resultform.materialName"
+            placeholder="请输入材料名称"
+            :disabled="true"
+          />
+        </el-form-item>
+        <el-form-item label="实验室名称">
+          <el-input
+            v-model="resultform.laboratoryName"
+            placeholder="请输入实验室名称"
+            :disabled="true"
+          />
+        </el-form-item>
+        <el-form-item label="送检时间">
+          <el-input
+            v-model="resultform.checkTime"
+            placeholder="请输入实送检时间"
+            :disabled="true"
+          />
+        </el-form-item>
+        <el-form-item label="检测结果" prop="detectionResult">
+          <el-radio
+            v-model="resultform.detectionResult"
+            v-for="dict in dict.type.project_checking_result"
+            :label="dict.value"
+            :key="dict.value"
+            border
+            size="small"
+            >{{ dict.label }}</el-radio
+          >
+        </el-form-item>
+        <el-form-item label="检测报告" prop="detectionFile">
+          <FileUpload
+            v-model="resultform.detectionFile"
+            :limit="2"
+            @input="fileInput"
+            :fileType="['pdf', 'png', 'jpg', 'jpeg']"
+          />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitResultForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
 <script>
-import { listCheckDetection, getCheckDetection, delCheckDetection, addCheckDetection, updateCheckDetection } from "@/api/project/checkDetection";
+import {
+  listCheckDetection,
+  getCheckDetection,
+  delCheckDetection,
+  addCheckDetection,
+  updateCheckDetection,
+  findCheckDetectionCount,
+  updateCheckDetectionResult,
+} from "@/api/project/checkDetection";
 
 export default {
   name: "CheckDetection",
-  dicts: ['sys_yes_no', 'project_checking_result', 'check_detection_check_type'],
+  dicts: ["sys_yes_no", "project_checking_result", "check_detection_check_type"],
   data() {
     return {
       // 遮罩层
@@ -337,12 +526,13 @@ export default {
       showSearch: true,
       // 总条数
       total: 0,
-      // 材料送检表格数据
+      // 材料取样复试表格数据
       checkDetectionList: [],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
       open: false,
+      resultopen: false,
       // 备注时间范围
       daterangeCheckTime: [],
       // 查询参数
@@ -350,7 +540,9 @@ export default {
         pageNum: 1,
         pageSize: 10,
         projectId: null,
+        projectName: null,
         deptId: null,
+        deptName: null,
         checkType: null,
         materialName: null,
         usePosition: null,
@@ -361,35 +553,112 @@ export default {
         checkTime: null,
         checkState: null,
         detectionResult: null,
+        activeName: "sjz",
       },
+      activeName: "sjz",
       // 表单参数
       form: {},
+      // 结果表单参数
+      resultform: {},
       // 表单校验
       rules: {
-      }
+        checkType: [{ required: true, message: "请选择送检类型", trigger: "blur" }],
+        materialName: [
+          { required: true, message: "请输入送检材料名称", trigger: "blur" },
+          { max: 100, message: "送检材料名称最多100字符", trigger: "blur" },
+        ],
+        usePosition: [
+          { required: true, message: "请输入使用部位", trigger: "blur" },
+          { max: 100, message: "使用部位最多100字符", trigger: "blur" },
+        ],
+        usePosition: [
+          { required: true, message: "请输入使用部位", trigger: "blur" },
+          { max: 100, message: "使用部位最多100字符", trigger: "blur" },
+        ],
+        sampleNum: [
+          { required: true, message: "请输入取样数量", trigger: "blur" },
+          { max: 100, message: "取样数量最多100字符", trigger: "blur" },
+        ],
+        qualifiedFlag: [
+          { required: true, message: "请选择是否提供合格证", trigger: "blur" },
+        ],
+        witnessUser: [
+          { required: true, message: "请选择监理单位见证人", trigger: "blur" },
+        ],
+        laboratoryName: [
+          { required: true, message: "请输入实验室名称", trigger: "blur" },
+          { max: 100, message: "实验室名称最多100字符", trigger: "blur" },
+        ],
+        checkTime: [{ required: true, message: "请选择送检时间", trigger: "blur" }],
+      },
+      resultrules: {
+        detectionResult: [{ required: true, message: "请选择检测结果", trigger: "blur" }],
+        detectionFile: [{ required: true, message: "请上传检测报告", trigger: "blur" }],
+      },
+      deptUserData: [],
+      tabs: {
+        all: "全部数据（0）",
+        sjz: "送检中（0）",
+        ywc: "已完成（0）",
+      },
     };
   },
   created() {
     this.getList();
   },
   methods: {
-    /** 查询材料送检列表 */
+    fileInput(files) {
+      let fileUrls = "";
+      if (files.length > 0) {
+        fileUrls = "";
+        files.forEach((item) => {
+          fileUrls += "," + item.url;
+        });
+        fileUrls = fileUrls.substring(1);
+      }
+      this.resultform.detectionFile = fileUrls;
+    },
+    // 页签点击
+    handleClick() {
+      this.queryParams.activeName = this.activeName;
+      this.getList();
+    },
+    /** 查询材料取样复试列表 */
     getList() {
       this.loading = true;
       this.queryParams.params = {};
-      if (null != this.daterangeCheckTime && '' != this.daterangeCheckTime) {
+      if (null != this.daterangeCheckTime && "" != this.daterangeCheckTime) {
         this.queryParams.params["beginCheckTime"] = this.daterangeCheckTime[0];
         this.queryParams.params["endCheckTime"] = this.daterangeCheckTime[1];
       }
-      listCheckDetection(this.queryParams).then(response => {
+      this.queryCount(this.queryParams);
+      listCheckDetection(this.queryParams).then((response) => {
         this.checkDetectionList = response.rows;
         this.total = response.total;
         this.loading = false;
       });
     },
+    queryCount(query) {
+      findCheckDetectionCount(query).then((response) => {
+        if (response && response.data) {
+          let check1 = 0;
+          let check2 = 0;
+          if (response.data.check1) {
+            check1 += response.data.check1;
+          }
+          if (response.data.check2) {
+            check2 += response.data.check2;
+          }
+          this.tabs.sjz = "送检中（" + check1 + "）";
+          this.tabs.ywc = "已完成（" + check2 + "）";
+          this.tabs.all = "全部数据（" + (check1 + check2) + "）";
+        }
+      });
+    },
     // 取消按钮
     cancel() {
       this.open = false;
+      this.resultopen = false;
       this.reset();
     },
     // 表单重置
@@ -417,7 +686,7 @@ export default {
         createTime: null,
         updateBy: null,
         updateTime: null,
-        remark: null
+        remark: null,
       };
       this.resetForm("form");
     },
@@ -434,38 +703,56 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
+      this.ids = selection.map((item) => item.id);
-      this.single = selection.length!==1
+      this.single = selection.length !== 1;
-      this.multiple = !selection.length
+      this.multiple = !selection.length;
     },
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
       this.open = true;
-      this.title = "添加材料送检";
+      this.title = "添加材料取样复试";
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
-      const id = row.id || this.ids
+      const id = row.id || this.ids;
-      getCheckDetection(id).then(response => {
+      getCheckDetection(id).then((response) => {
         this.form = response.data;
         this.open = true;
-        this.title = "修改材料送检";
+        this.title = "修改材料取样复试";
+      });
+      //查询单位人员
+      this.$api.publics
+        .selectProjectUnitUser({
+          unitType: "4",
+          projectId: row.projectId,
+        })
+        .then((d) => {
+          this.deptUserData = d.data;
+        });
+    },
+    /** 登记结果按钮操作 */
+    handleUpdateResult(row) {
+      this.reset();
+      getCheckDetection(row.id).then((response) => {
+        this.resultform = response.data;
+        this.resultopen = true;
+        this.title = "取样复试登记检测结果";
       });
     },
     /** 提交按钮 */
     submitForm() {
-      this.$refs["form"].validate(valid => {
+      this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.id != null) {
-            updateCheckDetection(this.form).then(response => {
+            updateCheckDetection(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
-            addCheckDetection(this.form).then(response => {
+            addCheckDetection(this.form).then((response) => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
@@ -474,22 +761,61 @@ export default {
         }
       });
     },
+    /** 登记取样复试结果 */
+    submitResultForm() {
+      this.$refs["resultform"].validate((valid) => {
+        if (valid) {
+          // 修改取样复试检测结果
+          this.resultform.checkState = "2";
+          updateCheckDetectionResult(this.resultform).then((response) => {
+            this.$modal.msgSuccess("登记结果成功");
+            this.resultopen = false;
+            this.getList();
+          });
+        }
+      });
+    },
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除材料送检编号为"' + ids + '"的数据项？').then(function() {
+      this.$modal
+        .confirm('是否确认删除材料取样复试编号为"' + ids + '"的数据项？')
+        .then(function () {
           return delCheckDetection(ids);
-      }).then(() => {
+        })
+        .then(() => {
           this.getList();
           this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+        })
+        .catch(() => {});
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('project/checkDetection/export', {
+      this.download(
-        ...this.queryParams
+        "project/checkDetection/export",
-      }, `checkDetection_${new Date().getTime()}.xlsx`)
+        {
-    }
+          ...this.queryParams,
+        },
+        `checkDetection_${new Date().getTime()}.xlsx`
+      );
+    },
+    /** 选择见证人*/
+    selectWitnessUser(val) {
+      this.deptUserData.forEach((item) => {
+        item.userinfoList.forEach((u) => {
+          if (u.phonenumber == val) {
+            this.form.witnessUserName = u.nickName + " [" + u.jobTypeName + "] ";
           }
+        });
+      });
+    },
+    /** 下载附件 */
+    handleDownload(row) {
+      this.files = row.measureFiles.split(",");
+      this.files.forEach((item) => {
+        this.$download.resource(item);
+      });
+    },
+  },
 };
 </script>

ruoyi-ui/src/views/project/projectChecking/index.vue

@@ -559,7 +559,7 @@ export default {
         this.title = "修改项目验收";
       });
       this.$api.publics
-        .selectProjectUnitUser({
+        .selectProjectAllUnitUser({
           projectId: row.projectId,
         })
         .then((d) => {

ruoyi-ui/src/views/project/projectChecking/projectCheckingDrawer.vue

@@ -416,7 +416,7 @@ export default {
           }
         });
       this.$api.publics
-        .selectProjectUnitUser({
+        .selectProjectAllUnitUser({
           projectId: project.id,
         })
         .then((d) => {

ruoyi-ui/src/views/project/projectMeasure/index.vue

@@ -649,7 +649,7 @@ export default {
         this.title = "修改实测实量";
       });
       this.$api.publics
-        .selectProjectUnitUser({
+        .selectProjectAllUnitUser({
           projectId: row.projectId,
         })
         .then((d) => {

ruoyi-ui/src/views/project/projectMeasure/projectMeasureDrawer.vue

@@ -467,7 +467,7 @@ export default {
           }
         });
       this.$api.publics
-        .selectProjectUnitUser({
+        .selectProjectAllUnitUser({
           projectId: project.id,
         })
         .then((d) => {

ruoyi-ui/src/views/project/surProject/index.vue

@@ -374,6 +374,8 @@
               'project:projectDeptWroks:list',
               'project:surProjectAttendance:add',
               'video:videoConfig:list',
+              'project:checkDetection:list',
+              'project:costOutput:edit',
               'project:surProject:remove',
             ]"
           >
@@ -453,6 +455,12 @@
                 v-hasPermi="['video:videoConfig:list']"
                 >视频配置</el-dropdown-item
               >
+              <el-dropdown-item
+                command="handleCheckDetection"
+                icon="el-icon-c-scale-to-original"
+                v-hasPermi="['project:checkDetection:list']"
+                >材料取样复试</el-dropdown-item
+              >
               <el-dropdown-item
                 command="handleCostOutput"
                 icon="el-icon-money"
@@ -790,6 +798,7 @@
     <projectMeasureDrawer ref="projectMeasure"></projectMeasureDrawer>
     <videoConfigDrawer ref="videoConfig"></videoConfigDrawer>
     <costOutputDrawer ref="costOutput"></costOutputDrawer>
+    <checkDetectionDrawer ref="checkDetection"></checkDetectionDrawer>
   </div>
 </template>
 
@@ -819,6 +828,7 @@ import materialSealDrawer from "@/views/project/materialSeal/projectMaterialSeal
 import projectMeasureDrawer from "../projectMeasure/projectMeasureDrawer.vue";
 import videoConfigDrawer from "@/views/video/videoConfig/videoConfigDrawer";
 import costOutputDrawer from "@/views/project/costOutput/costOutputDrawer.vue";
+import checkDetectionDrawer from "../checkDetection/checkDetectionDrawer.vue";
 import { checkPermi, checkRole } from "@/utils/permission"; // 权限判断函数
 
 export default {
@@ -840,6 +850,7 @@ export default {
     projectMeasureDrawer,
     videoConfigDrawer,
     costOutputDrawer,
+    checkDetectionDrawer,
   },
   dicts: [
     "sys_check_state",
@@ -1090,6 +1101,9 @@ export default {
         case "handleCostOutput":
           this.$refs.costOutput.show(row);
           break;
+        case "handleCheckDetection":
+          this.$refs.checkDetection.show(row);
+          break;
         default:
           break;
       }

ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectUserinfoController.java

@@ -2,6 +2,7 @@ package com.ruoyi.web.project.controller;
 
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.yanzhu.jh.project.domain.SurProjectUnitInfo;
 import com.yanzhu.jh.project.domain.SurProjectUserinfo;
 import com.yanzhu.jh.project.service.ISurProjectUserinfoService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -34,6 +35,16 @@ public class ProjectUserinfoController extends BaseController {
         return success(surProjectUserinfoService.selectProjectUnitUser(surProjectUserinfo));
     }
 
+    /**
+     * 根据项目单位人员
+     * @param surProjectUnitInfo
+     * @return
+     */
+    @GetMapping("/selectProjectUnitUser")
+    public AjaxResult selectProjectUnitUser(SurProjectUnitInfo surProjectUnitInfo){
+        return success(surProjectUserinfoService.selectProjectUnitUser(surProjectUnitInfo));
+    }
+
     /**
      * 查询项目整改人，复检人，抄送人
      * @param projectId

yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectCheckDetectionController.java

@@ -2,6 +2,10 @@ package com.yanzhu.jh.project.controller;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.common.core.text.Convert;
+import com.ruoyi.common.enums.SysRoleEnum;
+import com.ruoyi.system.service.ISysDeptService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -22,7 +26,7 @@ import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.common.core.page.TableDataInfo;
 
 /**
- * 材料送检Controller
+ * 取样复试Controller
  * 
  * @author JiangYuQi
  * @date 2023-08-31
@@ -31,36 +35,62 @@ import com.ruoyi.common.core.page.TableDataInfo;
 @RequestMapping("/project/checkDetection")
 public class SurProjectCheckDetectionController extends BaseController
 {
+    @Autowired
+    private ISysDeptService sysDeptService;
+
     @Autowired
     private ISurProjectCheckDetectionService surProjectCheckDetectionService;
 
     /**
-     * 查询材料送检列表
+     * 查询取样复试列表
      */
     @PreAuthorize("@ss.hasPermi('project:checkDetection:list')")
     @GetMapping("/list")
     public TableDataInfo list(SurProjectCheckDetection surProjectCheckDetection)
     {
         startPage();
+        surProjectCheckDetection.setNowRole(Convert.toStr(getUserFirstRole()));
+        if(SysRoleEnum.ZGS.getCode().equals(surProjectCheckDetection.getNowRole())){
+            surProjectCheckDetection.setNowDept(Convert.toStr(sysDeptService.getZGSDeptId(getDeptId())));
+        }else{
+            surProjectCheckDetection.setNowDept(Convert.toStr(getDeptId()));
+        }
+        surProjectCheckDetection.setNowUser(Convert.toStr(getUserId()));
         List<SurProjectCheckDetection> list = surProjectCheckDetectionService.selectSurProjectCheckDetectionList(surProjectCheckDetection);
         return getDataTable(list);
     }
+    /**
+     * 查询取样复试列表
+     */
+    @PreAuthorize("@ss.hasPermi('project:checkDetection:list')")
+    @GetMapping("/findCheckDetectionCount")
+    public AjaxResult findCheckDetectionCount(SurProjectCheckDetection surProjectCheckDetection)
+    {
+        surProjectCheckDetection.setNowRole(Convert.toStr(getUserFirstRole()));
+        if(SysRoleEnum.ZGS.getCode().equals(surProjectCheckDetection.getNowRole())){
+            surProjectCheckDetection.setNowDept(Convert.toStr(sysDeptService.getZGSDeptId(getDeptId())));
+        }else{
+            surProjectCheckDetection.setNowDept(Convert.toStr(getDeptId()));
+        }
+        surProjectCheckDetection.setNowUser(Convert.toStr(getUserId()));
+        return success(surProjectCheckDetectionService.queryGroupCount(surProjectCheckDetection));
+    }
 
     /**
-     * 导出材料送检列表
+     * 导出取样复试列表
      */
     @PreAuthorize("@ss.hasPermi('project:checkDetection:export')")
-    @Log(title = "材料送检", businessType = BusinessType.EXPORT)
+    @Log(title = "取样复试", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, SurProjectCheckDetection surProjectCheckDetection)
     {
         List<SurProjectCheckDetection> list = surProjectCheckDetectionService.selectSurProjectCheckDetectionList(surProjectCheckDetection);
         ExcelUtil<SurProjectCheckDetection> util = new ExcelUtil<SurProjectCheckDetection>(SurProjectCheckDetection.class);
-        util.exportExcel(response, list, "材料送检数据");
+        util.exportExcel(response, list, "取样复试数据");
     }
 
     /**
-     * 获取材料送检详细信息
+     * 获取取样复试详细信息
      */
     @PreAuthorize("@ss.hasPermi('project:checkDetection:query')")
     @GetMapping(value = "/{id}")
@@ -70,10 +100,10 @@ public class SurProjectCheckDetectionController extends BaseController
     }
 
     /**
-     * 新增材料送检
+     * 新增取样复试
      */
     @PreAuthorize("@ss.hasPermi('project:checkDetection:add')")
-    @Log(title = "材料送检", businessType = BusinessType.INSERT)
+    @Log(title = "取样复试", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody SurProjectCheckDetection surProjectCheckDetection)
     {
@@ -81,10 +111,10 @@ public class SurProjectCheckDetectionController extends BaseController
     }
 
     /**
-     * 修改材料送检
+     * 修改取样复试
      */
     @PreAuthorize("@ss.hasPermi('project:checkDetection:edit')")
-    @Log(title = "材料送检", businessType = BusinessType.UPDATE)
+    @Log(title = "取样复试", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody SurProjectCheckDetection surProjectCheckDetection)
     {
@@ -92,10 +122,21 @@ public class SurProjectCheckDetectionController extends BaseController
     }
 
     /**
-     * 删除材料送检
+     * 登记取样复试结果
+     */
+    @PreAuthorize("@ss.hasPermi('project:checkDetection:editResult')")
+    @Log(title = "取样复试", businessType = BusinessType.UPDATE)
+    @PostMapping("/editResult")
+    public AjaxResult editResult(@RequestBody SurProjectCheckDetection surProjectCheckDetection)
+    {
+        return toAjax(surProjectCheckDetectionService.updateSurProjectCheckDetection(surProjectCheckDetection));
+    }
+    
+    /**
+     * 删除取样复试
      */
     @PreAuthorize("@ss.hasPermi('project:checkDetection:remove')")
-    @Log(title = "材料送检", businessType = BusinessType.DELETE)
+    @Log(title = "取样复试", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
     {

yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectUserinfoService.java

@@ -40,6 +40,14 @@ public interface ISurProjectUserinfoService
      */
     public List<SurProjectUnitInfo> selectProjectUnitUser(SurProjectUserinfo surProjectUserinfo);
 
+    /**
+     * 查询项目部门人员
+     *
+     * @param surProjectUnitInf 项目部门
+     * @return 项目用户集合
+     */
+    public List<SurProjectUnitInfo> selectProjectUnitUser(SurProjectUnitInfo surProjectUnitInf);
+
     /**
      * 查询项目相关人员
      *

yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectUserinfoServiceImpl.java

@@ -82,6 +82,7 @@ public class SurProjectUserinfoServiceImpl implements ISurProjectUserinfoService
      * @param surProjectUserinfo 项目用户
      * @return 项目用户集合
      */
+    @Override
     public List<SurProjectUnitInfo> selectProjectUnitUser(SurProjectUserinfo surProjectUserinfo) {
         SurProjectUnitInfo surProjectUnitInfo = new SurProjectUnitInfo();
         surProjectUnitInfo.setProjectId(surProjectUserinfo.getProjectId());
@@ -102,6 +103,32 @@ public class SurProjectUserinfoServiceImpl implements ISurProjectUserinfoService
         return projectUnitUserInfoList;
     }
 
+    /**
+     * 查询项目部门人员
+     *
+     * @param surProjectUnitInfo 项目用户
+     * @return 项目用户集合
+     */
+    @Override
+    public List<SurProjectUnitInfo> selectProjectUnitUser(SurProjectUnitInfo surProjectUnitInfo) {
+        List<SurProjectUnitInfo> projectUnitUserInfoList = surProjectUnitInfoMapper.selectSurProjectUnitInfoList(surProjectUnitInfo);
+        SurProjectUserinfo surProjectUserinfo = new SurProjectUserinfo();
+        surProjectUserinfo.setProjectId(surProjectUnitInfo.getProjectId());
+        List<SurProjectUserinfo> projectUserinfoList = surProjectUserinfoMapper.selectSurProjectUserinfoList(surProjectUserinfo);
+        for(SurProjectUnitInfo projectUnitInfo:projectUnitUserInfoList){
+            List<SurProjectUserinfo> unitUserList = new ArrayList<>();
+            for(SurProjectUserinfo projectUserinfo:projectUserinfoList){
+                //同一部门组装数据
+                if(projectUnitInfo.getUnitId().equals(projectUserinfo.getDeptId())){
+                    unitUserList.add(projectUserinfo);
+                }else if(DeptTypeEnum.ZGS.getCode().equals(projectUnitInfo.getUnitType().toString()) && PublicStateEnum.USERTYPE_JFJL.getCode().equals(projectUserinfo.getJobType())) {
+                    unitUserList.add(projectUserinfo);
+                }
+            }
+            projectUnitInfo.setUserinfoList(unitUserList);
+        }
+        return projectUnitUserInfoList;
+    }
 
     /**
      * 根据不同角色查询项目人员信息

yanzhu-jh/src/main/java/com/yanzhu/jh/publics/PublicsController.java

@@ -117,11 +117,20 @@ PublicsController extends BaseController {
     }
 
     /**
-     * 选择项目部门人员
+     * 选择项目所有部门人员
      */
-    @GetMapping("/selectProjectUnitUser")
+    @GetMapping("/selectProjectAllUnitUser")
-    public AjaxResult selectProjectUnitUser(SurProjectUserinfo surProjectUserinfo)
+    public AjaxResult selectProjectAllUnitUser(SurProjectUserinfo surProjectUserinfo)
     {
         return success(surProjectUserinfoService.selectProjectUnitUser(surProjectUserinfo));
     }
+
+    /**
+     * 选择项目部门人员
+     */
+    @GetMapping("/selectProjectUnitUser")
+    public AjaxResult selectProjectUnitUser(SurProjectUnitInfo surProjectUnitInfo)
+    {
+        return success(surProjectUserinfoService.selectProjectUnitUser(surProjectUnitInfo));
+    }
 }

yanzhu-jh/src/main/resources/mapper/project/SurProjectCheckDetectionMapper.xml

@@ -56,8 +56,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="usePosition != null  and usePosition != ''"> and spcd.use_position like concat('%', #{usePosition}, '%')</if>
             <if test="sampleNum != null  and sampleNum != ''"> and spcd.sample_num = #{sampleNum}</if>
             <if test="isDel != null  and isDel != ''"> and spcd.is_del = #{isDel}</if>
-            <if test="sampleUserName != null  and sampleUserName != ''"> and spcd.sample_user_name like concat('%', #{sampleUserName}, '%')</if>
+            <if test="sampleUserName != null  and sampleUserName != ''"> and (spcd.sample_user like concat('%', #{sampleUserName}, '%') or spcd.sample_user_name like concat('%', #{sampleUserName}, '%'))</if>
-            <if test="witnessUserName != null  and witnessUserName != ''"> and spcd.witness_user_name like concat('%', #{witnessUserName}, '%')</if>
+            <if test="witnessUserName != null  and witnessUserName != ''"> and (spcd.witness_user like concat('%', #{witnessUserName}, '%') or spcd.witness_user_name like concat('%', #{witnessUserName}, '%'))</if>
             <if test="laboratoryName != null  and laboratoryName != ''"> and spcd.laboratory_name like concat('%', #{laboratoryName}, '%')</if>
             <if test="params.beginCheckTime != null and params.beginCheckTime != '' and params.endCheckTime != null and params.endCheckTime != ''"> and spcd.check_time between #{params.beginCheckTime} and #{params.endCheckTime}</if>
             <if test="checkState != null  and checkState != ''"> and spcd.check_state = #{checkState}</if>