Merge branch 'dev' of http://62.234.3.186:3000/sxyanzhu/jhprjv2 into dev

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

@@ -106,37 +106,68 @@
         <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
+      <el-dialog :title="title" v-if="open" :visible.sync="open" width="900px" append-to-body  custom-class="prj-checking-detection-drawer-dlg"
         :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-row>
+            <el-col :span="12">
+              <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-col>
+            <el-col :span="12">
+              <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-col>
+          </el-row>
+
+          <el-row>
+            <el-col :span="24">
+              <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-col>
+          </el-row>
+
+          <el-row>
+            <el-col :span="24">
+              <el-form-item label="材料名称" prop="materialName">
             <el-input v-model="form.materialName" placeholder="请输入材料名称" />
           </el-form-item>
-          <el-form-item label="使用部位" prop="usePosition">
+            </el-col>
+          </el-row>
+
+          <el-row>
+            <el-col :span="24">
+              <el-form-item label="使用部位" prop="usePosition">
             <el-input v-model="form.usePosition" placeholder="请输入使用部位" />
           </el-form-item>
-          <el-form-item label="取样数量" prop="sampleNum">
+            </el-col>
+          </el-row>
+
+          <el-row>
+            <el-col :span="24">
+              <el-form-item label="取样数量" prop="sampleNum">
             <el-input v-model="form.sampleNum" placeholder="请输入取样数量" />
           </el-form-item>
-          <el-form-item label="提供合格证" prop="qualifiedFlag">
+            </el-col>
+          </el-row>
+
+          <el-row>
+            <el-col :span="12">
+              <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-col>
+            <el-col :span="12">
+              <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 + ''"
@@ -147,16 +178,50 @@
               </el-option-group>
             </el-select>
           </el-form-item>
-          <el-form-item label="实验室名称" prop="laboratoryName">
+            </el-col>
+          </el-row>
+
+          <el-row>
+            <el-col :span="24">
+              <el-form-item label="实验室名称" prop="laboratoryName">
             <el-input v-model="form.laboratoryName" placeholder="请输入实验室名称" />
           </el-form-item>
-          <el-form-item label="送检时间" prop="checkTime">
+            </el-col>
+          </el-row>
+
+          <el-row>
+          <el-col :span="12">
+            <el-form-item label="委托单" prop="trustDeed" :class="form.trustDeed?'img-1':''">
+              <image-upload v-model="form.trustDeed" :limit="1" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12" v-if="false">
+            <el-form-item label="样品照片" prop="specimenPhoto" :class="form.specimenPhoto?'img-1':''">
+              <image-upload v-model="form.specimenPhoto" :limit="1" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+          <el-row>
+            <el-col :span="24">
+              <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-col>
+          </el-row>
+
+          <el-row>
+            <el-col :span="24">
+              <el-form-item label="附件" prop="attachmentFiles" class="mg-b-8">
+              <FileUpload :limit="10" v-model="form.attachmentFiles" />
+            </el-form-item>
+            </el-col>
+          </el-row>
+          
         </el-form>
-        <div slot="footer" class="dialog-footer">
+        <div slot="footer" class="dialog-footer" style="text-align: center;">
           <el-button type="primary" @click="submitForm">确 定</el-button>
           <el-button @click="cancel">取 消</el-button>
         </div>
@@ -278,6 +343,12 @@ export default {
         qualifiedFlag: [
           { required: true, message: "请选择是否提供合格证", trigger: "blur" },
         ],
+        trustDeed:[
+          {required:true,message:'请上传委托单',trigger:"blur"}
+        ],
+        specimenPhoto:[
+          {required:true,message:'请上传样品照片',trigger:"blur"}
+        ],
         witnessUser: [
           { required: true, message: "请选择监理单位监理专员", trigger: "blur" },
         ],
@@ -400,13 +471,19 @@ export default {
       this.files = [];
       this.resetForm("form");
     },
+    getDeptName(){
+      let tmps=this.nodes.filter(d=>d.deptId==+this.unitActiveName);
+      return tmps.length>0?tmps[0].deptName:"";
+    },
     /** 新增按钮操作 */
     handleAdd() {
+      debugger
       this.reset();
       this.credential = false;
       this.form.projectId = this.project.id;
       this.form.projectName = this.project.projectName;
       this.form.deptId = this.unitActiveName;
+      this.form.deptName=this.getDeptName();
       this.open = true;
       this.title = "添加材料取样复试";
       //查询单位人员
@@ -430,7 +507,14 @@ export default {
       this.reset();
       const id = row.id || this.ids;
       getCheckDetection(id).then((response) => {
-        this.form = response.data;
+        let obj= response.data;
+        obj.attachmentFiles=this.$tryToJson(obj.attachment||'[]',[]).map(d=>{
+          return {
+            name:d,
+            url:d
+          }
+        });
+        this.form = obj;
         this.files = this.form.credentialFile;
         this.open = true;
         this.title = "修改项目特种人员";
@@ -458,6 +542,7 @@ export default {
     submitForm() {
       this.$refs["form"].validate((valid) => {
         if (valid) {
+          this.form.attachment=this.form.attachmentFiles?JSON.stringify(this.form.attachmentFiles.map(d=>d.url)):"[]";
           if (this.form.id) {
             //已经上传过检测结果时，修改重新发起提交申请
             if (this.form.checkState == "2") {
@@ -533,3 +618,47 @@ export default {
   },
 };
 </script>
+<style lang="scss">
+.prj-checking-detection-drawer-dlg{
+  .el-dialog__body{
+    padding:0px 10px;
+    .el-form-item{
+      margin-bottom: 16px;
+      &.mg-b-8{
+        margin-bottom: 8px;
+      }
+      &.img-1{
+        .el-upload--picture-card{
+          display: none;
+        }
+        .el-upload__tip{
+          display: none;
+        }
+      }
+      .upload-file {
+        .upload-file-uploader{
+          display: flex;
+          align-items: center;
+          margin-bottom: 0px;
+          line-height: 30px;
+          .el-upload__tip{
+            margin-left: 8px;
+          }
+        }
+      }
+      .el-form-item__error{
+        z-index: 9;
+        margin-top:-4px;
+      }
+      .upload-file-list {
+        max-height: 120px;
+        overflow-y: auto;
+        padding-right:30px;
+        .el-upload-list__item{
+          margin-bottom: 0px !important;
+        }
+      }
+    }
+  }
+}
+</style>

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

@@ -1,37 +1,16 @@
 <template>
   <div class="app-container">
-    <el-form
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      :model="queryParams"
-      ref="queryForm"
-      size="small"
-      :inline="true"
-      v-show="showSearch"
-      label-width="68px"
-    >
       <el-form-item label="项目名称" prop="projectName">
-        <el-input
+        <el-input v-model="queryParams.projectName" placeholder="请输入项目名称" clearable @keyup.enter.native="handleQuery" />
-          v-model="queryParams.projectName"
-          placeholder="请输入项目名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
       </el-form-item>
       <el-form-item label="单位名称" prop="deptName">
-        <el-input
+        <el-input v-model="queryParams.deptName" placeholder="请输入单位名称" clearable @keyup.enter.native="handleQuery" />
-          v-model="queryParams.deptName"
-          placeholder="请输入单位名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
       </el-form-item>
       <el-form-item label="送检类型" prop="checkType">
         <el-select v-model="queryParams.checkType" placeholder="请选择送检类型" clearable>
-          <el-option
+          <el-option v-for="dict in dict.type.check_detection_check_type" :key="dict.value" :label="dict.label"
-            v-for="dict in dict.type.check_detection_check_type"
+            :value="dict.value" />
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
         </el-select>
       </el-form-item>
       <!-- <el-form-item label="检测结果" prop="detectionResult">
@@ -49,72 +28,38 @@
         </el-select>
       </el-form-item> -->
       <el-form-item label="材料名称" prop="materialName">
-        <el-input
+        <el-input v-model="queryParams.materialName" placeholder="请输入材料名称" clearable
-          v-model="queryParams.materialName"
+          @keyup.enter.native="handleQuery" />
-          placeholder="请输入材料名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
       </el-form-item>
       <el-form-item label="送检时间">
-        <el-date-picker
+        <el-date-picker v-model="daterangeCheckTime" style="width: 240px" value-format="yyyy-MM-dd" type="daterange"
-          v-model="daterangeCheckTime"
+          range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
-          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="approveStatus" v-if="false">
-        <el-select
+        <el-select v-model="queryParams.approveStatus" placeholder="请选择审批状态" clearable>
-          v-model="queryParams.approveStatus"
+          <el-option v-for="dict in dict.type.project_check_status" :key="dict.value" :label="dict.label"
-          placeholder="请选择审批状态"
+            :value="dict.value" />
-          clearable
-        >
-          <el-option
-            v-for="dict in dict.type.project_check_status"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
         </el-select>
       </el-form-item>
       <el-form-item label="使用部位" prop="usePosition">
-        <el-input
+        <el-input v-model="queryParams.usePosition" placeholder="请输入使用部位" clearable @keyup.enter.native="handleQuery" />
-          v-model="queryParams.usePosition"
-          placeholder="请输入使用部位"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
       </el-form-item>
       <el-form-item label="监理专员" prop="witnessUserName">
-        <el-input
+        <el-input v-model="queryParams.witnessUserName" placeholder="请输入监理专员名称" clearable
-          v-model="queryParams.witnessUserName"
+          @keyup.enter.native="handleQuery" />
-          placeholder="请输入监理专员名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
       </el-form-item>
       <el-form-item label="实验室" prop="laboratoryName">
-        <el-input
+        <el-input v-model="queryParams.laboratoryName" placeholder="请输入实验室名称" clearable
-          v-model="queryParams.laboratoryName"
+          @keyup.enter.native="handleQuery" />
-          placeholder="请输入实验室名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery"
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-          >搜索</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
@@ -125,7 +70,7 @@
           >新增</el-button
         >
       </el-col> -->
-      <!-- <el-col :span="1.5">
+    <!-- <el-col :span="1.5">
         <el-button
           type="success"
           plain
@@ -165,84 +110,35 @@
     <el-tabs type="card" v-model="queryParams.activeName" @tab-click="getList">
       <el-tab-pane :label="tabs.all" name="all"></el-tab-pane>
       <el-tab-pane :label="tabs.jxz" name="jxz"></el-tab-pane>
-      <el-tab-pane :label="tabs.ywc" name="ywc"></el-tab-pane
+      <el-tab-pane :label="tabs.ywc" name="ywc"></el-tab-pane></el-tabs>
-    ></el-tabs>
+    <el-table v-loading="loading" :data="checkDetectionList" @selection-change="handleSelectionChange" stripe>
-    <el-table
+      <el-table-column label="项目名称" align="center" prop="projectName" width="200">
-      v-loading="loading"
-      :data="checkDetectionList"
-      @selection-change="handleSelectionChange" stripe
-    >
-      <el-table-column
-        label="项目名称"
-        align="center"
-        prop="projectName"
-        width="200"
-      >
         <template slot-scope="scope">
           <div>{{ scope.row.projectName }}</div>
         </template>
       </el-table-column>
-      <el-table-column
+      <el-table-column label="单位名称" align="center" prop="deptName" width="180" show-overflow-tooltip />
-        label="单位名称"
-        align="center"
-        prop="deptName"
-        width="180"
-        show-overflow-tooltip
-      />
       <el-table-column label="送检类型" align="center" prop="checkType">
         <template slot-scope="scope">
-          <dict-tag
+          <dict-tag :options="dict.type.check_detection_check_type" :value="scope.row.checkType" />
-            :options="dict.type.check_detection_check_type"
-            :value="scope.row.checkType"
-          />
         </template>
       </el-table-column>
-      <el-table-column
+      <el-table-column label="材料名称" align="center" prop="materialName" width="100" show-overflow-tooltip />
-        label="材料名称"
+      <el-table-column label="使用部位" align="center" prop="usePosition" width="120" show-overflow-tooltip />
-        align="center"
+      <el-table-column label="取样数量" align="center" prop="sampleNum" width="80" show-overflow-tooltip />
-        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
+      <el-table-column label="监理专员" align="left" prop="witnessUser" width="140" show-overflow-tooltip>
-        label="监理专员"
-        align="left"
-        prop="witnessUser"
-        width="140"
-        show-overflow-tooltip
-      >
         <template slot-scope="scope">
           <div>{{ scope.row.witnessUserName }}</div>
           <div>{{ scope.row.witnessUser }}</div>
         </template>
       </el-table-column>
-      <el-table-column
+      <el-table-column label="实验室名称" align="center" prop="laboratoryName" width="150" show-overflow-tooltip />
-        label="实验室名称"
-        align="center"
-        prop="laboratoryName"
-        width="150"
-        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>
@@ -258,10 +154,7 @@
       </el-table-column> -->
       <el-table-column label="审批状态" align="center" prop="approveStatus" width="120">
         <template slot-scope="scope">
-          <dict-tag
+          <dict-tag :options="dict.type.project_check_status" :value="scope.row.approveStatus" />
-            :options="dict.type.project_check_status"
-            :value="scope.row.approveStatus"
-          />
         </template>
       </el-table-column>
       <el-table-column label="提交用户" align="center" prop="createBy" width="110" />
@@ -278,261 +171,183 @@
       </el-table-column>
       <el-table-column label="检测报告" align="center" prop="updateTime" width="80">
         <template slot-scope="scope">
-          <el-button
+          <el-button v-if="scope.row.checkState == '2'" size="mini" type="text" icon="el-icon-paperclip"
-            v-if="scope.row.checkState == '2'"
+            @click="handledownload(scope.row)" v-hasPermi="['project:surProjectSpecial:list']">下载检测报告</el-button>
-            size="mini"
-            type="text"
-            icon="el-icon-paperclip"
-            @click="handledownload(scope.row)"
-            v-hasPermi="['project:surProjectSpecial:list']"
-            >下载检测报告</el-button
-          >
         </template>
       </el-table-column>
-      <el-table-column
+      <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width" width="200">
-        label="操作"
-        align="center"
-        fixed="right"
-        class-name="small-padding fixed-width"
-        width="200"
-      >
         <template slot-scope="scope">
-          <el-button
+          <el-button v-if="scope.row.checkState == '1'" size="mini" type="text" icon="el-icon-edit-outline"
-            v-if="scope.row.checkState == '1'"
+            @click="handleUpdateResult(scope.row)" style="margin-left: 8px"
-            size="mini"
+            v-hasPermi="['project:checkDetection:editResult']">登记检测结果</el-button>
-            type="text"
+          <el-button v-if="scope.row.approveStatus != null" size="mini" type="text" icon="el-icon-tickets"
-            icon="el-icon-edit-outline"
+            @click="handleAuditinfo(scope.row)">审批日志</el-button>
-            @click="handleUpdateResult(scope.row)"
+          <el-button v-if="scope.row.approveStatus == '1'" size="mini" type="text" icon="el-icon-finished"
-            style="margin-left: 8px"
+            v-hasPermi="['project:checkDetection:approve']" @click="handleAudit(scope.row)">处理审批</el-button>
-            v-hasPermi="['project:checkDetection:editResult']"
+          <el-button v-if="scope.row.checkState == '1'" size="mini" type="text" icon="el-icon-edit"
-            >登记检测结果</el-button
+            @click="handleUpdate(scope.row)" v-hasPermi="['project:checkDetection:edit']">修改</el-button>
-          >
+          <el-button v-if="scope.row.approveStatus != '4'" size="mini" type="text" icon="el-icon-delete"
-          <el-button
+            @click="handleDelete(scope.row)" v-hasPermi="['project:checkDetection:remove']">删除</el-button>
-            v-if="scope.row.approveStatus != null"
-            size="mini"
-            type="text"
-            icon="el-icon-tickets"
-            @click="handleAuditinfo(scope.row)"
-            >审批日志</el-button
-          >
-          <el-button
-            v-if="scope.row.approveStatus == '1'"
-            size="mini"
-            type="text"
-            icon="el-icon-finished"
-            v-hasPermi="['project:checkDetection:approve']"
-            @click="handleAudit(scope.row)"
-            >处理审批</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
-            v-if="scope.row.approveStatus != '4'"
-            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
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
-      v-show="total > 0"
+      @pagination="getList" />
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
 
     <!-- 添加或修改材料取样复试对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="680px" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
+    <el-dialog :title="title" :visible.sync="open" width="900px" append-to-body :close-on-click-modal="false" custom-class="prj-checking-detection-dlg"
+      :close-on-press-escape="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
-        <el-form-item label="项目名称" prop="projectName">
+        <el-row>
-          <el-input
+          <el-col :span="12">
-            v-model="form.projectName"
+            <el-form-item label="项目名称" prop="projectName" class="mg-b-8">
-            placeholder="请输入项目名称"
+              <el-input v-model="form.projectName" placeholder="请输入项目名称" :disabled="true" />
-            :disabled="true"
+            </el-form-item>
-          />
+          </el-col>
-        </el-form-item>
+          <el-col :span="12">
-        <el-form-item label="单位名称" prop="deptName">
+            <el-form-item label="单位名称" prop="deptName"  class="mg-b-8">
-          <el-input
+              <el-input v-model="form.deptName" placeholder="请输入单位名称" :disabled="true" />
-            v-model="form.deptName"
+            </el-form-item>
-            placeholder="请输入单位名称"
+          </el-col>
-            :disabled="true"
+        </el-row>
-          />
+        <el-row>
-        </el-form-item>
+          <el-col :span="24">
-        <el-form-item label="送检类型" prop="checkType">
+            <el-form-item label="送检类型" prop="checkType">
-          <el-select
+              <el-select v-model="form.checkType" placeholder="请选择送检类型" style="width: 100%">
-            v-model="form.checkType"
+                <el-option v-for="dict in dict.type.check_detection_check_type" :key="dict.value" :label="dict.label"
-            placeholder="请选择送检类型"
+                  :value="dict.value"></el-option>
-            style="width: 100%"
+              </el-select>
-          >
+            </el-form-item>
-            <el-option
+          </el-col>
-              v-for="dict in dict.type.check_detection_check_type"
+        </el-row>
-              :key="dict.value"
+
-              :label="dict.label"
+        <el-row>
-              :value="dict.value"
+          <el-col :span="24">
-            ></el-option>
+            <el-form-item label="材料名称" prop="materialName">
-          </el-select>
+              <el-input v-model="form.materialName" placeholder="请输入材料名称" />
-        </el-form-item>
+            </el-form-item>
-        <el-form-item label="材料名称" prop="materialName">
+          </el-col>
-          <el-input v-model="form.materialName" placeholder="请输入材料名称" />
+        </el-row>
-        </el-form-item>
+
-        <el-form-item label="使用部位" prop="usePosition">
+        <el-row>
-          <el-input v-model="form.usePosition" placeholder="请输入使用部位" />
+          <el-col :span="24">
-        </el-form-item>
+            <el-form-item label="使用部位" prop="usePosition">
-        <el-form-item label="取样数量" prop="sampleNum">
+              <el-input v-model="form.usePosition" placeholder="请输入使用部位" />
-          <el-input v-model="form.sampleNum" placeholder="请输入取样数量" />
+            </el-form-item>
-        </el-form-item>
+          </el-col>
-        <el-form-item label="提供合格证" prop="qualifiedFlag">
+        </el-row>
-          <el-select
+
-            v-model="form.qualifiedFlag"
+        <el-row>
-            placeholder="请选择提供合格证"
+          <el-col :span="24">
-            style="width: 100%"
+            <el-form-item label="取样数量" prop="sampleNum">
-          >
+              <el-input v-model="form.sampleNum" placeholder="请输入取样数量" />
-            <el-option
+            </el-form-item>
-              v-for="dict in dict.type.sys_yes_no"
+          </el-col>
-              :key="dict.value"
+        </el-row>
-              :label="dict.label"
+        <el-row>
-              :value="dict.value"
+          <el-col :span="12"> <el-form-item label="提供合格证" prop="qualifiedFlag">
-            ></el-option>
+              <el-select v-model="form.qualifiedFlag" placeholder="请选择提供合格证" style="width: 100%">
-          </el-select>
+                <el-option v-for="dict in dict.type.sys_yes_no" :key="dict.value" :label="dict.label"
-        </el-form-item>
+                  :value="dict.value"></el-option>
-        <el-form-item label="监理专员" prop="witnessUser">
+              </el-select>
-          <el-select
+            </el-form-item>
-            v-model="form.witnessUser"
+          </el-col>
-            placeholder="请选择监理专员"
+          <el-col :span="12">
-            filterable
+            <el-form-item label="监理专员" prop="witnessUser">
-            style="width: 100%"
+              <el-select v-model="form.witnessUser" placeholder="请选择监理专员" filterable style="width: 100%"
-            @change="selectWitnessUser"
+                @change="selectWitnessUser">
-          >
+                <el-option-group v-for="group in deptUserData" :key="group.unitId + ''"
-            <el-option-group
+                  :label="group.unitName + ' [' + group.unitTypeName + '] '">
-              v-for="group in deptUserData"
+                  <el-option v-for="item in group.userinfoList" :key="item.phonenumber"
-              :key="group.unitId + ''"
+                    :label="item.nickName + ' [' + item.jobTypeName + '] '" :value="item.phonenumber">
-              :label="group.unitName + ' [' + group.unitTypeName + '] '"
+                  </el-option>
-            >
+                </el-option-group>
-              <el-option
+              </el-select>
-                v-for="item in group.userinfoList"
+            </el-form-item>
-                :key="item.phonenumber"
+          </el-col>
-                :label="item.nickName + ' [' + item.jobTypeName + '] '"
+
-                :value="item.phonenumber"
+        </el-row>
-              >
+
-              </el-option>
+        <el-row>
-            </el-option-group>
+          <el-col :span="24">
-          </el-select>
+
-        </el-form-item>
+            <el-form-item label="实验室名称" prop="laboratoryName">
-        <el-form-item label="实验室名称" prop="laboratoryName">
+              <el-input v-model="form.laboratoryName" placeholder="请输入实验室名称" />
-          <el-input v-model="form.laboratoryName" placeholder="请输入实验室名称" />
+            </el-form-item></el-col>
-        </el-form-item>
+        </el-row>
-        <el-form-item label="送检时间" prop="checkTime">
+
-          <el-date-picker
+        <el-row>
-            clearable
+          <el-col :span="12">
-            v-model="form.checkTime"
+            <el-form-item label="委托单" prop="trustDeed" :class="form.trustDeed?'img-1':''">
-            type="date"
+              <image-upload v-model="form.trustDeed" :limit="1" />
-            value-format="yyyy-MM-dd"
+            </el-form-item>
-            placeholder="请选择送检时间"
+          </el-col>
-          >
+          <el-col :span="12"  v-if="false">
-          </el-date-picker>
+            <el-form-item label="样品照片" prop="specimenPhoto" :class="form.specimenPhoto?'img-1':''">
-        </el-form-item>
+              <image-upload v-model="form.specimenPhoto" :limit="1" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="24">
+            <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-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="附件" prop="attachmentFiles" class="mg-b-8">
+              <FileUpload :limit="10" v-model="form.attachmentFiles" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+
       </el-form>
-      <div slot="footer" class="dialog-footer">
+      <div slot="footer" class="dialog-footer" style="text-align: center;">
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
 
     <!-- 材料取样复试等级结果 -->
-    <el-dialog
+    <el-dialog :title="title" v-if="resultopen" :visible.sync="resultopen" width="680px" append-to-body
-      :title="title"
+      :close-on-click-modal="false" :close-on-press-escape="false">
-      v-if="resultopen"
+      <el-form ref="resultform" :model="resultform" :rules="resultrules" label-width="100px">
-      :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
+          <el-input v-model="resultform.projectName" placeholder="请输入项目名称" :disabled="true" />
-            v-model="resultform.projectName"
-            placeholder="请输入项目名称"
-            :disabled="true"
-          />
         </el-form-item>
         <el-form-item label="单位名称">
-          <el-input
+          <el-input v-model="resultform.deptName" placeholder="请输入单位名称" :disabled="true" />
-            v-model="resultform.deptName"
-            placeholder="请输入单位名称"
-            :disabled="true"
-          />
         </el-form-item>
         <el-form-item label="送检类型">
-          <el-select
+          <el-select v-model="resultform.checkType" placeholder="请选择送检类型" style="width: 100%" :disabled="true">
-            v-model="resultform.checkType"
+            <el-option v-for="dict in dict.type.check_detection_check_type" :key="dict.value" :label="dict.label"
-            placeholder="请选择送检类型"
+              :value="dict.value"></el-option>
-            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
+          <el-input v-model="resultform.materialName" placeholder="请输入材料名称" :disabled="true" />
-            v-model="resultform.materialName"
-            placeholder="请输入材料名称"
-            :disabled="true"
-          />
         </el-form-item>
         <el-form-item label="实验室名称">
-          <el-input
+          <el-input v-model="resultform.laboratoryName" placeholder="请输入实验室名称" :disabled="true" />
-            v-model="resultform.laboratoryName"
-            placeholder="请输入实验室名称"
-            :disabled="true"
-          />
         </el-form-item>
         <el-form-item label="送检时间">
-          <el-input
+          <el-input v-model="resultform.checkTime" placeholder="请输入实送检时间" :disabled="true" />
-            v-model="resultform.checkTime"
-            placeholder="请输入实送检时间"
-            :disabled="true"
-          />
         </el-form-item>
         <el-form-item label="检测结果" prop="detectionResult" v-if="false">
-          <el-radio
+          <el-radio v-model="resultform.detectionResult" v-for="dict in dict.type.project_checking_result"
-            v-model="resultform.detectionResult"
+            :label="dict.value" :key="dict.value" border size="small">{{ dict.label }}</el-radio>
-            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
+          <FileUpload v-model="resultform.detectionFile" :limit="2" @input="fileInput"
-            v-model="resultform.detectionFile"
+            :fileType="['pdf', 'png', 'jpg', 'jpeg']" />
-            :limit="2"
-            @input="fileInput"
-            :fileType="['pdf', 'png', 'jpg', 'jpeg']"
-          />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -540,8 +355,8 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
-    <indexDrawer ref="indexDrawer"/>
+    <indexDrawer ref="indexDrawer" />
-    <approveCheckDetectionDrawer ref="approveCheckDetectionDrawer" :closeCallBack="getList"/>
+    <approveCheckDetectionDrawer ref="approveCheckDetectionDrawer" :closeCallBack="getList" />
   </div>
 </template>
 
@@ -564,7 +379,7 @@ export default {
     indexDrawer,
     approveCheckDetectionDrawer,
   },
-  dicts: ["sys_yes_no","project_check_status", "project_checking_result", "check_detection_check_type"],
+  dicts: ["sys_yes_no", "project_check_status", "project_checking_result", "check_detection_check_type"],
   data() {
     return {
       // 遮罩层
@@ -607,7 +422,7 @@ export default {
         checkState: null,
         detectionResult: null,
         activeName: "jxz",
-        approveStatus:null,
+        approveStatus: null,
       },
       // 表单参数
       form: {},
@@ -635,6 +450,12 @@ export default {
         qualifiedFlag: [
           { required: true, message: "请选择是否提供合格证", trigger: "blur" },
         ],
+        trustDeed:[
+          {required:true,message:'请上传委托单',trigger:"blur"}
+        ],
+        specimenPhoto:[
+          {required:true,message:'请上传样品照片',trigger:"blur"}
+        ],
         witnessUser: [
           { required: true, message: "请选择监理单位监理专员", trigger: "blur" },
         ],
@@ -656,7 +477,7 @@ export default {
       },
     };
   },
-  created() {
+  created() {    
     this.getList();
   },
   methods: {
@@ -681,7 +502,10 @@ export default {
       }
       this.queryCount(this.queryParams);
       listCheckDetection(this.queryParams).then((response) => {
-        this.checkDetectionList = response.rows;
+        this.checkDetectionList = (response.rows||[]).map(d=>{
+          d.attachmentFiles=this.$tryToJson(d.attachment,[]);
+          return d;
+        });
         this.total = response.total;
         this.loading = false;
       });
@@ -758,7 +582,14 @@ export default {
       this.reset();
       const id = row.id || this.ids;
       getCheckDetection(id).then((response) => {
-        this.form = response.data;
+        let obj= response.data;
+        obj.attachmentFiles=this.$tryToJson(obj.attachment||'[]',[]).map(d=>{
+          return {
+            name:d,
+            url:d
+          }
+        });
+        this.form =obj;
         this.open = true;
         this.title = "修改材料取样复试";
       });
@@ -785,6 +616,7 @@ export default {
     submitForm() {
       this.$refs["form"].validate((valid) => {
         if (valid) {
+          this.form.attachment=this.form.attachmentFiles?JSON.stringify(this.form.attachmentFiles.map(d=>d.url)):"[]";
           if (this.form.id != null) {
             updateCheckDetection(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");
@@ -828,7 +660,7 @@ export default {
           this.getList();
           this.$modal.msgSuccess("删除成功");
         })
-        .catch(() => {});
+        .catch(() => { });
     },
     /** 导出按钮操作 */
     handleExport() {
@@ -859,15 +691,59 @@ export default {
     },
     /** 审批日志 */
     handleAuditinfo(row) {
-      row.title="材料取样复试";
+      row.title = "材料取样复试";
-      row.logType="1";
+      row.logType = "1";
       this.$refs.indexDrawer.show(row);
     },
     /** 处理审批 */
-    handleAudit(row){
+    handleAudit(row) {
-      row.typeName="材料封样";
+      row.typeName = "材料封样";
       this.$refs.approveCheckDetectionDrawer.show(row);
     }
   },
 };
-</script>
+</script>
+<style lang="scss">
+.prj-checking-detection-dlg{
+  .el-dialog__body{
+    padding:0px 10px;
+    .el-form-item{
+      margin-bottom: 16px;
+      &.mg-b-8{
+        margin-bottom: 8px;
+      }
+      &.img-1{
+        .el-upload--picture-card{
+          display: none;
+        }
+        .el-upload__tip{
+          display: none;
+        }
+      }
+      .upload-file {
+        .upload-file-uploader{
+          display: flex;
+          align-items: center;
+          margin-bottom: 0px;
+          line-height: 30px;
+          .el-upload__tip{
+            margin-left: 8px;
+          }
+        }
+      }
+      .el-form-item__error{
+        z-index: 9;
+        margin-top:-4px;
+      }
+      .upload-file-list {
+        max-height: 120px;
+        overflow-y: auto;
+        padding-right:30px;
+        .el-upload-list__item{
+          margin-bottom: 0px !important;
+        }
+      }
+    }
+  }
+}
+</style>

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

@@ -206,7 +206,7 @@
         </el-row>
         <el-row>
         <el-col :span="24">
-          <el-form-item label="附件" prop="trainFile" class="mg-b-8">
+          <el-form-item label="附件" prop="files" class="mg-b-8">
             <FileUpload :limit="10" v-model="form.files" />
           </el-form-item>
         </el-col>
@@ -572,6 +572,17 @@ export default {
         z-index: 9;
         margin-top:-4px;
       }
+      .upload-file {
+        .upload-file-uploader{
+          display: flex;
+          align-items: center;
+          margin-bottom: 0px;
+          line-height: 30px;
+          .el-upload__tip{
+            margin-left: 8px;
+          }
+        }
+      }
       .upload-file-list {
         max-height: 120px;
         overflow-y: auto;

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

@@ -17,9 +17,9 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="图片描述" prop="desc">
+      <el-form-item label="图片描述" prop="standardDesc">
         <el-input
-          v-model="queryParams.desc"
+          v-model="queryParams.standardDesc"
           placeholder="请输入图片描述"
           clearable
           @keyup.enter.native="handleQuery"

ruoyi-ui/src/views/project/projectStandard/projectStandardDlg.vue

@@ -8,24 +8,22 @@
                 {{ dept.deptName }}
             </el-form-item>
             <el-form-item label="类型:" prop="standardType"  style="margin-bottom: 16px;">
-                <el-select v-model="form.standardType" required clearable placeholder="请选择" @change="clearForm">
+                <treeselect v-model="form.standardType" :options="treeOpts" :show-count="true"  placeholder="请选择类型" @select="doTypeSelect" />
-                    <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
-                    </el-option>
-                </el-select>
             </el-form-item>
+           
             <div v-if="form.standardType" class="div-tip">
-                <div v-if="form.standardType == 1">
+                <div v-if="(''+form.standardType).substring(0,1) == '1'">
                     现场管理标准化是指在施工现场中，通过科学的管理方法和规范化的操作流程，严格控制现场人员的行为，保证施工现场的安全和有序进行。具体来说，现场管理标准化包括制定现场管理制度、落实安全生产责任制、开展安全教育培训、建立安全监控系统等。
                 </div>
-                <div v-if="form.standardType == 2">
+                <div v-if="(''+form.standardType).substring(0,1) == '2'">
                     作业标准化是指在施工现场中，通过规范作业流程和操作规程，保证施工过程中的安全和质量。具体来说，作业标准化包括制定作业指导书、明确作业流程、规范操作规程、建立作业记录等。</div>
-                <div v-if="form.standardType == 3">
+                <div v-if="(''+form.standardType).substring(0,1) == '3'">
                     安全技术标准化是指在施工现场中，通过科学的安全技术手段和规范化的操作方法，保证施工现场的安全。具体来说，安全技术标准化包括制定安全技术规范、落实安全技术措施、开展安全技术培训、建立安全技术档案等。</div>
-                <div v-if="form.standardType == 4">
+                <div v-if="(''+form.standardType).substring(0,1) == '4'">
                     设备管理标准化是指在施工现场中，通过规范设备的使用和维护，保证设备的正常运行和安全使用。具体来说，设备管理标准化包括制定设备使用规范、落实设备维护责任制、开展设备维护培训、建立设备维护记录等。</div>
-                <div v-if="form.standardType == 5">
+                <div v-if="(''+form.standardType).substring(0,1) == '5'">
                     文明施工标准化是指在施工现场中，通过规范施工行为和文明施工，保证施工现场的整洁、有序和安全。具体来说，文明施工标准化包括制定文明施工规范、落实文明施工责任制、开展文明施工培训、建立文明施工记录等。</div>
-                <div v-if="form.standardType == 6">
+                <div v-if="(''+form.standardType).substring(0,1) == '6'">
                     环境保护标准化是指在施工现场中，通过科学的环保措施和规范化的操作方法，保护环境和自然资源。具体来说，环境保护标准化包括制定环境保护规范、落实环境保护责任制、开展环境保护培训、建立环境保护记录等。</div>
             </div>
             <el-form-item label="图片描述" prop="desc" style="margin-bottom: 16px;">
@@ -45,9 +43,11 @@
 
 <script>
 import {addProjectStandard} from '@/api/project/projectStandard.js'
+import Treeselect from "@riophae/vue-treeselect";
+import standardTypes from './standardType'
 export default {
     name: 'RuoyiUiProjectStandardDlg',
-
+    components: { Treeselect },
     data() {
         return {
             open: false,
@@ -71,12 +71,20 @@ export default {
                 { label: '设备管理标准化', value: 4 },
                 { label: '文明施工标准化', value: 5 },
                 { label: '环境保护标准化', value: 6 },
-            ]
+            ],
+            treeOpts:standardTypes
         };
     },
 
 
     methods: {
+        doTypeSelect(a,b,c){
+          if(a.children && a.children.length>0){
+            setTimeout(()=>{
+                this.form.standardType=null;
+            },400);
+          }
+        },
         clearForm(){
             this.$refs.form.clearValidate();
         },

ruoyi-ui/src/views/project/projectStandard/projectStandardDrawer.vue

@@ -13,10 +13,9 @@
                     <div>
                         <el-button type="primary" @click="doAdd">增加</el-button>
                         <el-button style="margin-right:12px;"   type="danger" :disabled="multiple"  @click="handleDelete">删除</el-button>
-                        <el-select v-model="standType" clearable placeholder="请选择">
+                        <div style="display: inline-block;width:200px;position: relative;top: 14px;">
-                            <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
+                        <treeselect v-model="standType" :options="options" :show-count="true"  placeholder="请选择类型" />                        
-                            </el-option>
+                        </div>
-                        </el-select>
                         <el-button type="success" style="margin-left:12px;" @click="doQuery">搜索</el-button>
                     </div>
                     <div class="div-data">
@@ -69,9 +68,11 @@
 <script>
 import { listProjectStandard, updateProjectStandard,delProjectStandard } from '@/api/project/projectStandard.js'
 import standardDlg from './projectStandardDlg.vue'
+import standardTypes from './standardType'
+import Treeselect from "@riophae/vue-treeselect";
 export default {
     components: {
-        standardDlg
+        standardDlg,Treeselect
     },
     data() {
         return {
@@ -88,7 +89,7 @@ export default {
             total: 0,
             activeName: "",
             depts: [],
-            standType: '',
+            standType: null,
             projectStandardList: [],
             queryParams: {
                 pageNum: 1,
@@ -101,19 +102,25 @@ export default {
                 standardType: null,
                 isDel: null,
             },
-            options: [
+            treeOpts:[],
-                { label: '现场管理标准化', value: 1 },
+            options: standardTypes
-                { label: '作业标准化', value: 2 },
-                { label: '安全技术标准化', value: 3 },
-                { label: '设备管理标准化', value: 4 },
-                { label: '文明施工标准化', value: 5 },
-                { label: '环境保护标准化', value: 6 },
-            ]
         };
     },
 
     mounted() {
-
+        standardTypes.forEach(it=>{
+            this.treeOpts.push(it);
+            if(it.children){
+                it.children.forEach(it2=>{
+                    this.treeOpts.push(it2);
+                    if(it2.children){
+                        it2.children.forEach(it3=>{
+                            this.treeOpts.push(it3);
+                        })
+                    }
+                })
+            }
+        });
     },
 
     methods: {
@@ -165,7 +172,7 @@ export default {
         },
         getType(row) {
             let t = row.standardType || 1;
-            let tmps = this.options.filter(d => d.value == t);
+            let tmps = this.treeOpts.filter(d => d.id == t);
             return tmps.length > 0 ? tmps[0].label : '';
         },
         handleSelectionChange(selection) {
@@ -252,6 +259,19 @@ export default {
             .row-desc {
                 cursor: pointer;
             }
+           
         }
     }
-}</style>
+}</style>
+<style lang="scss">
+.project-standar-drawer {
+    .el-tab-pane{
+        min-height: 800px;
+    }
+.vue-treeselect__menu-container{
+    .vue-treeselect__menu{
+               max-height: 600px !important;
+            }
+}
+}
+</style>

ruoyi-ui/src/views/project/projectStandard/standardType.js

@@ -0,0 +1,407 @@
+export default [
+  {
+    id: 1,
+    label: "现场管理标准化",
+    children: [
+      { label: "安全宣传牌", id: 101 },
+      { label: "施工现场总平面布置图", id: 102 },
+      { label: "工程概况", id: 103 },
+      { label: "管理监督牌", id: 104 },
+      { label: "安全生产纪律牌", id: 105 },
+      { label: "安全生产技术牌", id: 106 },
+      { label: "十项安全措施牌", id: 107 },
+      { label: "消防保卫牌", id: 108 },
+      { label: "卫生须知牌", id: 109 },
+      { label: "管理人员岗位职责", id: 110 },
+      { label: "消防管理公示牌", id: 111 },
+      { label: "重大危险作业公示牌", id: 112 },
+    ],
+  },
+  {
+    id: 2,
+    label: "作业标准化",
+    children: [
+      {
+        label: "地基与基础",
+        id: 201,
+        children: [
+          { label: "基坑支护", id: 20101 },
+          { label: "地下水控制", id: 20102 },
+          { label: "地基施工", id: 20103 },
+          { label: "桩基础", id: 20104 },
+          { label: "土方开挖", id: 20105 },
+          { label: "地基钎探", id: 20106 },
+          { label: "混凝土基础", id: 20107 },
+          { label: "地下防水", id: 20108 },
+          { label: "土方回填", id: 20109 },
+        ],
+      },
+      {
+        label: "人防工程",
+        id: 202,
+        children: [
+          { label: "门框墙、临空墙配筋构造", id: 20201 },
+          { label: "人防梁、板钢筋", id: 20202 },
+          { label: "人防工程模板", id: 20203 },
+          { label: "人防工程混凝土", id: 20204 },
+          { label: "人防门框安装", id: 20205 },
+        ],
+      },
+
+      {
+        label: "主体结构",
+        id: 203,
+        children: [
+          { label: "钢筋工程", id: 20301 },
+          { label: "模板工程", id: 20302 },
+          { label: "混凝土", id: 20303 },
+          { label: "装配式建筑", id: 20304 },
+          { label: "钢结构", id: 20305 },
+          { label: "砌体结构 ", id: 20306 },
+        ],
+      },
+
+      {
+        label: "建筑装饰装修",
+        id: 204,
+        children: [
+          { label: "建筑地面", id: 20401 },
+          { label: "抹灰", id: 20402 },
+          { label: "室内涂饰", id: 20403 },
+          { label: " 门窗", id: 20404 },
+          { label: "吊顶", id: 20405 },
+          { label: "饰面板", id: 20406 },
+          { label: "变形缝", id: 20407 },
+        ],
+      },
+
+      {
+        label: "屋面",
+        id: 205,
+        children: [
+          { label: "屋面施工整体策划", id: 20501 },
+          { label: "檐口防水构造", id: 20502 },
+          { label: "屋面女儿墙", id: 20503 },
+          { label: "女儿墙泛水", id: 20504 },
+          { label: "泛水", id: 20505 },
+          { label: "檐沟与天沟", id: 20506 },
+          { label: "屋面排气孔", id: 20507 },
+          { label: "出屋面管道", id: 20508 },
+          { label: "水落口", id: 20509 },
+          { label: "设施基座", id: 20510 },
+          { label: " 过水孔", id: 20511 },
+          { label: "屋面变形缝", id: 20512 },
+          { label: "屋面爬梯、出入口", id: 20513 },
+          { label: "屋面分格缝", id: 20514 },
+          { label: "屋面造型", id: 20515 },
+          { label: "排烟风道", id: 20516 },
+          { label: "屋面栈桥", id: 20517 },
+          { label: "屋面水簸箕", id: 20518 },
+        ],
+      },
+
+      {
+        label: "建筑给排水及供暖",
+        id: 206,
+        children: [
+          { label: "管道支吊架", id: 20601 },
+          { label: "管道连接", id: 20602 },
+          { label: "管道套管及封堵", id: 20603 },
+          { label: "散热器安装", id: 20604 },
+          { label: "水泵房、换热站", id: 20605 },
+          { label: "消火栓及消防水泵接合器", id: 20606 },
+          { label: " 报警阀安装", id: 20607 },
+          { label: "设备减震", id: 20608 },
+          { label: "消防水泵房", id: 20609 },
+        ],
+      },
+
+      {
+        label: "通风与空调",
+        id: 207,
+        children: [
+          { label: "防腐和绝热", id: 20701 },
+          { label: "屋面冷却塔、排烟风机安装", id: 20702 },
+          { label: "太阳能、多联机、空气源及风冷热泵", id: 20703 },
+          { label: "空气处理机组、风机安装", id: 20704 },
+          { label: "风管制作安装", id: 20705 },
+          { label: "空调主机房", id: 20706 },
+        ],
+      },
+
+      {
+        label: "建筑电气",
+        id: 208,
+        children: [
+          { label: "变配电室安装", id: 20801 },
+          { label: " 配电柜安装", id: 20802 },
+          { label: "控制柜安装", id: 20803 },
+          { label: "配电箱安装", id: 20804 },
+          { label: "箱柜内配线", id: 20805 },
+          { label: "箱柜内电器接地", id: 20806 },
+          { label: "低压封闭母线安装", id: 20807 },
+          { label: "桥架敷设", id: 20808 },
+          { label: "电缆敷设", id: 20809 },
+          { label: "支架安装、三通安装", id: 20810 },
+          { label: "补偿装置", id: 20811 },
+          { label: " 电线、电缆中间头、端头制作与安装", id: 20812 },
+          { label: "开关面板安装", id: 20813 },
+          { label: "灯具安装", id: 20814 },
+          { label: "防雷引下线及接闪器安装", id: 20815 },
+          { label: "等电位联结", id: 20816 },
+          { label: "屋面金属物防雷接地", id: 20817 },
+          { label: "水管井、金属门等电位安装", id: 20818 },
+          { label: "灯具防护及接地", id: 20819 },
+          { label: "接地测试点", id: 20820 },
+        ],
+      },
+      {
+        label: "智能建筑",
+        id: 209,
+        children: [
+          { label: "机房设备安装", id: 20901 },
+          {
+            label: "信息插座安装、卫星通讯系统、公共广播系统、火灾自动报警系统 ",
+            id: 20902,
+          },
+          { label: "数字会议系统、综合布线系统", id: 20903 },
+          { label: "建筑监控系统", id: 20904 },
+          { label: "信息化应用系统", id: 20905 },
+        ],
+      },
+
+      {
+        label: "建筑节能",
+        id: 210,
+        children: [
+          { label: "外墙保模一体化", id: 21001 },
+          { label: "外墙保温板粘贴", id: 21002 },
+          { label: "防火隔离带", id: 21003 },
+        ],
+      },
+      {
+        label: "电梯",
+        id: 211,
+        children: [
+          { label: "电梯机房", id: 21101 },
+          { label: "机房吊钩", id: 21102 },
+          { label: "曳引机安装 ", id: 21103 },
+          { label: "曳引机、导轨接地", id: 21104 },
+          { label: "电梯缓冲器", id: 21105 },
+          { label: "层门、地坎安装", id: 21106 },
+        ],
+      },
+      {
+        label: "室外工程",
+        id: 212,
+        children: [
+          { label: "散水", id: 21201 },
+          { label: "室外台阶、坡道", id: 21202 },
+          { label: "车库出入口", id: 21203 },
+          { label: "室外雨、污水井和阀门井", id: 21204 },
+          { label: "室外金属构件", id: 21205 },
+          { label: "室外地面", id: 21206 },
+          { label: "内部道路", id: 21207 },
+          { label: "细部要求", id: 21208 },
+          { label: "室外绿化 ", id: 21209 },
+          { label: "室外环境", id: 21210 },
+        ],
+      },
+    ],
+  },
+  {
+    id: 3,
+    label: "安全技术标准化",
+    children: [
+      {
+        label: "基坑工程",
+        id: 301,
+        children: [
+          { label: "土方开挖", id: 30101 },
+          { label: "基坑支护", id: 30102 },
+          { label: "基坑安全防护", id: 30103 },
+          { label: "基坑防排水", id: 30104 },
+          { label: "基坑周边堆载控制", id: 30105 },
+          { label: "基坑监测", id: 30106 },
+          { label: "基坑通道", id: 30107 },
+          { label: "厚大钢筋底板钢筋支架", id: 30108 },
+        ],
+      },
+      {
+        label: "脚手架工程",
+        id: 302,
+        children: [
+          { label: "落地式钢管脚手架", id: 30201 },
+          { label: "悬挑脚手架", id: 30202 },
+          { label: "附着式升降脚手架", id: 30203 },
+          { label: "吊篮", id: 30204 },
+        ],
+      },
+
+      {
+        label: "模板支撑体系",
+        id: 303,
+        children: [
+          { label: "承插型盘扣支撑", id: 30301 },
+          { label: "扣件式钢管支撑", id: 30302 },
+          { label: "铝模支撑", id: 30303 },
+          { label: "特殊部位支撑", id: 30304 },
+        ],
+      },
+
+      {
+        label: "道路工程",
+        id: 304,
+        children: [
+          { label: "施工围挡", id: 30401 },
+          { label: "交通警示及疏导", id: 30402 },
+          { label: "出入口", id: 30403 },
+          { label: "场内便道", id: 30404 },
+          { label: "人行便桥", id: 30405 },
+          { label: "路面施工", id: 30406 },
+        ],
+      },
+
+      {
+        label: "管道工程",
+        id: 305,
+        children: [
+          { label: "沟槽土方开挖、支护", id: 30501 },
+          { label: "开槽施工管道主体结构", id: 30502 },
+          { label: "开槽施工管道回填", id: 30503 },
+          { label: "顶管基坑开挖、支护", id: 30504 },
+          { label: "顶管施工梯道与平台", id: 30505 },
+          { label: "基坑监测与管线保护", id: 30506 },
+          { label: "顶管施工一般规定", id: 30507 },
+          { label: "顶管设备安装", id: 30508 },
+          { label: "顶管顶进", id: 30509 },
+        ],
+      },
+
+      {
+        label: "桥梁工程",
+        id: 306,
+        children: [
+          { label: "基础防护施工 ", id: 30601 },
+          { label: "下部结构防护施工", id: 30602 },
+          { label: "上部结构防护施工", id: 30603 },
+        ],
+      },
+
+      {
+        label: "特种作业",
+        id: 307,
+        children: [
+          { label: "受限空间", id: 30701 },
+          { label: "动火作业", id: 30702 },
+          { label: "临时用电", id: 30703 },
+          { label: "高处作业", id: 30704 },
+          { label: "吊装作业", id: 30705 },
+          { label: "破土作业", id: 30706 },
+          { label: "断路作业", id: 30707 },
+        ],
+      },
+      {
+        label: "临时用电",
+        id: 308,
+        children: [
+          { label: "外电防护", id: 30801 },
+          { label: "总配电室", id: 30802 },
+          { label: "电缆敷设", id: 30803 },
+          { label: " 配电箱及开关箱", id: 30804 },
+          { label: "电箱及围栏", id: 30805 },
+          { label: "重复接地和防雷", id: 30806 },
+          { label: "照明", id: 30807 },
+          { label: "电焊机", id: 30808 },
+        ],
+      },
+      {
+        label: "临时用水及消防",
+        id: 309,
+        children: [
+          { label: "消防总平面布置图", id: 30901 },
+          { label: "消防管线布置", id: 30902 },
+          { label: "楼层内消防水系统", id: 30903 },
+          { label: "消防泵房", id: 30904 },
+          { label: "灭火器", id: 30905 },
+          { label: "微型消防站", id: 30906 },
+        ],
+      },
+      {
+        label: "安全防护",
+        id: 310,
+        children: [
+          { label: "个体防护", id: 31001 },
+          { label: "安全标志", id: 31002 },
+          { label: "洞口防护", id: 31003 },
+          { label: "临边防护", id: 31004 },
+          { label: "安全防护棚", id: 31005 },
+          { label: "操作平台", id: 31006 },
+          { label: "钢结构施工安全防护", id: 31007 },
+          { label: "易燃易爆危险品库房", id: 31008 },
+          { label: "气瓶使用", id: 31009 },
+        ],
+      },
+      { label: "防汛管控", id: 311 },
+      { label: "高温管控", id: 312 },
+      { label: "严寒管控", id: 313 },
+      { label: "应急物资", id: 314 },
+    ],
+  },
+  {
+    id: 4,
+    label: "文明施工标准化",
+    children: [
+      {
+        label: "大门视觉系统",
+        id: 401,
+        children: [
+          { label: "项目大门", id: 40101 },
+          { label: "围墙及围挡", id: 40102 },
+          { label: "门禁", id: 40103 },
+        ],
+      },
+      {
+        label: "场地及临建布置",
+        id: 402,
+        children: [
+          { label: "办公生活区", id: 40201 },
+          { label: "施工区", id: 40202 },
+        ],
+      },
+      { label: "材料堆放", id: 403 },
+      { label: "人车分流", id: 404 },
+    ],
+  },
+  {
+    id: 5,
+    label: "设备管理标准化",
+    children: [
+      { label: "塔式起重机", id: 501 },
+      { label: "施工升降机", id: 502 },
+      { label: "汽车吊", id: 503 },
+      { label: "履带吊", id: 504 },
+      { label: "高空作业车", id: 505 },
+      { label: "叉车", id: 506 },
+      { label: " 桩机", id: 507 },
+      { label: "中小型机械", id: 508 },
+      { label: "其他机械", id: 509 },
+    ],
+  },
+  {
+    id: 6,
+    label: "环境保护标准化",
+    children: [
+      { label: "硬化保洁", id: 601 },
+      { label: "车辆冲洗", id: 602 },
+      { label: "覆盖苫盖", id: 603 },
+      { label: "湿法作业", id: 604 },
+      { label: "主体施工", id: 605 },
+      { label: "土方回填、管网及绿化施工", id: 606 },
+      { label: "现场喷淋设施", id: 607 },
+      { label: "扬尘监测仪", id: 608 },
+      { label: "环境保护监督牌", id: 609 },
+      { label: "应急响应公示牌", id: 610 },
+    ],
+  },
+];

yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectCheckDetectionController.java

@@ -4,6 +4,7 @@ package com.yanzhu.jh.bigscreen.web.controller;
 import com.ruoyi.common.constant.Constants;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.core.redis.RedisCache;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.sign.Md5Utils;
@@ -58,22 +59,15 @@ public class ProjectCheckDetectionController extends BaseController {
      * @return
      */
     @PostMapping("/getList")
-    public AjaxResult getList(@RequestBody SurProjectCheckDetection where){
+    public TableDataInfo getList(@RequestBody SurProjectCheckDetection where){
         Long deptId= where.getDeptId();
         if(deptId==null || deptId<=0){
             if (SecurityUtils.isUserB()) {
                 where.setPrjIds(getProjectIds());
             }
         }
-        String key="bgscreen_checkDetection_getList_"+where.getCheckType()+"_"+where.getDeptId()+"_"+where.getProjectId()+where
+        startPage();
-                .getProType()+ Md5Utils.hash(where.getPrjIds());
-        Object obj=redisCache.getCacheObject(key);
-        if(obj!=null){
-            return AjaxResult.success(obj);
-        }
-
         List<SurProjectCheckDetection> list=checkDetectionService.getList(where);
-        redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES);
+        return getDataTable(list);
-        return AjaxResult.success(list);
     }
 }

yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectCheckDetection.java

@@ -93,6 +93,34 @@ public class SurProjectCheckDetection extends BaseEntity
     @Excel(name = "数据状态")
     private String isDel;
 
+    private String attachment;
+    private String trustDeed;
+
+    public String getAttachment() {
+        return attachment;
+    }
+
+    public void setAttachment(String attachment) {
+        this.attachment = attachment;
+    }
+
+    public String getTrustDeed() {
+        return trustDeed;
+    }
+
+    public void setTrustDeed(String trustDeed) {
+        this.trustDeed = trustDeed;
+    }
+
+    public String getSpecimenPhoto() {
+        return specimenPhoto;
+    }
+
+    public void setSpecimenPhoto(String specimenPhoto) {
+        this.specimenPhoto = specimenPhoto;
+    }
+
+    private String specimenPhoto;
     /** 审核状态 */
     @Excel(name = "审核状态")
     private String approveStatus;

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

@@ -35,10 +35,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="createByName" column="create_by_name"/>
         <result property="updateByName" column="update_by_name"/>
         <result property="approveStatus" column="approve_status"/>
+        <result property="attachment" column="attachment"/>
+        <result property="trustDeed" column="trust_deed"/>
+        <result property="specimenPhoto" column="specimen_photo"/>
     </resultMap>
 
     <sql id="selectSurProjectCheckDetectionVo">
-        SELECT spcd.id, spcd.project_id, sp.projectName, spcd.dept_id, sd.dept_name, spcd.check_type, sdd.dict_label AS check_type_name, spcd.material_name, spcd.use_position, spcd.sample_num, spcd.qualified_flag, spcd.represen_num, spcd.sample_user, spcd.sample_user_name, spcd.witness_user, spcd.witness_user_name, spcd.laboratory_name, spcd.check_time, spcd.check_state, spcd.detection_result, spcd.detection_file, spcd.create_by, spcd.create_time, spcd.is_del, spcd.update_by, spcd.update_time, spcd.remark, spcd.approve_status, u1.nick_name create_by_name,u2.nick_name update_by_name
+        SELECT spcd.id, spcd.project_id, sp.projectName, spcd.dept_id, sd.dept_name, spcd.check_type, sdd.dict_label AS check_type_name, spcd.material_name, spcd.use_position, spcd.sample_num, spcd.qualified_flag, spcd.represen_num, spcd.sample_user, spcd.sample_user_name, spcd.witness_user, spcd.witness_user_name, spcd.laboratory_name, spcd.check_time, spcd.check_state, spcd.detection_result, spcd.detection_file, spcd.create_by, spcd.create_time, spcd.is_del, spcd.update_by, spcd.update_time, spcd.remark, spcd.approve_status, u1.nick_name create_by_name
+             ,u2.nick_name update_by_name,spcd.attachment,spcd.trust_deed,spcd.specimen_photo
         FROM sur_project_check_detection spcd
          LEFT JOIN sur_project sp ON spcd.project_id = sp.id
          LEFT JOIN sys_dept sd ON sd.dept_id = spcd.dept_id
@@ -159,6 +163,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">update_time,</if>
             <if test="remark != null">remark,</if>
             <if test="approveStatus != null">approve_status,</if>
+            <if test="attachment != null">attachment,</if>
+            <if test="trustDeed != null">trust_deed,</if>
+            <if test="specimenPhoto != null">specimen_photo,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="projectId != null">#{projectId},</if>
@@ -185,6 +192,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">#{updateTime},</if>
             <if test="remark != null">#{remark},</if>
             <if test="approveStatus != null">#{approveStatus},</if>
+            <if test="attachment != null">#{attachment},</if>
+            <if test="trustDeed != null">#{trustDeed},</if>
+            <if test="specimenPhoto != null">#{specimenPhoto},</if>
         </trim>
     </insert>
 
@@ -215,6 +225,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="remark != null">remark = #{remark},</if>
             <if test="approveStatus != null">approve_status = #{approveStatus},</if>
+            <if test="attachment != null">attachment = #{attachment},</if>
+            <if test="trustDeed != null">trust_deed = #{trustDeed},</if>
+            <if test="specimenPhoto != null">specimen_photo = #{specimenPhoto},</if>
         </trim>
         where id = #{id}
     </update>

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

@@ -36,9 +36,9 @@
             <if test="proType != null  and proType != ''"> and sp.projectType = #{proType}</if>
             <if test="activeName != null and activeName != ''"> and sp.progressVisible = 0</if>
             <if test="deptId != null "> and sps.dept_id = #{deptId}</if>
-            <if test="standardDesc != null  and standardDesc != ''"> and sps.standard_desc = #{standardDesc}</if>
+            <if test="standardDesc != null  and standardDesc != ''"> and sps.standard_desc like concat('%', #{standardDesc}, '%')</if>
             <if test="ord != null "> and sps.ord = #{ord}</if>
-            <if test="standardType != null  and standardType != ''"> and sps.standard_type = #{standardType}</if>
+            <if test="standardType != null  and standardType != ''"> and sps.standard_type  like concat('', #{standardType}, '%')</if>
             <if test="isDel != null "> and sps.is_del = #{isDel}</if>
         </where>
         order by sps.standard_type,sps.ord