fix: BUG修改

src/assets/js/api/laborPerson.js

@@ -26,6 +26,7 @@ export const importImgDataApi = data => post('xmgl/workerInfo/uploadWorkerInfoIm
 
 //详情
 export const getWorkerInfoData = data => post('xmgl/workerInfo/viewWorkerInfoDetail', data);   //获取 人员 详细所有信息
+export const getRegisterWorkerInfoData = data => post('xmgl/xzWorkerInfoAuditRecord/viewWorkerInfoDetail', data);   //获取 人员登记培训 详细所有信息
 export const addContractApi = data => post('xmgl/workerContract/add', data);   //新增合同信息
 export const editContractApi = data => post('xmgl/workerContract/edit', data);   //编辑合同信息
 export const getCertificateTypeApi = data => post('xmgl/dictionariesRecord/selectCertTypeList', data);   //获取证书类型
@@ -83,6 +84,10 @@ export const workerAttendanceRuleAdd = data => post('xmgl/workerAttendanceRule/a
 export const workerAttendanceRuleEdit = data => post('xmgl/workerAttendanceRule/edit', data);//编辑考勤规则信息
 export const workerAttendanceRuleDelete = data => post('xmgl/workerAttendanceRule/delete', data);//删除考勤规则信息
 
+// 安全扣分详情
+export const safeReduceDetailList = data => get('xmgl/xzDeductScoreRecord/list', data);//列表查询考勤规则信息
+export const resetScoreApi = data => post('xmgl/xzDeductScoreRecord/edit', data);//重置分数
+
 
 export const selectJobListApi = data => get('xmgl/dictionariesRecord/selectJobList', data);//查询管理人员的职务类型和职务列表
 
@@ -206,6 +211,9 @@ export const selectProjectAllEnterpriseList = data => post('/xmgl/projectEnterpr
 export const getProjectChartData = data => post('/xmgl/projectEnterpriseWorkerStatistics/selectProjectEnterpriseWorkerStatisticsList', data); // 查询对应企业图表数据
 export const getProjectDetailData = data => post('/xmgl/projectEnterpriseWorkerStatistics/getCurrentEnterpriseWorkerStatistics', data); // 查询对应企业统计数据
 
+// 人员信息详情修改
+export const updateMemberDetailDataList = data => post('/xmgl/xzWorkerInfoAuditRecord/edit', data); // 修改人员信息详情
+
 
 
 

src/assets/js/api/materialManage.js

@@ -145,3 +145,8 @@ export const updateMaterialDetailsApi = data => post('/xmgl/materialDetails/upda
 export const deleteMaterialDetailsApi = params => get('/xmgl/materialDetails/deleteById', params);
 export const getSumConsumeListApi = params => get('/xmgl/materialDetails/sumConsumeList', params);
 
+// 材料入场记录台账
+export const materialEntryRecordPageApi = data => post('/xmgl/xzMaterial/page', data);
+export const materialRecordDetailListApi = data => post('/xmgl/xzMaterialDetail/list', data);
+
+

src/router/index.js

@@ -407,6 +407,13 @@ const routes2 = [
         component: () =>
           import("@/views/projectFront/laborManage/personDetails.vue"),
       },
+      //劳务管理--人员登记培训详情
+      {
+        path: "/project/labor/personRegisterDetails",
+        name: "劳务管理_人员登记培训信息详情1",
+        component: () =>
+          import("@/views/projectFront/laborManage/personRegisterDetails.vue"),
+      },
       //劳务管理--人员考勤--榕图路由
       {
         path: "/project/labor/rt/attendanceManage",
@@ -468,6 +475,12 @@ const routes2 = [
         component: () =>
           import("@/views/projectFront/laborManage/blackList.vue"),
       },
+      {
+        path: "/project/labor/visitRecord",
+        name: "劳务管理_访客预约记录",
+        component: () =>
+          import("@/views/projectFront/laborManage/visitRecord.vue"),
+      },
       //劳务管理--人员总览
       {
         path: "/project/labor/personnelOverview",
@@ -1492,6 +1505,12 @@ const routes2 = [
         component: () =>
           import("@/views/projectFront/materialManage/materialManage.vue"),
       },
+      {
+        path: "/project/materialManage/materialEntryManage",
+        name: "材料管理_材料出入场记录台账",
+        component: () =>
+          import("@/views/projectFront/materialManage/materialEntryManage.vue"),
+      },
       {
         path: "/project/materialManage/cooperationUnit",
         name: "材料管理_资源中心_合作单位",

src/views/companyAdmin/qualityAndSafety/hiddenDangerLibrary.vue

@@ -253,6 +253,12 @@
               :label="$t('message.safeMangeCheck.changeTimeLimit')"
               align="center" width="100"
             ></el-table-column>
+            <!-- 扣分 -->
+            <el-table-column
+              prop="deductScore"
+              label="扣分"
+              align="center"
+            ></el-table-column>
             <!-- <el-table-column
               prop="createTime"
               label="创建时间"
@@ -401,6 +407,10 @@
               <el-option :label="$t('message.safeMangeCheck.forth')" :value="$t('message.safeMangeCheck.forth')"> </el-option>
             </el-select>
           </el-form-item>
+          <!-- 扣分数 -->
+        <el-form-item label="扣分" prop="deductScore">
+            <el-input-number v-model="dialogdata.deductScore" :min="0" ></el-input-number>
+          </el-form-item>
          <!-- 备注 -->
           <el-form-item :label="$t('message.safeMangeCheck.remark')">
             <el-input v-model="dialogdata.remark"></el-input>

src/views/projectFront/aiAnalysis/warningList.vue

@@ -138,6 +138,9 @@
               <el-option v-for="(item, index) in workerListOptions" :key="index" :label="item.workerName" :value="item.id"> </el-option>
             </el-select>
           </el-form-item>
+          <el-form-item label="扣分" prop="deductScore" v-if="addEditForm.handleResult != 2">
+           <el-input-number v-model="addEditForm.deductScore" :min="0" :placeholder="'请输入'"></el-input-number>
+          </el-form-item>
           <div class="dialog-footer" v-if="!isDetail">
             <el-button class="cancleBtn" icon="el-icon-circle-close" size="medium" @click="recordShow = false">取消 </el-button>
             <el-button @click="addBtn" type="primary" icon="el-icon-circle-check" size="medium">确定 </el-button>
@@ -180,7 +183,8 @@ export default {
       addEditForm: {
         workerInfoList: [],
         handleResult: '',
-        desc: ''
+        desc: '',
+        deductScore: 0
       },
       addEditRules: {
         handleResult: [

src/views/projectFront/laborManage/personAuditAg.vue

@@ -1054,11 +1054,18 @@ export default {
     },
     //查看详情
     showDetail(value) {
-      this.addForm = {};
-      this.addForm = JSON.parse(JSON.stringify(value));
-      this.temporaryDialog = true;
-      this.temporaryTitle = this.$t("message.laborMange.crewInfoDetail");
-      this.operationType = "detail";
+      // this.addForm = {};
+      // this.addForm = JSON.parse(JSON.stringify(value));
+      // this.temporaryDialog = true;
+      // this.temporaryTitle = this.$t("message.laborMange.crewInfoDetail");
+      // this.operationType = "detail";
+      this.$router.push({
+        path: "/project/labor/personRegisterDetails",
+        query: {
+          id: value.id,
+        },
+      });
+      localStorage.setItem("showPersonModule", 1);
     },
 
     //查看图片

src/views/projectFront/laborManage/personDetails.vue

@@ -187,7 +187,7 @@
               ref="workerInfo"
               label-position="right"
               :model="workerInfo"
-              label-width="120px"
+              label-width="140px"
               style="width: 99%"
             >
               <el-row :gutter="24">
@@ -952,7 +952,20 @@
                       </div>
                     </el-form-item>
                     </el-col>
-                  
+                    <el-col :span="12"> 
+                      <el-form-item
+                        label="当前安全评分分值:"
+                        prop="safeScore"
+                      >
+                        <el-input
+                        v-if="detailInfoStatus"
+                          style="width: 80%"
+                          v-model="workerInfo.safeScore"
+                          placeholder="请输入"
+                        ></el-input>
+                        <span v-else>{{ workerInfo.safeScore }}</span>
+                      </el-form-item>
+                    </el-col>
                   </el-row>
                   <el-row :gutter="24" v-if="workerInfo.devType == 2">
                     <el-col :span="12"> 
@@ -1924,7 +1937,7 @@
               </el-table-column>
             </el-table>
           </div>
-          <div id="rewardAndPunish" class="table" style="padding-bottom: 100px">
+          <div id="rewardAndPunish" class="table">
             <div class="pageTitle">
               {{ $t('message.laborMange.punishmentRecord') }}
             </div>
@@ -2049,6 +2062,44 @@
               </el-tab-pane>
             </el-tabs>
           </div>
+          <div id="getAJob" class="table" style="padding-bottom: 100px">
+            <div class="pageTitle" style="display: flex;align-items: center;">
+              <span>安全扣分详情</span>
+                    <!-- 重置 -->
+                    <el-button
+                      size="medium"
+                      type="text"
+                      class="margin_left"
+                      style="margin-top: 2px;"
+                      @click="scoreReset()"
+                      >重置</el-button
+                    >
+            </div>
+            <el-table :data="reduceScoreList" style="width: 100%">
+              <el-table-column
+                type="index"
+                width="80"
+                align="center"
+                label="序号"
+              ></el-table-column>
+              <el-table-column
+                prop="createDate"
+                label="扣分时间"
+              ></el-table-column>
+              <el-table-column
+                prop="deductReason"
+                label="扣分原因"
+              ></el-table-column>
+              <el-table-column
+                prop="deductScore"
+                label="扣分值"
+              ></el-table-column>
+              <el-table-column
+                prop="curScore"
+                label="当前安全评分分值"
+              ></el-table-column>
+            </el-table>
+          </div>
         </div>
       </vue-scroll>
       <div class="mark_wrap">
@@ -2267,6 +2318,8 @@ import {
   ufaceDevList,
   getGroupListApi,
   checkImgLibraryApi,
+  safeReduceDetailList,
+  resetScoreApi
 } from "@/assets/js/api/laborPerson.js";
 import { getProjectConfigListApi } from "@/assets/js/api/project.js";
 import { selectUserDevAuthorityByUserIdApi } from "@/assets/js/api/configManage";
@@ -2299,6 +2352,7 @@ export default {
       physicalsList: [], //体检
       safeEducationList: [], //安全教育
       workExperienceList: [], //从业信息
+      reduceScoreList: [], //安全扣分详情
       badList: [], //奖罚 --不良记录
       rewardList: [], //奖罚 --奖励记录
       nationList: this.$t("message.laborMange.nationList"), //民族
@@ -2354,6 +2408,7 @@ export default {
     this.getUfaceDevList();
     this.getUGroupDevList();
     this.getWorkerInfo();
+    this.getSafeScoreDetail();
     this.getAttendRuleList();
     this.getProjectConfig();
   },
@@ -2368,6 +2423,18 @@ export default {
     });
   },
   methods: {
+    scoreReset(){
+      let requestData = {
+        id: this.workerInfo.id,
+        safeScore: 100
+      }
+      resetScoreApi(requestData).then(res => {
+        if(res.code == 200){
+          this.$message.success("操作成功");
+          this.getWorkerInfo();
+        }
+      })
+    },
     devTypeChange(e){
       if(e == 1){
         this.getUfaceDevList();
@@ -2716,7 +2783,16 @@ export default {
         }
       });
     },
-
+    // 获取安全扣分详情
+    getSafeScoreDetail(){
+      safeReduceDetailList({ projectSn: this.$store.state.projectSn, workerId: this.userId }).then(
+        (result) => {
+          console.log(result,666777)
+          this.reduceScoreList = result.result;
+          // this.attendRulesList = result.result;
+        }
+      );
+    },
     //查询管理人员的职务类型和职务列表
     selectJobList() {
       selectJobListApi().then((res) => {

src/views/projectFront/laborManage/visitRecord.vue

@@ -0,0 +1,349 @@
+<template>
+  <div class="fullHeight">
+    <div class="searchBox whiteBlock">
+      <el-form
+        :inline="true"
+        size="medium"
+        :model="searchForm"
+        ref="searchForm"
+      >
+        <el-form-item
+          :label="$t('message.personnelPosition.beaconManage.workerName')"
+          prop="workerName"
+        >
+          <el-input
+            v-model="searchForm.workerName"
+            :placeholder="$t('message.personnelPosition.please_enter')"
+            clearable
+          ></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" plain @click="loadCardData">
+            {{ $t("message.personnelPosition.beaconManage.query") }}
+          </el-button>
+          <el-button type="warning" plain @click="resetForm">
+            {{ $t("message.personnelPosition.beaconManage.refresh") }}
+          </el-button>
+          <el-button type="primary" @click="addPoint">
+            {{ $t("message.laborDev.add2") }}
+          </el-button>
+        </el-form-item>
+      </el-form>
+    </div>
+    <div class="table_wrap whiteBlock">
+      <el-table class="tables" :data="pointList">
+        <el-table-column
+          type="index"
+          width="50"
+          align="center"
+          :label="$t('message.personnelPosition.beaconManage.table.index')"
+        ></el-table-column>
+        <el-table-column
+          prop="workerName"
+          :label="$t('message.laborDev.blackListNames')"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="addTime"
+          :label="$t('message.laborDev.addDate')"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="addReason"
+          :label="$t('message.laborDev.blackReason')"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          :label="$t('message.personnelPosition.beaconManage.table.operation')"
+          align="center"
+          width="250"
+        >
+          <template slot-scope="scope">
+            <div class="tableBtns">
+              <div @click="editPoint(scope.row)" class="operationText">
+                <img
+                  src="@/assets/images/icon-edit.png"
+                  width="15px"
+                  height="15px"
+                />
+                <span>{{
+                  $t("message.personnelPosition.beaconManage.table.edit")
+                }}</span>
+              </div>
+              <div @click="removePoint(scope.row)" class="operationText">
+                <img
+                  src="@/assets/images/icon-delete.png"
+                  width="15px"
+                  height="15px"
+                />
+                <span>{{
+                  $t("message.personnelPosition.beaconManage.table.delete")
+                }}</span>
+              </div>
+            </div>
+          </template>
+        </el-table-column>
+        <!-- <div slot="empty">{{$t('message.personnelPosition.empty')}}</div> -->
+      </el-table>
+      <el-pagination
+        class="pagerBox"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :current-page="pageNo"
+        :page-sizes="$store.state.PAGESIZRS"
+        :page-size="pageSize"
+        layout="total, sizes, prev, pager, next"
+        :total="Number(total)"
+        background
+      ></el-pagination>
+    </div>
+    <!-- 添加卡片弹框 -->
+    <el-dialog
+      :modal-append-to-body="false"
+      :title="cardDialogTitle"
+      :visible.sync="cardDialog"
+      width="667px"
+      @close="close"
+    >
+      <div class="dialog_content">
+        <el-form
+          size="medium"
+          :model="cardForm"
+          ref="cardForm"
+          :rules="cardFormRules"
+          label-width="125px"
+          class="dialogFormBox"
+        >
+          <el-form-item
+            :label="$t('message.laborDev.addToBlackReason')"
+            prop="addReason"
+          >
+            <el-input
+              v-model="cardForm.addReason"
+              :placeholder="$t('message.personnelPosition.please_enter')"
+            ></el-input>
+          </el-form-item>
+          <el-form-item
+            :label="$t('message.laborDev.addToBlackTime')"
+            prop="addTime"
+          >
+            <el-date-picker
+              v-model="cardForm.addTime"
+              type="date"
+              :placeholder="$t('message.laborMange.pleaseSelectADate')"
+              value-format="yyyy-MM-dd"
+              style="width: 100%"
+            ></el-date-picker>
+          </el-form-item>
+          <el-form-item
+            :label="$t('message.laborDev.blackNames')"
+            prop="workerId"
+          >
+            <!-- multiple clearable-->
+            <el-select
+              v-model="cardForm.workerId"
+              :placeholder="$t('message.personnelPosition.please_select')"
+              filterable
+            >
+              <el-option
+                :label="item.workerName"
+                :value="item.id"
+                v-for="(item, index) in allPersonList"
+                :key="index"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <div class="dialog-footer">
+            <el-button
+              class="cancleBtn"
+              @click="cardDialog = false"
+              icon="el-icon-circle-close"
+              size="medium"
+              >{{ $t("message.personnelPosition.cancel") }}
+            </el-button>
+            <el-button
+              type="primary"
+              icon="el-icon-circle-check"
+              @click="saveCardFn"
+              size="medium"
+              >{{ $t("message.personnelPosition.determine") }}
+            </el-button>
+          </div>
+        </el-form>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+<script>
+import { getWorkerInfoListApi } from "@/assets/js/api/personnelPosition.js";
+import {
+  workerBlacklistListApi,
+  workerBlacklistAddApi,
+  workerBlacklistEditApi,
+  workerBlacklistDeleteApi,
+} from "@/assets/js/api/laborPerson.js";
+export default {
+  data() {
+    return {
+      searchForm: {
+        workerName: "",
+      },
+      pointList: [],
+      total: 0,
+      pageNo: 1,
+      pageSize: 10,
+      cardDialogTitle: "",
+      cardDialog: false,
+      cardForm: {
+        addReason: "",
+        addTime: "",
+        idCard: "",
+        reason: "",
+        workerId: "",
+        workerName: "",
+        projectSn: this.$store.state.projectSn,
+      },
+      cardFormRules: {
+          addReason: [
+          {
+            required: true,
+            message: this.$t("message.personnelPosition.required"),
+            trigger: "blur",
+          },
+        ],
+        addTime: [
+          {
+            required: true,
+            message: this.$t("message.personnelPosition.mandatory"),
+            trigger: "change",
+          },
+        ],workerId: [
+          {
+            required: true,
+            message: this.$t("message.personnelPosition.mandatory"),
+            trigger: "change",
+          },
+        ],
+      },
+      isAdd: false,
+      allPersonList: [],
+    };
+  },
+  mounted() {
+    this.loadAllPerson();
+    this.loadCardData();
+  },
+  methods: {
+    //获取所有人员
+    loadAllPerson() {
+      getWorkerInfoListApi({
+        projectSn: this.$store.state.projectSn,
+        userEnterpriseId: this.$store.state.userInfo.userEnterpriseId
+      }).then((res) => {
+        this.allPersonList = res.result;
+      });
+    },
+    addPoint(event) {
+      this.isAdd = true;
+      this.cardDialog = true;
+      this.cardForm = {
+        addReason: "",
+        addTime: "",
+        idCard: "",
+        reason: "",
+        workerId: "",
+        workerName: "",
+        projectSn: this.$store.state.projectSn,
+      };
+      this.cardDialogTitle = this.$t("message.laborDev.add2");
+    },
+    editPoint(item) {
+      this.isAdd = false;
+      this.cardDialogTitle = this.$t("message.laborDev.btn_edit"); //编辑卡片
+      this.cardForm = JSON.parse(JSON.stringify(item));
+      this.cardDialog = true;
+    },
+    removePoint(item) {
+      this.$confirm(
+        this.$t("message.personnelPosition.beaconManage.table.confirmText") +
+          "【" +
+          item.workerName +
+          "】?",
+        this.$t("message.personnelPosition.beaconManage.table.Tips"),
+        {
+          type: "warning",
+        }
+      ).then(() => {
+        workerBlacklistDeleteApi({ id: item.id }).then((res) => {
+          this.loadCardData();
+          this.$message.success(
+            this.$t("message.personnelPosition.delete_success")
+          ); //删除成功!
+        });
+      });
+    },
+    //获取卡片列表
+    loadCardData() {
+      workerBlacklistListApi({
+        projectSn: this.$store.state.projectSn,
+        pageNo: this.pageNo,
+        pageSize: this.pageSize,
+        workerName: this.searchForm.workerName,
+        userEnterpriseId: this.$store.state.userInfo.userEnterpriseId
+      }).then((res) => {
+        this.pointList = res.result.records;
+        this.total = res.result.total;
+      });
+    },
+    //添加或编辑卡片
+    saveCardFn() {
+      this.$refs["cardForm"].validate((valid) => {
+        if (valid) {
+          if (this.isAdd) {
+            // this.cardForm.floorId = this.currentFloorDetail.floorId
+            workerBlacklistAddApi(this.cardForm).then((res) => {
+              this.cardDialog = false;
+              this.loadCardData();
+              this.$message.success(
+                this.$t("message.personnelPosition.add_success")
+              ); //添加成功！
+            });
+          } else {
+            workerBlacklistEditApi(this.cardForm).then((res) => {
+              this.cardDialog = false;
+              this.loadCardData();
+              this.$message.success(
+                this.$t("message.personnelPosition.edit_success")
+              ); //编辑成功！
+            });
+          }
+        } else {
+          console.log("error submit!!");
+          return false;
+        }
+      });
+    },
+    resetForm() {
+      this.$refs["searchForm"].resetFields();
+      this.loadCardData();
+    },
+
+    //查看条数
+    handleSizeChange(val) {
+      this.pageSize = val;
+      this.loadCardData();
+    },
+    //查看页
+    handleCurrentChange(val) {
+      this.pageNo = val;
+      this.loadCardData();
+    },
+    close() {
+      this.$nextTick(() => {
+        this.$refs.cardForm.clearValidate()
+      })
+    },
+  },
+};
+</script>

src/views/projectFront/materialManage/materialEntryManage.vue

@@ -0,0 +1,305 @@
+<template>
+  <!-- 进度预警 -->
+  <div class="fullHeight">
+    <div class="searchBox whiteBlock">
+      <el-form
+        :inline="true"
+        size="medium"
+        :model="queryInfo"
+        class="demo-form-inline"
+      >
+        <el-form-item :label="$t('message.laborMange.companies')">
+          <el-select
+            ref="selectRef"
+            v-model="selectVal"
+            placeholder="请选择"
+            clearable
+            @change="selectChange"
+          >
+            <el-option style="height:auto" :value="[]">
+              <el-tree
+                :data="treeList"
+                node-key="enterpriseId"
+                ref="groupTree"
+                :default-expanded-keys="defaultExpandArr"
+                :props="defaultProps"
+                :default-expand-all="false"
+                @node-click="treeClick"
+              >
+              </el-tree>
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="材料名称" prop="materialName">
+          <el-input
+            v-model="queryInfo.materialName"
+            placeholder="请输入"
+            clearable
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="入场时间" prop="materialName">
+          <el-date-picker
+            size="medium"
+            v-model="queryInfo.timeRange"
+            type="daterange"
+            range-separator="至"
+            value-format="yyyy-MM-dd"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+          >
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" plain @click="getWarningListData"
+            >查询</el-button
+          >
+          <el-button type="warning" plain @click="refresh">刷新</el-button>
+        </el-form-item>
+      </el-form>
+    </div>
+    <div class="table_wrap whiteBlock">
+      <vue-scroll>
+        <el-table class="tables" :data="tableList">
+          <el-table-column
+            type="index"
+            :label="$t('message.projectManage.serialNumber')"
+            align="center"
+            width="50"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="name"
+            align="center"
+            label="批次"
+          ></el-table-column>
+          <el-table-column
+            prop="entryTime"
+            align="center"
+            label="入场时间"
+          ></el-table-column>
+          <el-table-column align="center" label="操作" width="280">
+            <template slot-scope="scope">
+              <div
+                @click="showDetail(scope.row)"
+                class="operationText"
+                v-if="![2, 3].includes(scope.row.auditType)"
+              >
+                <img
+                  src="@/assets/images/tableIcon/showReply.png"
+                  width="15px"
+                  height="15px"
+                />
+                <span style="white-space: nowrap;color: #5678E8;"
+                  >查看明细</span
+                >
+              </div>
+            </template>
+          </el-table-column>
+        </el-table>
+      </vue-scroll>
+    </div>
+    <el-pagination
+      class="pagerBox"
+      style="position: absolute; top: 85%; left: 40%"
+      @size-change="SizeChange"
+      @current-change="CurrentChange"
+      :current-page="pagInfo.pageNo"
+      :page-sizes="$store.state.PAGESIZRS"
+      :page-size="pagInfo.pageSize"
+      layout="total, sizes, prev, pager, next"
+      :total="Number(pagInfo.total)"
+      background
+    ></el-pagination>
+    <!-- 更新总进度 -->
+    <el-dialog
+      :modal-append-to-body="false"
+      title="查看明细"
+      :visible.sync="dialogVisible"
+      width="1000px"
+    >
+      <div class="dialog_content">
+        <div class="update-record">
+          <el-table
+            :data="dialogTableData"
+            height="500"
+            style="width: 100%;">
+            <el-table-column
+              type="index"
+              width="50"
+              prop="updateDate"
+              align="center"
+              label="序号">
+            </el-table-column>
+            <el-table-column
+              prop="name"
+              align="center"
+              label="材料名称">
+            </el-table-column>
+            <el-table-column
+              prop="model"
+              align="center"
+              label="型号">
+            </el-table-column>
+            <el-table-column
+              prop="specifications"
+              align="center"
+              label="规格">
+            </el-table-column>
+            <el-table-column
+              prop="unit"
+              align="center"
+              label="单位">
+            </el-table-column>
+            <el-table-column
+              prop="num"
+              align="center"
+              label="数量">
+            </el-table-column>
+            <el-table-column
+              prop="remark"
+              align="center"
+              label="备注">
+            </el-table-column>
+          </el-table>
+        </div>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+<script>
+import {
+    materialEntryRecordPageApi,
+    materialRecordDetailListApi
+} from "@/assets/js/api/materialManage";
+import { selectHierarchyEnterpriseListApi } from "@/assets/js/api/laborPerson";
+export default {
+  mounted() {},
+  data() {
+    return {
+      selectTreeData: {},
+      defaultExpandArr: [],
+      // 对应的字段
+      defaultProps: {
+        children: "children",
+        label: "enterpriseName",
+      },
+      treeList: [],
+      selectVal: "",
+      dialogVisible: false,
+      dialogTableData: [],
+      projectSn: "",
+      tableList: [],
+      queryInfo: {
+        enterpriseId: "",
+        materialName: "",
+        timeRange: [],
+      },
+      pagInfo: {
+        pageNo: 1, //页数
+        pageSize: 10, //条数
+        total: 0, //总条数
+      },
+      rowObj: {}
+    };
+  },
+  created() {
+    this.projectSn = this.$store.state.projectSn;
+    this.getWarningListData();
+    this.getTreeList();
+  },
+  methods: {
+    selectChange(val) {
+      console.log(val, 123);
+      if (!val) {
+        this.selectVal = "";
+        this.selectTreeData = {};
+        this.queryInfo.enterpriseId = "";
+      }
+    },
+    // 树形控件点击
+    treeClick(data) {
+      console.log(data);
+      if (data.status == 1) {
+        this.$message.warning("无法选中已禁用组织");
+      } else {
+        this.selectVal = data.enterpriseName;
+        this.selectTreeData = data;
+        this.queryInfo.enterpriseId = data.enterpriseId;
+        this.$refs.selectRef.blur();
+      }
+    },
+    getTreeList() {
+      selectHierarchyEnterpriseListApi({
+        projectSn: this.$store.state.projectSn,
+      }).then((result) => {
+        if (result.success) {
+          this.treeList = result.result;
+        }
+      });
+    },
+    //获取明细列表数据
+    getDetailListData() {
+      let data = {
+        materialId: this.rowObj.id
+      };
+      materialRecordDetailListApi(data).then((res) => {
+        console.log("返回的值", res);
+        if (res.code == 200) {
+          this.dialogTableData = res.result;
+        }
+      });
+    },
+    showDetail(row) {
+      this.rowObj = row;
+      this.dialogVisible = true;
+      this.$nextTick(() => {
+        this.getDetailListData();
+      })
+      console.log(row, 666);
+    },
+    //获取列表数据
+    getWarningListData() {
+      let data = {
+        projectSn: this.projectSn,
+        pageNo: this.pagInfo.pageNo,
+        pageSize: this.pagInfo.pageSize,
+        name: this.queryInfo.materialName
+      };
+      if(this.queryInfo.timeRange && this.queryInfo.timeRange.length > 0){
+        data.entryTime_begin = this.queryInfo.timeRange[0];
+        data.entryTime_end = this.queryInfo.timeRange[1];
+      }
+      materialEntryRecordPageApi(data).then((res) => {
+        console.log("返回的值", res);
+        if (res.code == 200) {
+          this.tableList = res.result.records;
+          console.log(this.tableList, 777888);
+          this.pagInfo.total = res.result.total;
+        }
+      });
+    },
+    //刷新按钮
+    refresh() {
+      this.queryInfo = {};
+      this.selectVal = "";
+      this.pagInfo.pageNo = 1; //页数
+      this.pagInfo.pageSize = 10; //条数
+      this.getWarningListData();
+    },
+    SizeChange(val) {
+      this.pagInfo.pageSize = val;
+      this.getWarningListData();
+    },
+    CurrentChange(val) {
+      this.pagInfo.pageNo = val;
+      this.getWarningListData();
+    },
+  },
+};
+</script>
+<style lang="less" scoped>
+// 下拉框样式修改
+/deep/.el-select-dropdown__item.hover,.el-select-dropdown__item.hover, .el-select-dropdown__item:hover{
+  background-color: transparent;
+}
+</style>

src/views/projectFront/progressManagementAg/divisionSubManage.vue

@@ -345,7 +345,7 @@
             </vue-scroll>
             <el-pagination
               class="pagerBox"
-              style="position: absolute; top: 85%; left: 40%"
+              style="position: absolute; top: 85%; left: 51%"
               @size-change="SizeChange"
               @current-change="CurrentChange"
               :current-page="pagInfo.pageNo"

src/views/projectFront/progressManagementAg/ganttChart.vue

@@ -854,7 +854,7 @@
     >
       <div class="dialog_content">
         <div class="progress-update">
-          <span>总进度</span>
+          <span>{{updateDialogTitle.substring(2)}}</span>
           <!-- <el-input
             placeholder="请输入"
             v-model="progressData.projectTotalProgress"

src/views/projectFront/progressManagementAg/progressApproval.vue

@@ -144,11 +144,11 @@
               <div class="tableBtns">
                 <div @click="pass(scope.row)" class="operationText" v-if="![2,3].includes(scope.row.auditType)">
                   <img
-                    src="@/assets/images/icon-edit.png"
+                    src="@/assets/images/tableIcon/passIcon.png"
                     width="15px"
                     height="15px"
                   />
-                  <span style="white-space: nowrap;">通过</span>
+                  <span style="white-space: nowrap;color: #5678E8;">通过</span>
                 </div>
                 <div @click="openBackDialog(scope.row)" class="operationText" v-if="![2,3].includes(scope.row.auditType)">
                   <img
@@ -156,7 +156,7 @@
                     width="15px"
                     height="15px"
                   />
-                  <span style="white-space: nowrap;">驳回</span>
+                  <span style="white-space: nowrap;color: #EA3941;">驳回</span>
                 </div>
                 <div @click="deleteDev(scope.row)" class="operationText">
                   <img

src/views/projectFront/progressManagementAg/projectProgressDetail.vue

@@ -258,6 +258,8 @@
               }}</span>
                 </div>
               </div>
+              <div class="back_info margin" v-if="item.auditType == 3">驳回原因：</div>
+              <div class="feedbackContent">{{ item.rejectReason }}</div>
             </div>
             <!-- <div class="whiteBlock plan_mater">
               <div class="flex3 back_info">材料用量</div>
@@ -548,7 +550,7 @@ export default {
             if (res.code == 200) {
               this.$message.success(res.message);
               this.dialogVisible = false;
-              this.itemForm.progressRatio = Number(data.progressRatio);
+              // this.itemForm.progressRatio = Number(data.progressRatio);
               this.getProgressInfo();
               // this.getTypeList();
               // this.getDetailInfo();
@@ -753,7 +755,8 @@ export default {
     padding: 15px;
     box-sizing: border-box;
     .plan_content {
-      height: 95%;
+      // height: 95%;
+      height: auto;
       width: 100%;
       padding: 12px 20px;
       box-sizing: border-box;
@@ -866,7 +869,7 @@ export default {
   width: 275px !important;
 }
 .feedbackContent {
-  height: 70px;
+  min-height: 70px;
   background: #f7f7f7;
   border-radius: 5px;
   padding: 10px 0 0 10px;

src/views/projectFront/safeManage/v2/checkStandingBook.vue

@@ -1298,6 +1298,7 @@ export default {
           },
         ],
       },
+      checkProjectIdList: []
     };
   },
   created() {
@@ -1443,6 +1444,7 @@ export default {
         checkContent: this.formData.checkContent,
         checkItem: this.formData.checkItem2,
         checkSubitem: this.formData.checkSubitem2,
+        inspectHiddenDangerltemRecordld: this.checkProjectIdList.join(','),
         createUser: this.$store.state.userInfo.userId,
         dangerDesc: this.formData.dangerDesc,
         dutyRegion: this.formData.dutyRegion,
@@ -1568,6 +1570,11 @@ export default {
     },
     handleChange(val) {
       console.log(val);
+      if(val) {
+        this.checkProjectIdList = val;
+      } else {
+        this.checkProjectIdList = [];
+      }
       console.log(this.$refs["cascaderAddr"].getCheckedNodes()[0]);
       if (this.$refs["cascaderAddr"].getCheckedNodes()[0].data.checkContent) {
         this.formData.checkContent = this.$refs[