From 40147b6c8bc3681b27af2bac46567a7ec9e76874 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Tue, 12 May 2026 10:28:36 +0800
Subject: [PATCH] =?UTF-8?q?2026-05-12=20RoHs=E5=8A=9F=E8=83=BD=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/oss/oss.js                      |  2 ++
 src/views/modules/oss/ossComponents.vue | 42 ++++++++++++++++++++++---
 src/views/modules/rohs/rohsRecord.vue   |  2 ++
 3 files changed, 42 insertions(+), 4 deletions(-)

diff --git a/src/api/oss/oss.js b/src/api/oss/oss.js
index f3c8054..f66af29 100644
--- a/src/api/oss/oss.js
+++ b/src/api/oss/oss.js
@@ -14,6 +14,8 @@ export const ossUpload = (data) => createAPI(`/oss/upload`,'post',data)
 
 export const ossUpgrade = (data) => createAPI(`/oss/upgrade`,'post',data)
 
+export const getOssNextFileNo = (params) => createAPI(`/oss/nextFileNo`,'get',params)
+
 export const queryOss = (data) => createAPI(`/oss`,'post',data)
 
 export const removeOss = (data) => createAPI(`/oss/remove`,'post',data)
diff --git a/src/views/modules/oss/ossComponents.vue b/src/views/modules/oss/ossComponents.vue
index d65c6d8..8c5b100 100644
--- a/src/views/modules/oss/ossComponents.vue
+++ b/src/views/modules/oss/ossComponents.vue
@@ -1,5 +1,5 @@
 <script>
-import {ossUpload, ossUpgrade, previewOssFileById, queryOss, removeOss} from "../../../api/oss/oss";
+import {getOssNextFileNo, ossUpload, ossUpgrade, previewOssFileById, queryOss, removeOss} from "../../../api/oss/oss";
 
 export default {
   name: "ossComponents",
@@ -32,6 +32,10 @@ export default {
       type:String,
       default:'单号'
     },
+    showOrderRef2:{
+      type:Boolean,
+      default:true
+    },
     disabled:{
       type:Boolean,
       default:false
@@ -64,6 +68,10 @@ export default {
       type: Boolean,
       default: false
     },
+    autoFileNo: {
+      type: Boolean,
+      default: false
+    },
     enableUpgrade: {
       type: Boolean,
       default: false
@@ -135,8 +143,28 @@ export default {
       this.ossForm.fileNo = '';
       this.ossForm.rev = 1;
       this.ossForm.remark = '';
+      if (this.requireFileNoRev && this.autoFileNo) {
+        this.loadAutoFileNo();
+      }
       this.ossVisible = true
     },
+    loadAutoFileNo () {
+      if (!this.orderRef1) {
+        return
+      }
+      getOssNextFileNo({ site: this.orderRef1 }).then(({data}) => {
+        if (data && data.code === 0) {
+          this.ossForm.fileNo = data.fileNo || ''
+        } else {
+          this.$message.warning(data.msg || '自动获取文件编码失败，请手动输入')
+        }
+      }).catch((error) => {
+        const errorMsg = error.response && error.response.data && error.response.data.msg
+          ? error.response.data.msg
+          : (error.message || '自动获取文件编码失败，请手动输入')
+        this.$message.warning(errorMsg)
+      })
+    },
     onExceedFileLimit(){
       this.$message.warning('当前场景仅允许上传1个文件');
     },
@@ -230,10 +258,15 @@ export default {
         this.$message.error('请选择需要上传的新版本文件');
         return;
       }
+      if (!this.upgradeForm.newRev || this.upgradeForm.newRev <= this.upgradeForm.currentRev) {
+        this.$message.error('新版本号必须大于当前版本号');
+        return;
+      }
       let formData = new FormData();
       formData.append('file', this.upgradeFileList[0].raw);
       formData.append('sourceId', this.upgradeForm.sourceId);
       formData.append('fileRemark', this.upgradeForm.fileRemark || '');
+      formData.append('newRev', this.upgradeForm.newRev);
       this.upgradeLoading = true;
       ossUpgrade(formData).then(({data})=>{
         if (data && data.code === 0){
@@ -447,7 +480,7 @@ export default {
   <el-dialog :title="title" :visible.sync="ossVisible" v-drag width="400px" append-to-body :close-on-click-modal="false">
     <el-form ref="form" :model="ossForm" label-width="80px" label-position="top">
       <el-row :gutter="10">
-        <el-col :span="12">
+        <el-col :span="12" v-if="showOrderRef2">
           <el-form-item :label="label">
             <el-input v-model="ossForm.orderRef2" readonly></el-input>
           </el-form-item>
@@ -460,7 +493,8 @@ export default {
         </el-col>
         <el-col :span="12" v-if="requireFileNoRev">
           <el-form-item label="版本号">
-            <el-input-number v-model="ossForm.rev" :min="1" :step="1" controls-position="right" style="width: 100%;"></el-input-number>
+            <el-input class="inlineNumber numInput" v-model="ossForm.rev" :min="1" :step="1" type="number" style="width: 100%;"></el-input>
+<!--            <el-input-number v-model="ossForm.rev" :min="1" :step="1" controls-position="right" style="width: 100%;"></el-input-number>-->
           </el-form-item>
         </el-col>
         <el-col :span="24">
@@ -506,7 +540,7 @@ export default {
         </el-col>
         <el-col :span="12">
           <el-form-item label="新版本">
-            <el-input :value="upgradeForm.newRev" readonly></el-input>
+            <el-input-number v-model="upgradeForm.newRev" :min="1" :step="1" controls-position="right" style="width: 100%;"></el-input-number>
           </el-form-item>
         </el-col>
         <el-col :span="24">
diff --git a/src/views/modules/rohs/rohsRecord.vue b/src/views/modules/rohs/rohsRecord.vue
index d40172d..bf940d7 100644
--- a/src/views/modules/rohs/rohsRecord.vue
+++ b/src/views/modules/rohs/rohsRecord.vue
@@ -338,7 +338,9 @@
                   :disabled="showModalFlag || modalData.status === '已完成'"
                   :enable-upgrade="!showModalFlag && modalData.status !== '已完成'"
                   :require-file-no-rev="true"
+                  :auto-file-no="true"
                   :single-upload="true"
+                  :show-order-ref2="false"
                   label="序列号"
                   :height="180"
                   style="margin-top: 2px"