From 74b3ae5d72f64f761070313ddd83dfdd952aa7cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=9C=E7=8E=89=E7=90=A6?=
 <7507756+jiang_yuqi@user.noreply.gitee.com>
Date: Mon, 25 Mar 2024 23:39:03 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../task/myProcess/detail/detailDrawer.vue    |   1 +
 .../task/myProcess/editTaskDrawer.vue         |   2 +-
 .../task/myProcess/initTaskDrawer.vue         |   2 +-
 .../approveCheckDetectionDrawer.vue           | 432 ++++++++---------
 .../approveCheckingDrawer.vue                 | 419 ++++++++--------
 .../approveMaterialSealDrawer.vue             | 429 +++++++++--------
 .../projectAuditinfo/approveMeasureDrawer.vue | 451 ++++++++++--------
 .../views/project/projectMeasure/index.vue    |  39 +-
 .../projectMeasure/projectMeasureDrawer.vue   |  44 +-
 ruoyi-ui/src/views/work/workFile/index.vue    |   2 +-
 .../controller/ProjectFilesController.java    |  17 +-
 11 files changed, 952 insertions(+), 886 deletions(-)

diff --git a/ruoyi-ui/src/views/flowable/task/myProcess/detail/detailDrawer.vue b/ruoyi-ui/src/views/flowable/task/myProcess/detail/detailDrawer.vue
index d1cac4f9..1bb1aa55 100644
--- a/ruoyi-ui/src/views/flowable/task/myProcess/detail/detailDrawer.vue
+++ b/ruoyi-ui/src/views/flowable/task/myProcess/detail/detailDrawer.vue
@@ -163,6 +163,7 @@ export default {
       //label样式
       labelStyle: { width: "180px" },
       initData: {},
+      fileTypes:['pdf','png','jpg','jpeg'],
     };
   },
   computed: {},
diff --git a/ruoyi-ui/src/views/flowable/task/myProcess/editTaskDrawer.vue b/ruoyi-ui/src/views/flowable/task/myProcess/editTaskDrawer.vue
index 753981a9..9ac15124 100644
--- a/ruoyi-ui/src/views/flowable/task/myProcess/editTaskDrawer.vue
+++ b/ruoyi-ui/src/views/flowable/task/myProcess/editTaskDrawer.vue
@@ -53,7 +53,7 @@
         <el-form-item label="审批内容" prop="files">
           <FileUpload
             @input="fileInput"
-            :limit="9"
+            :limit="18"
             v-model="form.files"
             :fileType="['pdf', 'png', 'jpg', 'jpeg']"
           />
diff --git a/ruoyi-ui/src/views/flowable/task/myProcess/initTaskDrawer.vue b/ruoyi-ui/src/views/flowable/task/myProcess/initTaskDrawer.vue
index e06ce846..78bd1cbf 100644
--- a/ruoyi-ui/src/views/flowable/task/myProcess/initTaskDrawer.vue
+++ b/ruoyi-ui/src/views/flowable/task/myProcess/initTaskDrawer.vue
@@ -53,7 +53,7 @@
         <el-form-item label="审批内容" prop="files">
           <FileUpload
             @input="fileInput"
-            :limit="9"
+            :limit="18"
             :fileType="['pdf', 'png', 'jpg', 'jpeg']"
           />
         </el-form-item>
diff --git a/ruoyi-ui/src/views/project/projectAuditinfo/approveCheckDetectionDrawer.vue b/ruoyi-ui/src/views/project/projectAuditinfo/approveCheckDetectionDrawer.vue
index 5140db1c..8045710b 100644
--- a/ruoyi-ui/src/views/project/projectAuditinfo/approveCheckDetectionDrawer.vue
+++ b/ruoyi-ui/src/views/project/projectAuditinfo/approveCheckDetectionDrawer.vue
@@ -1,227 +1,231 @@
 <template>
-    <div class="projectect-attendance-drawer">
-      <el-drawer
-        v-if="isOpen"
-        :visible.sync="isOpen"
-        ref="drawer"
-        direction="rtl"
-        @close="closeCallBack"
-        size="50%"
+  <div class="projectect-attendance-drawer">
+    <el-drawer
+      v-if="isOpen"
+      :visible.sync="isOpen"
+      ref="drawer"
+      direction="rtl"
+      @close="closeCallBack"
+      size="50%"
+    >
+      <template slot="title">
+        <div>{{ title + " 【处理审批】" }}</div>
+      </template>
+      <el-form
+        ref="form"
+        v-loading="loading"
+        :model="form"
+        :rules="rules"
+        label-width="80px"
+        style="padding-right: 20px; padding-left: 20px"
       >
-        <template slot="title">
-          <div>{{ title + " 【处理审批】" }}</div>
-        </template>
-        <el-form ref="form" v-loading="loading" :model="form" :rules="rules" label-width="80px" style="padding-right: 20px;padding-left: 20px;">
-            <el-form-item label="项目名称">
-                {{dataInfo.projectName}}
+        <el-form-item label="项目名称">
+          {{ dataInfo.projectName }}
+        </el-form-item>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="送检类型">
+              <dict-tag
+                :options="dict.type.check_detection_check_type"
+                :value="dataInfo.checkType"
+              />
             </el-form-item>
-            <el-row>
-                <el-col :span="12">
-                <el-form-item label="送检类型">
-                    <dict-tag
-                        :options="dict.type.check_detection_check_type"
-                        :value="dataInfo.checkType"
-                    />
-                </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                    <el-form-item label="合格证">
-                        <el-tag v-if="dataInfo.qualifiedFlag == 'Y'" type="success">已提供</el-tag>
-                        <el-tag v-if="dataInfo.qualifiedFlag == 'N'" type="danger">未提供</el-tag>
-                    </el-form-item>
-                </el-col>
-            </el-row>
-            <el-row>
-                <el-col :span="12">
-                    <el-form-item label="材料名称">
-                        {{ dataInfo.materialName }}
-                    </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                    <el-form-item label="取样数量">
-                        {{ dataInfo.sampleNum }}
-                    </el-form-item>
-                </el-col>
-            </el-row>
-            <el-row>
-                <el-col :span="12">
-                    <el-form-item label="使用部位">
-                        {{ dataInfo.usePosition }}
-                    </el-form-item>
-                    <el-form-item label="监理专员">
-                        {{ dataInfo.witnessUserName }}
-                        <el-tag type="info" size="mini">{{ dataInfo.witnessUser }}</el-tag>
-                    </el-form-item>
-                </el-col>
-            </el-row>
-            <el-row>
-                <el-col :span="12">
-                    <el-form-item label="提交用户">
-                        {{ dataInfo.createBy }}
-                    </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                    <el-form-item label="提交单位">
-                        {{ dataInfo.deptName }}
-                    </el-form-item>
-                </el-col>
-            </el-row>
-            <el-form-item label="实验室名">
-                <span>{{ dataInfo.laboratoryName }}</span>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="合格证">
+              <el-tag v-if="dataInfo.qualifiedFlag == 'Y'" type="success">已提供</el-tag>
+              <el-tag v-if="dataInfo.qualifiedFlag == 'N'" type="danger">未提供</el-tag>
             </el-form-item>
-            <el-form-item label="送检时间">
-                <span>{{ parseTime(dataInfo.checkTime, "{y}-{m}-{d} {h}:{i}") }}</span>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="材料名称">
+              {{ dataInfo.materialName }}
             </el-form-item>
-            <el-form-item label="检测报告" v-if="dataInfo.checkState == '2'">
-                <el-button
-                    size="mini"
-                    type="text"
-                    icon="el-icon-paperclip"
-                    @click="handleDownload()"
-                    >下载检测报告</el-button
-                >
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="取样数量">
+              {{ dataInfo.sampleNum }}
             </el-form-item>
-            <el-form-item label="送检结果" prop="detectionResult">
-                <el-radio
-                v-model="form.detectionResult"
-                v-for="dict in dict.type.project_checking_result"
-                :label="dict.value"
-                :key="dict.value"
-                border
-                size="small"
-                >{{ dict.label }}</el-radio
-                >
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="使用部位">
+              {{ dataInfo.usePosition }}
             </el-form-item>
-            <el-form-item label="审批意见" prop="comment">
-                <el-input
-                  type="textarea"
-                  :rows="3"
-                  placeholder="请输入审批意见（200字内）"
-                  v-model="form.comment"
-                />
+            <el-form-item label="监理专员">
+              {{ dataInfo.witnessUserName }}
+              <el-tag type="info" size="mini">{{ dataInfo.witnessUser }}</el-tag>
             </el-form-item>
-            <div style="text-align: center">
-                <el-button type="primary" @click="submitForm">确 定</el-button>
-                <el-button @click="cancel">取 消</el-button>
-            </div>
-        </el-form>
-      </el-drawer>
-      <el-image-viewer
-        v-if="showViewer"
-        :on-close="closeViewer"
-        :url-list="previewList"
-        style="z-index: 2050"
-      />
-    </div>
-  </template>
-  
-  <script>
-  import {
-  getCheckDetection,
-  updateCheckDetection,
-} from "@/api/project/checkDetection";
-  import ElImageViewer from "element-ui/packages/image/src/image-viewer";
-  
-  export default {
-    name: "approveCheckDetectionDrawer",
-    components: {
-      ElImageViewer,
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="提交用户">
+              {{ dataInfo.createBy }}
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="提交单位">
+              {{ dataInfo.deptName }}
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-form-item label="实验室名">
+          <span>{{ dataInfo.laboratoryName }}</span>
+        </el-form-item>
+        <el-form-item label="送检时间">
+          <span>{{ parseTime(dataInfo.checkTime, "{y}-{m}-{d} {h}:{i}") }}</span>
+        </el-form-item>
+        <el-form-item label="检测报告" v-if="dataInfo.checkState == '2'">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-paperclip"
+            @click="handleDownload()"
+            >下载检测报告</el-button
+          >
+        </el-form-item>
+        <el-form-item label="送检结果" prop="detectionResult">
+          <el-radio
+            v-model="form.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="comment">
+          <el-input
+            type="textarea"
+            :rows="3"
+            placeholder="请输入审批意见（200字内）"
+            v-model="form.comment"
+          />
+        </el-form-item>
+        <div style="text-align: center;margin-bottom:20px;">
+          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </el-form>
+    </el-drawer>
+    <el-image-viewer
+      v-if="showViewer"
+      :on-close="closeViewer"
+      :url-list="previewList"
+      style="z-index: 2050"
+    />
+  </div>
+</template>
+
+<script>
+import { getCheckDetection, updateCheckDetection } from "@/api/project/checkDetection";
+import ElImageViewer from "element-ui/packages/image/src/image-viewer";
+
+export default {
+  name: "approveCheckDetectionDrawer",
+  components: {
+    ElImageViewer,
+  },
+  props: {
+    closeCallBack: {
+      type: Function,
     },
-    props: {
-        closeCallBack: {
-            type: Function,
-        },
+  },
+  dicts: ["project_checking_result", "check_detection_check_type"],
+  data() {
+    return {
+      showViewer: false,
+      open: false,
+      isOpen: false,
+      dataInfo: {},
+      title: "",
+      form: {},
+      rules: {
+        detectionResult: [{ required: true, message: "请选择送检结果", trigger: "blur" }],
+        comment: [
+          { required: true, message: "请输入审批意见", trigger: "blur" },
+          { max: 200, message: "审批意见最多200字符", trigger: "blur" },
+        ],
+      },
+      // 遮罩层
+      loading: true,
+      previewList: [],
+    };
+  },
+  computed: {},
+  mounted() {},
+  methods: {
+    getImageUrl(url) {
+      return process.env.VUE_APP_BASE_API + url + ".min.jpg";
     },
-    dicts: ["project_checking_result", "check_detection_check_type"],
-    data() {
-      return {
-        showViewer: false,
-        open: false,
-        isOpen: false,
-        dataInfo: {},
-        title: "",
-        form: {},
-        rules: {
-          detectionResult: [{ required: true, message: "请选择送检结果", trigger: "blur" }],  
-          comment: [
-            { required: true, message: "请输入审批意见", trigger: "blur" },
-            { max: 200, message: "审批意见最多200字符", trigger: "blur" },
-          ],
-        },
-        // 遮罩层
-        loading: true,
-        previewList: [],
-      };
+    onPreview(urls) {
+      this.previewList = [];
+      urls.split(",").forEach((item) => {
+        this.previewList.push(process.env.VUE_APP_BASE_API + item);
+      });
+      this.showViewer = true;
     },
-    computed: {},
-    mounted() {},
-    methods: {
-      getImageUrl(url) {
-        return process.env.VUE_APP_BASE_API + url + ".min.jpg";
-      },
-      onPreview(urls) {
-        this.previewList = [];
-        urls.split(",").forEach((item) => {
-          this.previewList.push(process.env.VUE_APP_BASE_API + item);
-        });
-        this.showViewer = true;
-      },
-      closeViewer() {
-        this.showViewer = false;
-      },
-      show(options) {
-        this.title = options.typeName;
-        this.isOpen = true;
-        this.form={};
-        this.form.id=options.id;
-        getCheckDetection(options.id)
-          .then((res) => {
-            this.dataInfo = res.data;
-            this.loading = false;
-          });
-      },
-      // 取消按钮
-      cancel() {
-        this.open = false;
-      },
-      /** 提交按钮 */
-      submitForm() {
-        this.$refs["form"].validate((valid) => {
-          if (valid) {
-            // 结果状态同步到审批状态
-            let msg = "合格";
-            if(this.form.detectionResult=="1"){
-                this.form.approveStatus="4";
-            }else{
-                msg = "不合格";
-                this.form.approveStatus="3";
-            }
-            this.$confirm('是否确认审批'+msg+'?', '提示', {
-                confirmButtonText: '确定',
-                cancelButtonText: '取消',
-                type: 'warning'
-            }).then(() => {
-                this.loading=true;
-                updateCheckDetection(this.form).then(res => {
-                    this.$modal.msgSuccess("审批成功");
-                    this.loading = false;
-                    //关闭并刷新列表
-                    this.$refs.drawer.closeDrawer();
-                });
-            }).catch(() => {
-                console.log("取消操作");         
-            });
+    closeViewer() {
+      this.showViewer = false;
+    },
+    show(options) {
+      this.title = options.typeName;
+      this.isOpen = true;
+      this.form = {};
+      this.form.id = options.id;
+      getCheckDetection(options.id).then((res) => {
+        this.dataInfo = res.data;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.isOpen = false;
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          // 结果状态同步到审批状态
+          let msg = "合格";
+          if (this.form.detectionResult == "1") {
+            this.form.approveStatus = "4";
+          } else {
+            msg = "不合格";
+            this.form.approveStatus = "3";
           }
-        });
-      },
-      /** 下载附件 */
-      handleDownload() {
-        let files = this.dataInfo.measureFiles.split(",");
-        files.forEach((item) => {
-            this.$download.resource(item);
-        });
-      },
+          this.$confirm("是否确认审批" + msg + "?", "提示", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning",
+          })
+            .then(() => {
+              this.loading = true;
+              updateCheckDetection(this.form).then((res) => {
+                this.$modal.msgSuccess("审批成功");
+                this.loading = false;
+                //关闭并刷新列表
+                this.$refs.drawer.closeDrawer();
+              });
+            })
+            .catch(() => {
+              console.log("取消操作");
+            });
+        }
+      });
     },
-  };
-  </script>
-  
\ No newline at end of file
+    /** 下载附件 */
+    handleDownload() {
+      let files = this.dataInfo.measureFiles.split(",");
+      files.forEach((item) => {
+        this.$download.resource(item);
+      });
+    },
+  },
+};
+</script>
diff --git a/ruoyi-ui/src/views/project/projectAuditinfo/approveCheckingDrawer.vue b/ruoyi-ui/src/views/project/projectAuditinfo/approveCheckingDrawer.vue
index f7fa0e29..e3476bbb 100644
--- a/ruoyi-ui/src/views/project/projectAuditinfo/approveCheckingDrawer.vue
+++ b/ruoyi-ui/src/views/project/projectAuditinfo/approveCheckingDrawer.vue
@@ -1,218 +1,227 @@
 <template>
-    <div class="projectect-attendance-drawer">
-      <el-drawer
-        v-if="isOpen"
-        :visible.sync="isOpen"
-        ref="drawer"
-        direction="rtl"
-        @close="closeCallBack"
-        size="50%"
+  <div class="projectect-attendance-drawer">
+    <el-drawer
+      v-if="isOpen"
+      :visible.sync="isOpen"
+      ref="drawer"
+      direction="rtl"
+      @close="closeCallBack"
+      size="50%"
+    >
+      <template slot="title">
+        <div>{{ title + " 【处理审批】" }}</div>
+      </template>
+      <el-form
+        ref="form"
+        v-loading="loading"
+        :model="form"
+        :rules="rules"
+        label-width="80px"
+        style="padding-right: 20px; padding-left: 20px"
       >
-        <template slot="title">
-          <div>{{ title + " 【处理审批】" }}</div>
-        </template>
-        <el-form ref="form" v-loading="loading" :model="form" :rules="rules" label-width="80px" style="padding-right: 20px;padding-left: 20px;">
-            <el-form-item label="项目名称">
-                {{dataInfo.projectName}}
+        <el-form-item label="项目名称">
+          {{ dataInfo.projectName }}
+        </el-form-item>
+        <el-form-item label="验收图片">
+          <el-image
+            ref="preview"
+            v-for="(img, idx) in dataInfo.imageUrls.split(',')"
+            :key="idx"
+            :src="getImageUrl(img)"
+            style="width: 120px; height: 120px; margin-right: 15px"
+            @click="onPreview(img)"
+          ></el-image>
+        </el-form-item>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="验收类型">
+              <dict-tag
+                :options="dict.type.project_checking_data_type_lvl1"
+                :value="dataInfo.dataTypeLvl1"
+              />
             </el-form-item>
-            <el-form-item label="验收图片">
-                <el-image
-                    ref="preview"
-                    v-for="(img,idx) in dataInfo.imageUrls.split(',')" :key="idx"
-                    :src="getImageUrl(img)"
-                    style="width: 120px; height: 120px; margin-right: 15px"
-                    @click="onPreview(img)"
-                  ></el-image>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="类型分类">
+              <dict-tag
+                :options="dict.type.project_checking_data_type_lvl2"
+                :value="dataInfo.dataTypeLvl2"
+              />
             </el-form-item>
-            <el-row>
-                <el-col :span="12">
-                    <el-form-item label="验收类型">
-                      <dict-tag
-                        :options="dict.type.project_checking_data_type_lvl1"
-                        :value="dataInfo.dataTypeLvl1"
-                      />
-                    </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                    <el-form-item label="类型分类">
-                      <dict-tag
-                        :options="dict.type.project_checking_data_type_lvl2"
-                        :value="dataInfo.dataTypeLvl2"
-                      />
-                    </el-form-item>
-                </el-col>
-            </el-row>
-            <el-row>
-                <el-col :span="12">
-                    <el-form-item label="质量专员">
-                        {{ dataInfo.qualityUserName }}
-                        <el-tag type="info" size="mini">{{ dataInfo.qualityUser }}</el-tag>
-                    </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                    <el-form-item label="监理专员">
-                        {{ dataInfo.superviseUserName }}
-                        <el-tag type="info" size="mini">{{ dataInfo.superviseUser }}</el-tag>
-                    </el-form-item>
-                </el-col>
-            </el-row>
-            <el-form-item label="工序部位">
-                <span>{{ dataInfo.checkWorkingPosition }}</span>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="质量专员">
+              {{ dataInfo.qualityUserName }}
+              <el-tag type="info" size="mini">{{ dataInfo.qualityUser }}</el-tag>
             </el-form-item>
-            <el-form-item label="验收描述">
-                <span>{{ dataInfo.intro }}</span>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="监理专员">
+              {{ dataInfo.superviseUserName }}
+              <el-tag type="info" size="mini">{{ dataInfo.superviseUser }}</el-tag>
             </el-form-item>
-            <el-row>
-                <el-col :span="12">
-                    <el-form-item label="提交用户">
-                        {{ dataInfo.createBy }}
-                    </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                    <el-form-item label="提交单位">
-                        {{ dataInfo.deptName }}
-                    </el-form-item>
-                </el-col>
-            </el-row>
-            <el-form-item label="验收时间">
-                <span>{{ parseTime(dataInfo.checkingDate, "{y}-{m}-{d} {h}:{i}") }}</span>
+          </el-col>
+        </el-row>
+        <el-form-item label="工序部位">
+          <span>{{ dataInfo.checkWorkingPosition }}</span>
+        </el-form-item>
+        <el-form-item label="验收描述">
+          <span>{{ dataInfo.intro }}</span>
+        </el-form-item>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="提交用户">
+              {{ dataInfo.createBy }}
             </el-form-item>
-            <el-form-item label="验收结果" prop="checkResult">
-                <el-radio
-                v-model="form.checkResult"
-                v-for="dict in dict.type.project_checking_result"
-                :label="dict.value"
-                :key="dict.value"
-                border
-                size="small"
-                >{{ dict.label }}</el-radio
-                >
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="提交单位">
+              {{ dataInfo.deptName }}
             </el-form-item>
-            <el-form-item label="审批意见" prop="comment">
-                <el-input
-                  type="textarea"
-                  :rows="3"
-                  placeholder="请输入审批意见（200字内）"
-                  v-model="form.comment"
-                />
-            </el-form-item>
-            <div style="text-align: center">
-                <el-button type="primary" @click="submitForm">确 定</el-button>
-                <el-button @click="cancel">取 消</el-button>
-            </div>
-        </el-form>
-      </el-drawer>
-      <el-image-viewer
-        v-if="showViewer"
-        :on-close="closeViewer"
-        :url-list="previewList"
-        style="z-index: 2050"
-      />
-    </div>
-  </template>
-  
-  <script>
-  import {
-  getProjectChecking,
-  updateProjectChecking,
-} from "@/api/project/projectChecking";
-  import ElImageViewer from "element-ui/packages/image/src/image-viewer";
-  
-  export default {
-    name: "approveCheckingDrawer",
-    components: {
-      ElImageViewer,
+          </el-col>
+        </el-row>
+        <el-form-item label="验收时间">
+          <span>{{ parseTime(dataInfo.checkingDate, "{y}-{m}-{d} {h}:{i}") }}</span>
+        </el-form-item>
+        <el-form-item label="验收结果" prop="checkResult">
+          <el-radio
+            v-model="form.checkResult"
+            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="comment">
+          <el-input
+            type="textarea"
+            :rows="3"
+            placeholder="请输入审批意见（200字内）"
+            v-model="form.comment"
+          />
+        </el-form-item>
+        <div style="text-align: center;margin-bottom:20px;">
+          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </el-form>
+    </el-drawer>
+    <el-image-viewer
+      v-if="showViewer"
+      :on-close="closeViewer"
+      :url-list="previewList"
+      style="z-index: 2050"
+    />
+  </div>
+</template>
+
+<script>
+import { getProjectChecking, updateProjectChecking } from "@/api/project/projectChecking";
+import ElImageViewer from "element-ui/packages/image/src/image-viewer";
+
+export default {
+  name: "approveCheckingDrawer",
+  components: {
+    ElImageViewer,
+  },
+  props: {
+    closeCallBack: {
+      type: Function,
     },
-    props: {
-        closeCallBack: {
-            type: Function,
-        },
+  },
+  dicts: [
+    "project_checking_result",
+    "project_checking_data_type_lvl1",
+    "project_checking_data_type_lvl2",
+  ],
+  data() {
+    return {
+      showViewer: false,
+      open: false,
+      isOpen: false,
+      dataInfo: {
+        imageUrls: "",
+      },
+      title: "",
+      form: {},
+      rules: {
+        checkResult: [{ required: true, message: "请选择测量结果", trigger: "blur" }],
+        comment: [
+          { required: true, message: "请输入审批意见", trigger: "blur" },
+          { max: 200, message: "审批意见最多200字符", trigger: "blur" },
+        ],
+      },
+      // 遮罩层
+      loading: true,
+      previewList: [],
+    };
+  },
+  computed: {},
+  mounted() {},
+  methods: {
+    getImageUrl(url) {
+      return process.env.VUE_APP_BASE_API + url + ".min.jpg";
     },
-    dicts: ["project_checking_result","project_checking_data_type_lvl1","project_checking_data_type_lvl2"],
-    data() {
-      return {
-        showViewer: false,
-        open: false,
-        isOpen: false,
-        dataInfo: {
-            imageUrls:""
-        },
-        title: "",
-        form: {},
-        rules: {
-          checkResult: [{ required: true, message: "请选择测量结果", trigger: "blur" }],  
-          comment: [
-            { required: true, message: "请输入审批意见", trigger: "blur" },
-            { max: 200, message: "审批意见最多200字符", trigger: "blur" },
-          ],
-        },
-        // 遮罩层
-        loading: true,
-        previewList: [],
-      };
+    onPreview(urls) {
+      this.previewList = [];
+      urls.split(",").forEach((item) => {
+        this.previewList.push(process.env.VUE_APP_BASE_API + item);
+      });
+      this.showViewer = true;
     },
-    computed: {},
-    mounted() {},
-    methods: {
-      getImageUrl(url) {
-        return process.env.VUE_APP_BASE_API + url + ".min.jpg";
-      },
-      onPreview(urls) {
-        this.previewList = [];
-        urls.split(",").forEach((item) => {
-          this.previewList.push(process.env.VUE_APP_BASE_API + item);
-        });
-        this.showViewer = true;
-      },
-      closeViewer() {
-        this.showViewer = false;
-      },
-      show(options) {
-        this.title = options.typeName;
-        this.isOpen = true;
-        this.form={};
-        this.form.id=options.id;
-        getProjectChecking(options.id)
-          .then((res) => {
-            this.dataInfo = res.data;
-            this.loading = false;
-          });
-      },
-      // 取消按钮
-      cancel() {
-        this.open = false;
-      },
-      /** 提交按钮 */
-      submitForm() {
-        this.$refs["form"].validate((valid) => {
-          if (valid) {
-            // 结果状态同步到审批状态
-            let msg = "合格";
-            if(this.form.checkResult=="1"){
-                this.form.approveStatus="4";
-            }else{
-                msg = "不合格";
-                this.form.approveStatus="3";
-            }
-            this.$confirm('是否确认审批'+msg+'?', '提示', {
-                confirmButtonText: '确定',
-                cancelButtonText: '取消',
-                type: 'warning'
-            }).then(() => {
-                this.loading=true;
-                updateProjectChecking(this.form).then(res => {
-                    this.$modal.msgSuccess("审批成功");
-                    this.loading = false;
-                    //关闭并刷新列表
-                    this.$refs.drawer.closeDrawer();
-                });
-            }).catch(() => {
-                console.log("取消操作");         
-            });
+    closeViewer() {
+      this.showViewer = false;
+    },
+    show(options) {
+      this.title = options.typeName;
+      this.isOpen = true;
+      this.form = {};
+      this.form.id = options.id;
+      getProjectChecking(options.id).then((res) => {
+        this.dataInfo = res.data;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.isOpen = false;
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          // 结果状态同步到审批状态
+          let msg = "合格";
+          if (this.form.checkResult == "1") {
+            this.form.approveStatus = "4";
+          } else {
+            msg = "不合格";
+            this.form.approveStatus = "3";
           }
-        });
-      },
+          this.$confirm("是否确认审批" + msg + "?", "提示", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning",
+          })
+            .then(() => {
+              this.loading = true;
+              updateProjectChecking(this.form).then((res) => {
+                this.$modal.msgSuccess("审批成功");
+                this.loading = false;
+                //关闭并刷新列表
+                this.$refs.drawer.closeDrawer();
+              });
+            })
+            .catch(() => {
+              console.log("取消操作");
+            });
+        }
+      });
     },
-  };
-  </script>
-  
\ No newline at end of file
+  },
+};
+</script>
diff --git a/ruoyi-ui/src/views/project/projectAuditinfo/approveMaterialSealDrawer.vue b/ruoyi-ui/src/views/project/projectAuditinfo/approveMaterialSealDrawer.vue
index bcf4ffce..658a0a12 100644
--- a/ruoyi-ui/src/views/project/projectAuditinfo/approveMaterialSealDrawer.vue
+++ b/ruoyi-ui/src/views/project/projectAuditinfo/approveMaterialSealDrawer.vue
@@ -1,223 +1,228 @@
 <template>
-    <div class="projectect-attendance-drawer">
-      <el-drawer
-        v-if="isOpen"
-        :visible.sync="isOpen"
-        ref="drawer"
-        direction="rtl"
-        @close="closeCallBack"
-        size="50%"
+  <div class="projectect-attendance-drawer">
+    <el-drawer
+      v-if="isOpen"
+      :visible.sync="isOpen"
+      ref="drawer"
+      direction="rtl"
+      @close="closeCallBack"
+      size="50%"
+    >
+      <template slot="title">
+        <div>{{ title + " 【处理审批】" }}</div>
+      </template>
+      <el-form
+        ref="form"
+        v-loading="loading"
+        :model="form"
+        :rules="rules"
+        label-width="80px"
+        style="padding-right: 20px; padding-left: 20px"
       >
-        <template slot="title">
-          <div>{{ title + " 【处理审批】" }}</div>
-        </template>
-        <el-form ref="form" v-loading="loading" :model="form" :rules="rules" label-width="80px" style="padding-right: 20px;padding-left: 20px;">
-            <el-form-item label="项目名称">
-                {{dataInfo.projectName}}
+        <el-form-item label="项目名称">
+          {{ dataInfo.projectName }}
+        </el-form-item>
+        <el-form-item label="封样图片">
+          <el-image
+            ref="preview"
+            v-for="(img, idx) in dataInfo.imageUrls.split(',')"
+            :key="idx"
+            :src="getImageUrl(img)"
+            style="width: 120px; height: 120px; margin-right: 15px"
+            @click="onPreview(img)"
+          ></el-image>
+        </el-form-item>
+        <el-form-item label="封样名称">
+          {{ dataInfo.materialName }}
+        </el-form-item>
+        <el-form-item label="使用部位">
+          {{ dataInfo.usePosition }}
+        </el-form-item>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="指定品牌">
+              {{ dataInfo.contractBrand }}
             </el-form-item>
-            <el-form-item label="封样图片">
-                <el-image
-                    ref="preview"
-                    v-for="(img,idx) in dataInfo.imageUrls.split(',')" :key="idx"
-                    :src="getImageUrl(img)"
-                    style="width: 120px; height: 120px; margin-right: 15px"
-                    @click="onPreview(img)"
-                  ></el-image>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="拟用品牌">
+              {{ dataInfo.useBrand }}
             </el-form-item>
-            <el-form-item label="封样名称">
-                {{ dataInfo.materialName }}
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="提交用户">
+              {{ dataInfo.createBy }}
             </el-form-item>
-            <el-form-item label="使用部位">
-                {{ dataInfo.usePosition }}
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="提交单位">
+              {{ dataInfo.deptName }}
             </el-form-item>
-            <el-row>
-                <el-col :span="12">
-                    <el-form-item label="指定品牌">
-                        {{ dataInfo.contractBrand }}
-                    </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                    <el-form-item label="拟用品牌">
-                        {{ dataInfo.useBrand }}
-                    </el-form-item>
-                </el-col>
-            </el-row>
-            <el-row>
-                <el-col :span="12">
-                    <el-form-item label="提交用户">
-                        {{ dataInfo.createBy }}
-                    </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                    <el-form-item label="提交单位">
-                        {{ dataInfo.deptName }}
-                    </el-form-item>
-                </el-col>
-            </el-row>
-            <el-form-item label="封样时间">
-                <span>{{ parseTime(dataInfo.sealDate, "{y}-{m}-{d} {h}:{i}") }}</span>
-            </el-form-item>
-            <el-form-item label="会签单" v-if="dataInfo.signFiles != null">
-                <el-button
-                    size="mini"
-                    type="text"
-                    icon="el-icon-paperclip"
-                    @click="handleDownload(dataInfo.signFiles)"
-                    >下载会签单</el-button
-                >
-            </el-form-item>
-            <el-form-item label="变更单" v-if="dataInfo.alterationFiles != null">
-                <el-button
-                    size="mini"
-                    type="text"
-                    icon="el-icon-paperclip"
-                    @click="handleDownload(dataInfo.alterationFiles)"
-                    >下载变更单</el-button
-                >
-            </el-form-item>
-            <el-form-item label="封样结果" prop="materialResult">
-                <el-radio
-                v-model="form.materialResult"
-                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="comment">
-                <el-input
-                  type="textarea"
-                  :rows="3"
-                  placeholder="请输入审批意见（200字内）"
-                  v-model="form.comment"
-                />
-            </el-form-item>
-            <div style="text-align: center">
-                <el-button type="primary" @click="submitForm">确 定</el-button>
-                <el-button @click="cancel">取 消</el-button>
-            </div>
-        </el-form>
-      </el-drawer>
-      <el-image-viewer
-        v-if="showViewer"
-        :on-close="closeViewer"
-        :url-list="previewList"
-        style="z-index: 2050"
-      />
-    </div>
-  </template>
-  
-  <script>
-  import {
-  getMaterialSeal,
-  updateMaterialSeal,
- } from "@/api/project/materialSeal";
-  import ElImageViewer from "element-ui/packages/image/src/image-viewer";
-  
-  export default {
-    name: "approveMeasureDrawer",
-    components: {
-      ElImageViewer,
+          </el-col>
+        </el-row>
+        <el-form-item label="封样时间">
+          <span>{{ parseTime(dataInfo.sealDate, "{y}-{m}-{d} {h}:{i}") }}</span>
+        </el-form-item>
+        <el-form-item label="会签单" v-if="dataInfo.signFiles != null">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-paperclip"
+            @click="handleDownload(dataInfo.signFiles)"
+            >下载会签单</el-button
+          >
+        </el-form-item>
+        <el-form-item label="变更单" v-if="dataInfo.alterationFiles != null">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-paperclip"
+            @click="handleDownload(dataInfo.alterationFiles)"
+            >下载变更单</el-button
+          >
+        </el-form-item>
+        <el-form-item label="封样结果" prop="materialResult">
+          <el-radio
+            v-model="form.materialResult"
+            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="comment">
+          <el-input
+            type="textarea"
+            :rows="3"
+            placeholder="请输入审批意见（200字内）"
+            v-model="form.comment"
+          />
+        </el-form-item>
+        <div style="text-align: center;margin-bottom:20px;">
+          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </el-form>
+    </el-drawer>
+    <el-image-viewer
+      v-if="showViewer"
+      :on-close="closeViewer"
+      :url-list="previewList"
+      style="z-index: 2050"
+    />
+  </div>
+</template>
+
+<script>
+import { getMaterialSeal, updateMaterialSeal } from "@/api/project/materialSeal";
+import ElImageViewer from "element-ui/packages/image/src/image-viewer";
+
+export default {
+  name: "approveMeasureDrawer",
+  components: {
+    ElImageViewer,
+  },
+  props: {
+    closeCallBack: {
+      type: Function,
     },
-    props: {
-        closeCallBack: {
-            type: Function,
-        },
+  },
+  dicts: ["project_checking_result"],
+  data() {
+    return {
+      showViewer: false,
+      open: false,
+      isOpen: false,
+      dataInfo: {
+        imageUrls: "",
+      },
+      title: "",
+      form: {},
+      rules: {
+        materialResult: [{ required: true, message: "请选择测量结果", trigger: "blur" }],
+        comment: [
+          { required: true, message: "请输入审批意见", trigger: "blur" },
+          { max: 200, message: "审批意见最多200字符", trigger: "blur" },
+        ],
+      },
+      // 遮罩层
+      loading: true,
+      previewList: [],
+    };
+  },
+  computed: {},
+  mounted() {},
+  methods: {
+    getImageUrl(url) {
+      return process.env.VUE_APP_BASE_API + url + ".min.jpg";
     },
-    dicts: ["project_checking_result"],
-    data() {
-      return {
-        showViewer: false,
-        open: false,
-        isOpen: false,
-        dataInfo: {
-            imageUrls:""
-        },
-        title: "",
-        form: {},
-        rules: {
-          materialResult: [{ required: true, message: "请选择测量结果", trigger: "blur" }],  
-          comment: [
-            { required: true, message: "请输入审批意见", trigger: "blur" },
-            { max: 200, message: "审批意见最多200字符", trigger: "blur" },
-          ],
-        },
-        // 遮罩层
-        loading: true,
-        previewList: [],
-      };
+    onPreview(urls) {
+      this.previewList = [];
+      urls.split(",").forEach((item) => {
+        this.previewList.push(process.env.VUE_APP_BASE_API + item);
+      });
+      this.showViewer = true;
     },
-    computed: {},
-    mounted() {},
-    methods: {
-      getImageUrl(url) {
-        return process.env.VUE_APP_BASE_API + url + ".min.jpg";
-      },
-      onPreview(urls) {
-        this.previewList = [];
-        urls.split(",").forEach((item) => {
-          this.previewList.push(process.env.VUE_APP_BASE_API + item);
-        });
-        this.showViewer = true;
-      },
-      closeViewer() {
-        this.showViewer = false;
-      },
-      show(options) {
-        this.title = options.typeName;
-        this.isOpen = true;
-        this.form={};
-        this.form.id=options.id;
-        getMaterialSeal(options.id)
-          .then((res) => {
-            this.dataInfo = res.data;
-            this.loading = false;
-          });
-      },
-      // 取消按钮
-      cancel() {
-        this.open = false;
-      },
-      /** 下载附件 */
-      handleDownload(val) {
-        let files = val.split(",");
-        files.forEach((item) => {
-            this.$download.resource(item);
-        });
-      },
-      /** 提交按钮 */
-      submitForm() {
-        this.$refs["form"].validate((valid) => {
-          if (valid) {
-            // 结果状态同步到审批状态
-            let msg = "合格";
-            if(this.form.materialResult=="1"){
-                this.form.approveStatus="4";
-            }else{
-                msg = "不合格";
-                this.form.approveStatus="3";
-            }
-            this.$confirm('是否确认审批'+msg+'?', '提示', {
-                confirmButtonText: '确定',
-                cancelButtonText: '取消',
-                type: 'warning'
-            }).then(() => {
-                this.loading=true;
-                updateMaterialSeal(this.form).then(res => {
-                    this.$modal.msgSuccess("审批成功");
-                    this.loading = false;
-                    //关闭并刷新列表
-                    this.$refs.drawer.closeDrawer();
-                });
-            }).catch(() => {
-                console.log("取消操作");         
-            });
+    closeViewer() {
+      this.showViewer = false;
+    },
+    show(options) {
+      this.title = options.typeName;
+      this.isOpen = true;
+      this.form = {};
+      this.form.id = options.id;
+      getMaterialSeal(options.id).then((res) => {
+        this.dataInfo = res.data;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.isOpen = false;
+    },
+    /** 下载附件 */
+    handleDownload(val) {
+      let files = val.split(",");
+      files.forEach((item) => {
+        this.$download.resource(item);
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          // 结果状态同步到审批状态
+          let msg = "合格";
+          if (this.form.materialResult == "1") {
+            this.form.approveStatus = "4";
+          } else {
+            msg = "不合格";
+            this.form.approveStatus = "3";
           }
-        });
-      },
+          this.$confirm("是否确认审批" + msg + "?", "提示", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning",
+          })
+            .then(() => {
+              this.loading = true;
+              updateMaterialSeal(this.form).then((res) => {
+                this.$modal.msgSuccess("审批成功");
+                this.loading = false;
+                //关闭并刷新列表
+                this.$refs.drawer.closeDrawer();
+              });
+            })
+            .catch(() => {
+              console.log("取消操作");
+            });
+        }
+      });
     },
-  };
-  </script>
-  
\ No newline at end of file
+  },
+};
+</script>
diff --git a/ruoyi-ui/src/views/project/projectAuditinfo/approveMeasureDrawer.vue b/ruoyi-ui/src/views/project/projectAuditinfo/approveMeasureDrawer.vue
index 69b53c75..e7e7c4eb 100644
--- a/ruoyi-ui/src/views/project/projectAuditinfo/approveMeasureDrawer.vue
+++ b/ruoyi-ui/src/views/project/projectAuditinfo/approveMeasureDrawer.vue
@@ -1,224 +1,251 @@
 <template>
-    <div class="projectect-attendance-drawer">
-      <el-drawer
-        v-if="isOpen"
-        :visible.sync="isOpen"
-        ref="drawer"
-        direction="rtl"
-        @close="closeCallBack"
-        size="50%"
+  <div class="projectect-attendance-drawer">
+    <el-drawer
+      v-if="isOpen"
+      :visible.sync="isOpen"
+      ref="drawer"
+      direction="rtl"
+      @close="closeCallBack"
+      size="50%"
+    >
+      <template slot="title">
+        <div>{{ title + " 【处理审批】" }}</div>
+      </template>
+      <el-form
+        ref="form"
+        v-loading="loading"
+        :model="form"
+        :rules="rules"
+        label-width="80px"
+        style="padding-right: 20px; padding-left: 20px"
       >
-        <template slot="title">
-          <div>{{ title + " 【处理审批】" }}</div>
-        </template>
-        <el-form ref="form" v-loading="loading" :model="form" :rules="rules" label-width="80px" style="padding-right: 20px;padding-left: 20px;">
-            <el-form-item label="项目名称">
-                {{dataInfo.projectName}}
+        <el-form-item label="项目名称">
+          {{ dataInfo.projectName }}
+        </el-form-item>
+        <el-form-item label="测量图片">
+          <el-image
+            ref="preview"
+            v-for="(img, idx) in dataInfo.imageUrls.split(',')"
+            :key="idx"
+            :src="getImageUrl(img)"
+            style="width: 120px; height: 120px; margin-right: 15px"
+            @click="onPreview(img)"
+          ></el-image>
+        </el-form-item>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="测量类型">
+              <dict-tag
+                :options="dict.type.project_measure_type"
+                :value="dataInfo.measureType"
+              />
             </el-form-item>
-            <el-form-item label="测量图片">
-                <el-image
-                    ref="preview"
-                    v-for="(img,idx) in dataInfo.imageUrls.split(',')" :key="idx"
-                    :src="getImageUrl(img)"
-                    style="width: 120px; height: 120px; margin-right: 15px"
-                    @click="onPreview(img)"
-                  ></el-image>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="测量内容">
+              <dict-tag
+                :options="dict.type.project_measure_info_type"
+                :value="dataInfo.measureInfo"
+              />
             </el-form-item>
-            <el-row>
-                <el-col :span="12">
-                <el-form-item label="测量类型">
-                    <dict-tag
-                        :options="dict.type.project_measure_type"
-                        :value="dataInfo.measureType"
-                        />
-                </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                <el-form-item label="测量内容">
-                    <dict-tag
-                        :options="dict.type.project_measure_info_type"
-                        :value="dataInfo.measureInfo"
-                        />
-                </el-form-item>
-                </el-col>
-            </el-row>
-            <el-row>
-                <el-col :span="12">
-                    <el-form-item label="测量部位">
-                        {{ dataInfo.measurePosition }}
-                    </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                    <el-form-item label="测量点位">
-                        {{ dataInfo.measurePointPosition }}
-                    </el-form-item>
-                </el-col>
-            </el-row>
-            <el-row>
-                <el-col :span="12">
-                    <el-form-item label="质量专员">
-                        {{ dataInfo.qualityUserName }}
-                        <el-tag type="info" size="mini">{{ dataInfo.qualityUser }}</el-tag>
-                    </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                    <el-form-item label="监理专员">
-                        {{ dataInfo.superviseUserName }}
-                        <el-tag type="info" size="mini">{{ dataInfo.superviseUser }}</el-tag>
-                    </el-form-item>
-                </el-col>
-            </el-row>
-            <el-row>
-                <el-col :span="12">
-                    <el-form-item label="提交用户">
-                        {{ dataInfo.createBy }}
-                    </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                    <el-form-item label="提交单位">
-                        {{ dataInfo.deptName }}
-                    </el-form-item>
-                </el-col>
-            </el-row>
-            <el-form-item label="测量时间">
-                <span>{{ parseTime(dataInfo.measureTime, "{y}-{m}-{d} {h}:{i}") }}</span>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="测量部位">
+              {{ dataInfo.measurePosition }}
             </el-form-item>
-            <el-form-item label="测量结果" prop="measureResult">
-                <el-radio
-                v-model="form.measureResult"
-                v-for="dict in dict.type.project_checking_result"
-                :label="dict.value"
-                :key="dict.value"
-                border
-                size="small"
-                >{{ dict.label }}</el-radio
-                >
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="测量点位">
+              {{ dataInfo.measurePointPosition }}
             </el-form-item>
-            <el-form-item label="审批意见" prop="comment">
-                <el-input
-                  type="textarea"
-                  :rows="3"
-                  placeholder="请输入审批意见（200字内）"
-                  v-model="form.comment"
-                />
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="质量专员">
+              {{ dataInfo.qualityUserName }}
+              <el-tag type="info" size="mini">{{ dataInfo.qualityUser }}</el-tag>
             </el-form-item>
-            <div style="text-align: center">
-                <el-button type="primary" @click="submitForm">确 定</el-button>
-                <el-button @click="cancel">取 消</el-button>
-            </div>
-        </el-form>
-      </el-drawer>
-      <el-image-viewer
-        v-if="showViewer"
-        :on-close="closeViewer"
-        :url-list="previewList"
-        style="z-index: 2050"
-      />
-    </div>
-  </template>
-  
-  <script>
-  import {
-    getProjectMeasure,
-    updateProjectMeasure,
-  } from "@/api/project/projectMeasure";
-  import ElImageViewer from "element-ui/packages/image/src/image-viewer";
-  
-  export default {
-    name: "approveMeasureDrawer",
-    components: {
-      ElImageViewer,
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="监理专员">
+              {{ dataInfo.superviseUserName }}
+              <el-tag type="info" size="mini">{{ dataInfo.superviseUser }}</el-tag>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="提交用户">
+              {{ dataInfo.createBy }}
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="提交单位">
+              {{ dataInfo.deptName }}
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-form-item label="测量时间">
+          <span>{{ parseTime(dataInfo.measureTime, "{y}-{m}-{d}") }}</span>
+        </el-form-item>
+        <el-form-item label="测量附件">
+          <div v-for="(file, index) in dataInfo.measureFiles.split(',')" :key="index">
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-paperclip"
+              @click="handledownload(file)"
+              >{{ file.substring(file.lastIndexOf("/") + 1) }}</el-button
+            >
+          </div>
+        </el-form-item>
+        <el-form-item label="测量结果" prop="measureResult">
+          <el-radio
+            v-model="form.measureResult"
+            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="comment">
+          <el-input
+            type="textarea"
+            :rows="3"
+            placeholder="请输入审批意见（200字内）"
+            v-model="form.comment"
+          />
+        </el-form-item>
+        <div style="text-align: center;margin-bottom:20px;">
+          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </el-form>
+    </el-drawer>
+    <el-image-viewer
+      v-if="showViewer"
+      :on-close="closeViewer"
+      :url-list="previewList"
+      style="z-index: 2050"
+    />
+  </div>
+</template>
+
+<script>
+import { getProjectMeasure, updateProjectMeasure } from "@/api/project/projectMeasure";
+import ElImageViewer from "element-ui/packages/image/src/image-viewer";
+
+export default {
+  name: "approveMeasureDrawer",
+  components: {
+    ElImageViewer,
+  },
+  props: {
+    closeCallBack: {
+      type: Function,
     },
-    props: {
-        closeCallBack: {
-            type: Function,
-        },
+  },
+  dicts: ["project_measure_type", "project_checking_result", "project_measure_info_type"],
+  data() {
+    return {
+      showViewer: false,
+      open: false,
+      isOpen: false,
+      dataInfo: {
+        imageUrls: "",
+      },
+      title: "",
+      form: {},
+      rules: {
+        measureResult: [{ required: true, message: "请选择测量结果", trigger: "blur" }],
+        comment: [
+          { required: true, message: "请输入审批意见", trigger: "blur" },
+          { max: 200, message: "审批意见最多200字符", trigger: "blur" },
+        ],
+      },
+      // 遮罩层
+      loading: true,
+      previewList: [],
+      fileTypes: ["pdf", "png", "jpg", "jpeg"],
+    };
+  },
+  computed: {},
+  mounted() {},
+  methods: {
+    getImageUrl(url) {
+      return process.env.VUE_APP_BASE_API + url + ".min.jpg";
     },
-    dicts: ["project_measure_type", "project_checking_result", "project_measure_info_type"],
-    data() {
-      return {
-        showViewer: false,
-        open: false,
-        isOpen: false,
-        dataInfo: {
-            imageUrls:""
-        },
-        title: "",
-        form: {},
-        rules: {
-          measureResult: [{ required: true, message: "请选择测量结果", trigger: "blur" }],  
-          comment: [
-            { required: true, message: "请输入审批意见", trigger: "blur" },
-            { max: 200, message: "审批意见最多200字符", trigger: "blur" },
-          ],
-        },
-        // 遮罩层
-        loading: true,
-        previewList: [],
-      };
+    onPreview(urls) {
+      this.previewList = [];
+      urls.split(",").forEach((item) => {
+        this.previewList.push(process.env.VUE_APP_BASE_API + item);
+      });
+      this.showViewer = true;
     },
-    computed: {},
-    mounted() {},
-    methods: {
-      getImageUrl(url) {
-        return process.env.VUE_APP_BASE_API + url + ".min.jpg";
-      },
-      onPreview(urls) {
-        this.previewList = [];
-        urls.split(",").forEach((item) => {
-          this.previewList.push(process.env.VUE_APP_BASE_API + item);
-        });
-        this.showViewer = true;
-      },
-      closeViewer() {
-        this.showViewer = false;
-      },
-      show(options) {
-        this.title = options.typeName;
-        this.isOpen = true;
-        this.form={};
-        this.form.id=options.id;
-        getProjectMeasure(options.id)
-          .then((res) => {
-            this.dataInfo = res.data;
-            this.loading = false;
-          });
-      },
-      // 取消按钮
-      cancel() {
-        this.open = false;
-      },
-      /** 提交按钮 */
-      submitForm() {
-        this.$refs["form"].validate((valid) => {
-          if (valid) {
-            // 结果状态同步到审批状态
-            let msg = "合格";
-            if(this.form.measureResult=="1"){
-                this.form.approveStatus="4";
-            }else{
-                msg = "不合格";
-                this.form.approveStatus="3";
-            }
-            this.$confirm('是否确认审批'+msg+'?', '提示', {
-                confirmButtonText: '确定',
-                cancelButtonText: '取消',
-                type: 'warning'
-            }).then(() => {
-                this.loading=true;
-                updateProjectMeasure(this.form).then(res => {
-                    this.$modal.msgSuccess("审批成功");
-                    this.loading = false;
-                    //关闭并刷新列表
-                    this.$refs.drawer.closeDrawer();
-                });
-            }).catch(() => {
-                console.log("取消操作");         
-            });
+    closeViewer() {
+      this.showViewer = false;
+    },
+    show(options) {
+      this.title = options.typeName;
+      this.isOpen = true;
+      this.form = {};
+      this.form.id = options.id;
+      getProjectMeasure(options.id).then((res) => {
+        this.dataInfo = res.data;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.isOpen = false;
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          // 结果状态同步到审批状态
+          let msg = "合格";
+          if (this.form.measureResult == "1") {
+            this.form.approveStatus = "4";
+          } else {
+            msg = "不合格";
+            this.form.approveStatus = "3";
           }
-        });
-      },
+          this.$confirm("是否确认审批" + msg + "?", "提示", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning",
+          })
+            .then(() => {
+              this.loading = true;
+              updateProjectMeasure(this.form).then((res) => {
+                this.$modal.msgSuccess("审批成功");
+                this.loading = false;
+                //关闭并刷新列表
+                this.$refs.drawer.closeDrawer();
+              });
+            })
+            .catch(() => {
+              console.log("取消操作");
+            });
+        }
+      });
     },
-  };
-  </script>
-  
\ No newline at end of file
+    handledownload(url) {
+      let fileType = url.split(".");
+      if (
+        this.fileTypes.indexOf(fileType[fileType.length - 1].toLocaleLowerCase()) > -1
+      ) {
+        window.open(process.env.VUE_APP_BASE_API + url);
+      } else {
+        this.$download.resource(url);
+      }
+    },
+  },
+};
+</script>
diff --git a/ruoyi-ui/src/views/project/projectMeasure/index.vue b/ruoyi-ui/src/views/project/projectMeasure/index.vue
index 1cc214d4..c244e8ff 100644
--- a/ruoyi-ui/src/views/project/projectMeasure/index.vue
+++ b/ruoyi-ui/src/views/project/projectMeasure/index.vue
@@ -233,7 +233,7 @@
       />
       <el-table-column label="测量时间" align="center" prop="measureTime" width="160">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.measureTime, "{y}-{m}-{d} {h}:{i}") }}</span>
+          <span>{{ parseTime(scope.row.measureTime, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
       <el-table-column label="审批状态" align="center" prop="approveStatus" width="120">
@@ -285,7 +285,6 @@
           <dict-tag :options="dict.type.sys_common_isdel" :value="scope.row.isDel" />
         </template>
       </el-table-column>
-      <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column
         label="操作"
         align="center"
@@ -375,6 +374,7 @@
             v-model="form.measureType"
             placeholder="请选择测量类型"
             style="width: 100%"
+            @change="selectMeasureType"
           >
             <el-option
               v-for="dict in dict.type.project_measure_type"
@@ -392,6 +392,7 @@
           >
             <el-option
               v-for="dict in dict.type.project_measure_info_type"
+              v-show="showInfoType(dict)"
               :key="dict.value"
               :label="dict.label"
               :value="dict.value"
@@ -454,27 +455,15 @@
           <el-date-picker
             clearable
             v-model="form.measureTime"
-            type="datetime"
-            default-time="10:00:00"
-            value-format="yyyy-MM-dd HH:mm:ss"
+            type="date"
+            value-format="yyyy-MM-dd"
             placeholder="请选择测量时间"
             style="width: 100%"
           >
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="测量结果" prop="measureResult" v-if="false">
-          <el-radio
-            v-model="form.measureResult"
-            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="measureFiles" v-if="false">
-          <file-upload v-model="form.measureFiles" :limit="1" @input="fileInput" />
+        <el-form-item label="测量附件" prop="measureFiles">
+          <file-upload v-model="form.measureFiles" :limit="9" @input="fileInput"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -604,6 +593,20 @@ export default {
       }
       this.form.measureFiles = fileUrls;
     },
+    selectMeasureType(val){
+      this.form.measureInfo=null;
+    },
+    showInfoType(dict){
+      if(this.form.measureType){
+        if(this.form.measureType=='6'){
+          return dict.raw.remark == 'gjgc';
+        }else{
+          return !dict.raw.remark;
+        }
+      }else{
+        return false;
+      }
+    },
     getImageUrl(url) {
       return process.env.VUE_APP_BASE_API + url + ".min.jpg";
     },
diff --git a/ruoyi-ui/src/views/project/projectMeasure/projectMeasureDrawer.vue b/ruoyi-ui/src/views/project/projectMeasure/projectMeasureDrawer.vue
index 14c4c3b8..40338c5f 100644
--- a/ruoyi-ui/src/views/project/projectMeasure/projectMeasureDrawer.vue
+++ b/ruoyi-ui/src/views/project/projectMeasure/projectMeasureDrawer.vue
@@ -118,7 +118,7 @@
         />
         <el-table-column label="测量时间" align="center" prop="measureTime" width="160">
           <template slot-scope="scope">
-            <span>{{ parseTime(scope.row.measureTime, "{y}-{m}-{d} {h}:{i}") }}</span>
+            <span>{{ parseTime(scope.row.measureTime, "{y}-{m}-{d}") }}</span>
           </template>
         </el-table-column>
         <el-table-column
@@ -244,6 +244,7 @@
               v-model="form.measureType"
               placeholder="请选择测量类型"
               style="width: 100%"
+              @change="selectMeasureType"
             >
               <el-option
                 v-for="dict in dict.type.project_measure_type"
@@ -261,6 +262,7 @@
             >
               <el-option
                 v-for="dict in dict.type.project_measure_info_type"
+                v-show="showInfoType(dict)"
                 :key="dict.value"
                 :label="dict.label"
                 :value="dict.value"
@@ -323,27 +325,15 @@
             <el-date-picker
               clearable
               v-model="form.measureTime"
-              type="datetime"
-              default-time="10:00:00"
-              value-format="yyyy-MM-dd HH:mm:ss"
+              type="date"
+              value-format="yyyy-MM-dd"
               placeholder="请选择测量时间"
               style="width: 100%"
             >
             </el-date-picker>
           </el-form-item>
-          <el-form-item label="测量结果" prop="measureResult" v-if="false">
-            <el-radio
-              v-model="form.measureResult"
-              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="measureFiles" v-if="false">
-            <file-upload v-model="form.measureFiles" :limit="1" @input="fileInput" />
+          <el-form-item label="测量附件" prop="measureFiles">
+            <file-upload v-model="form.measureFiles" :limit="9" @input="fileInput"/>
           </el-form-item>
         </el-form>
         <div slot="footer" class="dialog-footer">
@@ -390,7 +380,7 @@ export default {
       title: "",
       isUnit: true,
       nodes: [],
-      form: {},
+      form: {measureType:"",measureInfo:""},
       rules: {
         imageUrls: [{ required: true, message: "请上传测量图片", trigger: "blur" }],
         measureType: [{ required: true, message: "请选择测量类型", trigger: "blur" }],
@@ -443,7 +433,6 @@ export default {
   },
   computed: {},
   mounted() {},
-
   methods: {
     fileInput(files) {
       let fileUrls = null;
@@ -456,6 +445,20 @@ export default {
       }
       this.form.measureFiles = fileUrls;
     },
+    selectMeasureType(val){
+      this.form.measureInfo="";
+    },
+    showInfoType(dict){
+      if(this.form.measureType){
+        if(this.form.measureType=='6'){
+          return dict.raw.remark == 'gjgc';
+        }else{
+          return dict.raw.remark == null;
+        }
+      }else{
+        return false;
+      }
+    },
     getImageUrl(url) {
       return process.env.VUE_APP_BASE_API + url + ".min.jpg";
     },
@@ -542,7 +545,8 @@ export default {
         id: null,
         projectId: null,
         deptId: null,
-        insuranceType: null,
+        insuranceType: "",
+        measureInfo: "",
         insuranceNumber: null,
         insuranceFile: null,
         insuranceState: null,
diff --git a/ruoyi-ui/src/views/work/workFile/index.vue b/ruoyi-ui/src/views/work/workFile/index.vue
index 21a4a48a..198a4109 100644
--- a/ruoyi-ui/src/views/work/workFile/index.vue
+++ b/ruoyi-ui/src/views/work/workFile/index.vue
@@ -187,7 +187,7 @@
         </el-select>
       </el-form-item>
         <el-form-item label="上传文件" prop="fileData">
-          <FileUpload @input="fileInput" :fileSize="200"/>
+          <FileUpload @input="fileInput" :fileSize="200" :fileType="['pdf', 'doc', 'docx', 'xls', 'xlsx']"/>
         </el-form-item>
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" placeholder="请输入备注" type="textarea"/>
diff --git a/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectFilesController.java b/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectFilesController.java
index afacceee..cf9b79f1 100644
--- a/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectFilesController.java
+++ b/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectFilesController.java
@@ -8,6 +8,7 @@ import com.yanzhu.jh.work.service.IWorkFileService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -32,9 +33,11 @@ public class ProjectFilesController extends BaseController {
      * workFile
      */
     @GetMapping("/list")
-    public AjaxResult list(WorkFile workFile)
+    public TableDataInfo list(WorkFile workFile)
     {
-        return success(workFileService.selectWorkFileList(workFile));
+        startPage();
+        List<WorkFile> list = workFileService.selectWorkFileList(workFile);
+        return getDataTable(list);
     }
 
     /**
@@ -44,7 +47,17 @@ public class ProjectFilesController extends BaseController {
      */
     @GetMapping("/findCountByType")
     public AjaxResult findCountByType(WorkFile workFile){
+        clearPage();
         return success(workFileService.findCountByType(workFile));
     }
 
+    /**
+     * 打开文件
+     * @return
+     */
+    @GetMapping("/readFile/{id}")
+    public AjaxResult workFileRead(@PathVariable("id") Long id){
+        return success(workFileService.openWorkFile(id));
+    }
+
 }