From 9b9b2e6e8f73160e8414930391944a91b64472d3 Mon Sep 17 00:00:00 2001
From: Esacpe <1113279529@qq.com>
Date: Tue, 15 Jul 2025 19:27:43 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/MyComponents/Upload/index.vue  | 15 +---
 .../mpvPeo/components/addForm.vue             | 70 +++++++++++++++++--
 .../DatAcquisition/components/addForm.vue     |  2 +-
 3 files changed, 66 insertions(+), 21 deletions(-)

diff --git a/src/components/MyComponents/Upload/index.vue b/src/components/MyComponents/Upload/index.vue
index 68be218..e39758c 100644
--- a/src/components/MyComponents/Upload/index.vue
+++ b/src/components/MyComponents/Upload/index.vue
@@ -149,17 +149,7 @@ const getSuffix = (fileName) => {
   if (suffix === "pdf") return "PDF";
 
   //视频 音频
-  var videolist = [
-    "mp4",
-    "m2v",
-    "mkv",
-    "rmvb",
-    "wmv",
-    "avi",
-    "flv",
-    "mov",
-    "m4v"
-  ];
+  var videolist = [ "mp4", "m2v", "mkv", "rmvb", "wmv", "avi", "flv", "mov", "m4v"  ];
   if (videolist.includes(suffix)) return "VIDEO";
 
   var musiclist = ["mp3", "wav", "wmv"];
@@ -184,8 +174,7 @@ const headers = ref({
 });
 
 const fileList = ref([]);
-onMounted(() => {
-});
+;
 watch(
   () => props.modelValue,
   (val) => {
diff --git a/src/views/backOfficeSystem/DeploymentDisposal/mpvPeo/components/addForm.vue b/src/views/backOfficeSystem/DeploymentDisposal/mpvPeo/components/addForm.vue
index 249446a..2378ef4 100644
--- a/src/views/backOfficeSystem/DeploymentDisposal/mpvPeo/components/addForm.vue
+++ b/src/views/backOfficeSystem/DeploymentDisposal/mpvPeo/components/addForm.vue
@@ -3,14 +3,14 @@
     <div class="head_box">
       <span class="title">{{ title }}重点人管理</span>
       <div>
-        <el-button type="primary" size="small" :loading="loading" @click="submit">保存</el-button >
+        <el-button type="primary" size="small" v-if="!disabled" :loading="loading" @click="submit">保存</el-button >
         <el-button size="small" @click="close">关闭</el-button>
       </div>
     </div>
     <div class="form_cnt" >
       <FormMessage :disabled="disabled" v-model="listQuery" :formList="formData" labelWidth="100px" ref="elform" :rules="rules"></FormMessage>
-      <div><span class="mr10">人员标签模型 : </span><el-button type="primary" @click="chooseMarksVisible = true">选择</el-button></div>
-      <div class="boxlist">
+      <div class="ml50 mr50"><span class="mr10">人员标签模型 : </span><el-button type="primary" v-if="!disabled" @click="chooseMarksVisible = true">选择</el-button></div>
+      <div class="boxlist ml50 mr50">
         <MyTable
           :tableData="listQuery.bqList"
           :tableColumn="tableDate.tableColumn"
@@ -31,12 +31,44 @@
           </template>
         </MyTable>
       </div>
+      <!-- 选择审核人 -->
+      <div class="ww100 mt20 ml50 mr50">
+        <el-steps direction="vertical" :active="listQuery.wccz" space="500" finish-status="success">
+            <el-step title="发起申请" >
+              <template #description>
+                <div class="flex align-center ww100 mt10 mb20">
+                  <el-input v-model="listQuery.sqrXm" readonly class="ww20"></el-input>
+                  <el-input v-model="listQuery.sqrSsbmmc" readonly class="ww20 ml10 mr10"></el-input>
+                  <span class="f12" style="color: #333333;"> 备注发起人和部门根据登陆人自动填写</span>
+                </div>
+              </template>
+            </el-step>
+            <el-step title="审核确认" >
+              <template #description>
+                <div class="flex align-center ww100 mt10 mb20 depBox">
+                  <span class="mr4">审核部门 : </span>
+                  <MOSTY.Department @getDepValue="getShdep" v-model="listQuery.shSsbmdm" clearable :placeholder="listQuery.shSsbmmc ? listQuery.shSsbmmc : '' "  />
+                </div>
+              </template>
+            </el-step>
+            <el-step title="审批确认" >
+              <template #description>
+                <div class="flex align-center ww100 mt10 mb20 depBox">
+                  <span lass="mr4">审批部门 : </span>
+                  <MOSTY.Department @getDepValue="getSPdep" v-model="listQuery.spSsbmdm" clearable :placeholder="listQuery.spSsbmmc ? listQuery.spSsbmmc : '' "  />
+                </div>
+              </template>
+            </el-step>
+        </el-steps>
+      </div>
     </div>
   </div>
   <ChooseMarks v-model="chooseMarksVisible" @choosed="choosed" :roleIds="roleIds" />
 </template>
 
 <script setup>
+import * as MOSTY from "@/components/MyComponents/index";
+import { getItem } from "@/utils/storage";
 import ChooseMarks from "@/components/ChooseList/ChooseMarks/index.vue";
 import MyTable from "@/components/aboutTable/MyTable.vue";
 import FormMessage from "@/components/aboutTable/FormMessage.vue";
@@ -133,7 +165,14 @@ const chooseDep = () =>{
 const init = (type, row) => {
   dialogForm.value = true;
   title.value = type == "add" ? "新增" : type == "detail" ? "详情" : "编辑";
-  disabled.value = type == "detail" ? true : false
+  disabled.value = type == "detail" ? true : false;
+  tableDate.tableConfiger.haveControls = type == "detail" ? false : true;
+  if(type == 'add'){
+    listQuery.value.sqrXm = getItem("USERNAME");
+    listQuery.value.bkfqrSfzh = getItem("idEntityCard");
+    listQuery.value.sqrSsbmmc = getItem("deptId")[0].deptName;;
+    listQuery.value.sqrSsbmdm = getItem("deptId")[0].deptCode;;
+  }
   setTimeout(()=>{ showInfo.value = true; },5)
   if (row) getDataById(row.id);
 };
@@ -148,8 +187,6 @@ const getDataById = (id) => {
 
 // 选择标签
 const choosed = (val) => {
-  console.log(val);
-  
     listQuery.value.bqList = val.map(v=>{
       return { bqZl:v.bqLb , bqId:v.id, bqLx:v.bqLx, bqLb:v.bqLb, bqMc:v.bqMc, bqDm:v.bqDm }
     });
@@ -207,8 +244,27 @@ defineExpose({ init });
 }
 
 .boxlist {
-  width: 99%;
+  width: calc(99% - 50px);
   margin-top: 10px;
   overflow: hidden;
 }
+.depBox{
+    border: 1px solid #e9e9e9;
+    width: 305px;
+    padding: 0 0 0 4px;
+    border-radius: 4px;
+    ::v-deep .el-input__inner{
+        border: none;
+    }
+    ::v-deep .el-cascader .el-input.is-focus .el-input__inner{
+        border-color: transparent !important;
+    }
+    ::v-deep .el-input__inner:focus {
+        box-shadow: none;
+    }
+    ::v-deep .el-input.is-disabled .el-input__inner{
+        border-color: transparent !important;
+    }
+  
+}
 </style>
diff --git a/src/views/backOfficeSystem/ResearchJudgment/DatAcquisition/components/addForm.vue b/src/views/backOfficeSystem/ResearchJudgment/DatAcquisition/components/addForm.vue
index 6a818b8..a3a9a26 100644
--- a/src/views/backOfficeSystem/ResearchJudgment/DatAcquisition/components/addForm.vue
+++ b/src/views/backOfficeSystem/ResearchJudgment/DatAcquisition/components/addForm.vue
@@ -22,7 +22,7 @@
         <template #scfj>
           <div style="width: 100%;padding-left: 50px;">
             <div>上传附件:<span class="f12">（可附电子表格、Word文档、图像、音视频文件）</span> </div>
-            <div><MOSTY.Upload :showBtn="true" :limit="10" v-model="fjdz" /> </div>
+            <div><MOSTY.Upload :showBtn="true" :isImg="false" :limit="10" v-model="fjdz" /> </div>
           </div>
         </template>
       </FormMessage>