移动端-通知公告模块-安全发布-新增文件编号自动拼接生成功能

src/view/announ/annexList.vue

@@ -24,16 +24,51 @@ try {
   deptInformation.value = jsonArray ? JSON.parse(jsonArray) : [];
 } catch (error) {
   deptInformation.value = [];
+  console.error('解析部门信息失败：', error)
 }
-const deptName = deptInformation.value[0].deptName
-const deptCode = deptInformation.value[0].deptCode
 
-const guid = () =>  {
-  function S4() {
-    return (((1+Math.random())*0x10000)|0).toString(16).substring(1);
-  }
-  return (S4()+S4()+S4()+S4()+S4()+S4()+S4()+S4())
+
+const deptName = deptInformation.value[0]?.deptName || ''
+const deptCode = deptInformation.value[0]?.deptCode || ''
+
+//  如果部门信息为空，给出提示
+if (!deptCode) {
+  console.warn('部门编码为空，可能影响数据保存')
 }
+
+
+
+// 添加：与Web端一致的 generateCode 函数
+const generateCode = () => {
+  // 获取当前日期并格式化为 YYYYMMDD
+  const now = new Date();
+  const year = now.getFullYear();
+  const month = String(now.getMonth() + 1).padStart(2, '0'); // 月份从0开始，需加1
+  const day = String(now.getDate()).padStart(2, '0');
+  const formattedDate = `${year}${month}${day}`;
+  
+  // 时间部分：HHmmss
+  const hours = String(now.getHours()).padStart(2, '0');
+  const minutes = String(now.getMinutes()).padStart(2, '0');
+  const seconds = String(now.getSeconds()).padStart(2, '0');
+  const formattedTime = `${hours}${minutes}${seconds}`;
+  
+  // 模拟生成三位流水号（可以根据需要替换为递增逻辑）
+  const sequenceNumber = Math.floor(Math.random() * 1000); // 随机生成 0-999
+  const paddedSequence = String(sequenceNumber).padStart(3, '0'); // 补零到三位
+  
+  // 拼接编号
+  return `LZFJ${formattedDate}${formattedTime}${paddedSequence}`;
+};
+
+// 使用 ref 存储生成的编号
+const generatedCode = ref(generateCode());
+
+// 定义重新生成编号的方法
+const regenerateCode = () => {
+  generatedCode.value = generateCode();
+};
+
 const formJieguo = ref({
   resultWhether:'',
   resultDetail:'',
@@ -49,13 +84,32 @@ const  userName1=localStorage.getItem('userName');
 
 const result=ref('')
 const fromVue=ref({})
+
+// 修复：新增时初始化基础字段（与Web端保持一致）
 if (route.query.mark) {
   planInfo = JSON.parse(route.query.mark)
 }
+
 console.log(planInfo);
 if (planInfo==-1){
-  result.value=guid()
-  console.log( result.value);
+  // 新增模式：初始化基础字段（与Web端handAdd函数保持一致）
+  regenerateCode() // 重新生成编号
+  result.value = generatedCode.value // 使用 generateCode 生成的编号
+  fromVue.value = {
+    id: '',  // 新增时 id 为空字符串
+    fileName: '',
+    fileType: '',
+    fileContent: '',
+    fileTime: '',  // 添加：Web端有此字段
+    filePeoples: '',  // 添加：Web端有此字段
+    fileSubmit: '',
+    remarks: '',
+    enable: '',
+    fileNumber: '',
+    yearValue: '',  // H5端特有
+    fileId: result.value
+  }
+  console.log('生成的 fileId:', result.value);
 }
 
 const resDetail=ref('')
@@ -80,7 +134,6 @@ if (planInfo==1) {
   console.log(planInfo);
   title = '修改安全文件'
   fromVue.value= JSON.parse(route.query.data)
-
   result.value=fromVue.value.fileId
   console.log(result.value);
 }
@@ -100,15 +153,18 @@ const planLevelList = [
 const isdisabled=ref(true)
 const isdisabled2=ref(true)
 const onSelect = (item) => {
-fromVue.value.fileContent = item.name
-
+  fromVue.value.fileContent = item.name
   showActionSheet.value=false
+  // 性质改变时也触发文件编号生成
+  generateFileSumbmit()
 }
 
 const onSelect2 = (item) => {
   fromVue.value.fileType=item.name
   showActionSheet2.value=false
-  }
+  // 文件类别改变时触发文件编号生成
+  generateFileSumbmit()
+}
 
 const displayFileName = ref('')
 const onSelect1 = (item) => {
@@ -119,6 +175,39 @@ const onSelect1 = (item) => {
   console.log(result.value);
   showActionSheet1.value = false
 }
+
+const yearOptions = Array.from({ length: 10 }, (_, i) => {
+  const year = currentYear.value - 5 + i;  // 修复：使用 currentYear.value
+  return {
+    text: String(year),
+    value: String(year)
+  };
+}).reverse();
+const showYearPicker = ref(false);
+
+const formData = ref({
+  year: String(currentYear.value),  // 修复：使用 currentYear.value
+  quarter: null
+})
+
+// 年份选择确认
+const onConfirmYear = (value) => {
+  let selectedYear = '';
+  if (value && value.selectedOptions && value.selectedOptions.length > 0) {
+    const selectedOption = value.selectedOptions[0];
+    selectedYear = typeof selectedOption === 'string' ? selectedOption : selectedOption.value || selectedOption.text;
+  } else if (typeof value === 'string') {
+    selectedYear = value;
+  }
+
+  formData.value.year = selectedYear;
+  fromVue.value.yearValue = selectedYear; // 修复：同步到 fromVue
+  showYearPicker.value = false;
+  // 触发文件编号生成，而不是调用不存在的 search()
+  generateFileSumbmit();
+}
+
+
 const questionIds = ref([])
 const actions=ref([])
 /*const getQuestionId = () => {
@@ -129,7 +218,7 @@ const actions=ref([])
       questionIds.value = response.data.data; // 先赋值给 questionIds.value
 
 
-      // ✅ 关键：使用 questionIds.value.map
+      // 关键：使用 questionIds.value.map
       actions.value = questionIds.value.map(item => ({
         name: item.ruleName,
         value: item.id
@@ -181,26 +270,73 @@ const handleTableDataUserDeptUpdate = async (nodeData) => {
 }
 
 const addEmergencyDrillPlan = async () => {
+  // 参数验证
+  if (!deptCode) {
+    showFailToast('获取部门信息失败，请重新登录')
+    return
+  }
+  
+  if (!result.value) {
+    showFailToast('文件ID生成失败，请重试')
+    return
+  }
+  
+  // 表单验证
+  if (!fromVue.value.fileName) {
+    showFailToast('请输入文件名称')
+    return
+  }
+  
+  if (!fromVue.value.fileType) {
+    showFailToast('请选择文件类别')
+    return
+  }
+  
   const loadingToast = showLoadingToast({
     duration: 0,
     message: '加载中',
     forbidClick: true
   })
-  var url = '/sgsafe/ResponFile/save1';
-  const params = {
-    json: JSON.stringify(fromVue.value)
-  }
-  proxy.$axios.post(url,params).then(res=>{
+  
+  try {
+    // 与Web端保持一致：只设置 addDeptCode，其他字段已经在 fromVue.value 中
+    fromVue.value.addDeptCode = deptCode
+    
+    // 确保 fileId 正确设置
+    if (!fromVue.value.fileId) {
+      fromVue.value.fileId = result.value
+    }
+    
+    // 确保文件编号已生成
+    if (!fromVue.value.fileSubmit && fromVue.value.fileType && fromVue.value.yearValue) {
+      generateFileSumbmit()
+    }
+    
+    // 调试：打印完整数据（与Web端保持一致）
+    console.log('保存的数据：', JSON.stringify(fromVue.value))
+    
+    var url = '/sgsafe/ResponFile/save1';
+    const params = {
+      json: JSON.stringify(fromVue.value)
+    }
+    
+    const res = await proxy.$axios.post(url, params)
+    
     if (res.data.code === 0) {
       loadingToast.close()
       showSuccessToast('保存成功')
       onClickLeft()
-
     } else {
       loadingToast.close()
-      showFailToast('操作失败!' + res.data.msg)
+      showFailToast('操作失败!' + (res.data.msg || '未知错误'))
     }
-  })
+  } catch (error) {
+    loadingToast.close()
+    console.error('保存失败：', error)
+    // 打印详细错误信息
+    console.error('错误详情：', error.response?.data || error)
+    showFailToast('保存失败：' + (error.message || '网络错误，请稍后重试'))
+  }
 }
 const showDatePicker = ref(false)
 const onDatePicker = (value) => {
@@ -214,24 +350,69 @@ const dicList = ref([])
 //获取字典集合
 import tools from '@/tools'
 const getDicList = () => {
-  tools.dic.getDicList(['systemTypes']).then((response => {
-
-   const rawData = response.data.data
-    dicList.value = rawData.systemTypes.map(item => ({
-      name: item.dicName,      // 必须有 name 字段！
-      code: item.dicCode       // 可选，保留原始 code 供后续使用
+  // 修复：使用 'fileTypes' 而不是 'systemTypes'
+  tools.dic.getDicList(['fileTypes']).then((response => {
+    const rawData = response.data.data
+    // 修复：使用 fileTypes 而不是 systemTypes，value 使用 dicName
+    dicList.value = rawData.fileTypes.map(item => ({
+      name: item.dicName,      // 使用 dicName
+      value: item.dicName       // value 也使用 dicName，与 web 端保持一致
     }));
     console.log(JSON.stringify(dicList.value))
   }))
 }
+
+// 新增：文件编号自动生成函数
+const generateFileSumbmit = () => {
+  let fileSubmit = ''
+  
+  // 1. 根据文件类别拼接前缀
+  if (fromVue.value.fileType && fromVue.value.fileType !== '其他') {
+    const prefixMap = {
+      '安全正式发文': '山信安管便字',
+      '安全管理便文': '山信软件安字',
+      '环保正式发文': '山信软件环字',
+      '安委会纪要': '山信软件纪要安委字'
+    }
+    const prefix = prefixMap[fromVue.value.fileType]
+    if (prefix) {
+      fileSubmit += prefix
+    }
+  }
+  
+  // 2. 拼接年份
+  if (fromVue.value.yearValue) {
+    fileSubmit += `〔${fromVue.value.yearValue}〕`
+  }
+  
+  // 3. 拼接编号
+  if (fromVue.value.fileNumber) {
+    fileSubmit += `${fromVue.value.fileNumber}号`
+  }
+  
+  // 更新文件编号
+  fromVue.value.fileSubmit = fileSubmit
+}
+
 onMounted(() => {
   const today = new Date()
   const year = today.getFullYear()
-  const month = today.getMonth() + 1 // 月份从 0 开始
+  const month = today.getMonth() + 1
   const day = today.getDate()
   currentDate.value = [year, month, day]
-  //selectedDateText.value = `${year}-${String(month).padStart(2, '0')}-${String(day).padStart(2, '0')}`
+  
+  // 新增：初始化年份值
+  if (!fromVue.value.yearValue) {
+    fromVue.value.yearValue = String(year)
+    formData.value.year = String(year)
+  }
+  
   getDicList()
+  
+  // 新增：如果是编辑模式，初始化文件编号生成
+  if (planInfo == 1) {
+    generateFileSumbmit()
+  }
 })
 const showActionSheet2=ref(false)
 /* 文件上传 */
@@ -240,7 +421,7 @@ import AttachmentS3 from '@/components/AttachmentS3.vue';
 const onSubmit = (values) => {
   addEmergencyDrillPlan()
 }
-const leaderKeyysr = guid();
+const leaderKeyysr = generateCode(); // 或者保留 guid 用于其他用途
 const PopupDepartmentLeaderNameRefysr = ref();
 const handleDepartmentLeaderNameysr = () => {
   PopupDepartmentLeaderNameRefysr.value.open();
@@ -266,12 +447,14 @@ const getDepartmentLeaderNameysr = (item) => {
     </van-sticky>
     <div class="scroll-container">
       <van-form @submit="onSubmit">
+        <!-- 修复：文件编号改为只读，提示自动生成 -->
         <van-field
           v-model="fromVue.fileSubmit"
           label="文件编号"
           name="fileSubmit"
           required
-          placeholder="请输入文件编号"
+          placeholder="选择文件类别、年份、编号后自动生成"
+          readonly
           :rules="[{required: true, message: '请输入文件编号'}]"
         />
 
@@ -280,7 +463,7 @@ const getDepartmentLeaderNameysr = (item) => {
           label="名称"
           name="fileName"
           required
-          placeholder="请输入文件编号"
+          placeholder="请输入文件名称"
           :rules="[{required: true, message: '请输入文件名称'}]"
         />
 
@@ -292,6 +475,33 @@ const getDepartmentLeaderNameysr = (item) => {
           required
           @click="showActionSheet2 = true"
         />
+        
+        <van-field
+          :model-value="fromVue.yearValue"
+          is-link
+          readonly
+          name="yearValue"
+          label="年份"
+          placeholder="点击选择年份"
+          @click="showYearPicker = true"
+        />
+        <van-popup v-model:show="showYearPicker" position="bottom">
+          <van-picker
+            :columns="yearOptions"
+            @confirm="onConfirmYear"
+            @cancel="showYearPicker = false"
+          />
+        </van-popup>
+        
+        <!-- 新增：编号输入框 -->
+        <van-field
+          v-model="fromVue.fileNumber"
+          label="编号"
+          name="fileNumber"
+          placeholder="请输入编号"
+          @input="generateFileSumbmit"
+        />
+        
         <van-field
           readonly
           v-model="fromVue.fileContent"
@@ -304,13 +514,14 @@ const getDepartmentLeaderNameysr = (item) => {
           v-model="fromVue.remarks"
           label="备注"
           name="remarks"
-
         />
+        
         <van-field label="附件上传" >
           <template #input>
             <AttachmentS3 :f-id="result" />
           </template>
         </van-field>
+        
         <div style="margin: 16px;">
           <van-button round block type="primary" native-type="submit">
             提交

src/view/knowledge/accidentList.vue

@@ -303,7 +303,7 @@ const actions=ref([])
       questionIds.value = response.data.data; // 先赋值给 questionIds.value
 
 
-      // ✅ 关键：使用 questionIds.value.map
+
       actions.value = questionIds.value.map(item => ({
         name: item.ruleName,
         value: item.id

src/view/knowledge/managerList.vue

@@ -216,7 +216,6 @@ const actions=ref([])
       questionIds.value = response.data.data; // 先赋值给 questionIds.value
 
 
-      // ✅ 关键：使用 questionIds.value.map
       actions.value = questionIds.value.map(item => ({
         name: item.ruleName,
         value: item.id

src/view/moneySafe/safeMoneyManagementList.vue

@@ -288,7 +288,6 @@ const actions=ref([])
       questionIds.value = response.data.data; // 先赋值给 questionIds.value
 
 
-      // ✅ 关键：使用 questionIds.value.map
       actions.value = questionIds.value.map(item => ({
         name: item.ruleName,
         value: item.id