From adedb02c2f5c0dace9ac3c67932f03caa17ab385 Mon Sep 17 00:00:00 2001
From: jinna <jn517618@163.com>
Date: Wed, 25 Mar 2026 10:31:37 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=A8=E9=87=8F=E5=8F=8A=E4=BB=93=E7=AE=A1?=
 =?UTF-8?q?=E7=BC=BA=E9=99=B7=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/trialStandard.vue                |  2 +-
 .../warehouseManagement/materialMaintenance.vue | 17 ++++++++++++++---
 .../warehouseManagement/materialPreserve.vue    |  3 ++-
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/src/views/productionTesting/components/trialStandard.vue b/src/views/productionTesting/components/trialStandard.vue
index ed5910c..018c60a 100644
--- a/src/views/productionTesting/components/trialStandard.vue
+++ b/src/views/productionTesting/components/trialStandard.vue
@@ -321,7 +321,7 @@ export default {
         handleEdit(row,index) {
             getDetail({id:row.id}).then(res =>{
                 console.log('res--------------',res)
-                if(JSON.stringify(res.data.data.attach) != '{}'){
+                if(res.data.data.attach && JSON.stringify(res.data.data.attach) != '{}'){
                     this.fileList = [
                         {
                             name:res.data.data.attach.originalName,
diff --git a/src/views/warehouseManagement/materialMaintenance.vue b/src/views/warehouseManagement/materialMaintenance.vue
index f5b65f6..c4108dd 100644
--- a/src/views/warehouseManagement/materialMaintenance.vue
+++ b/src/views/warehouseManagement/materialMaintenance.vue
@@ -10,8 +10,8 @@
             <template #materialGoods="{ row }">{{ row.materialGoods.goodsCode }}</template>
             <template #menu-left>
                 <div style="display: flex;">
-                    <el-input v-model="goodsCode"></el-input>
-                    <el-button type="primary" style="margin-left: 10px;">新增</el-button>
+                    <el-input v-model="goodsCode" placeholder="请输入物料编码"></el-input>
+                    <el-button type="primary" style="margin-left: 10px;" @click="handleAdd">新增</el-button>
                 </div>
             </template>
         </avue-crud>
@@ -491,6 +491,18 @@ export default {
 
     },
     methods: {
+        handleAdd(){
+            if(this.goodsCode == ''){
+                this.$message.error('请填写物料编码')
+                return
+            }
+            addGoods(this.goodsCode).then(res =>{
+                if(res.data.code == 200){
+                    this.$message.success('添加成功')
+                    this.onLoad()
+                }
+            })
+        },
         searchChange(params, done){
             this.query = params;
             this.page.currentPage = 1;
@@ -502,7 +514,6 @@ export default {
             this.onLoad()
         },
         beforeOpen(done, type){
-            console.log('form-----------------',this.form)
             if(type == 'edit'){
                 this.form.minWarning = this.form.minWarning != '' ? this.form.minWarning : false
                 this.form.reissueType = (this.form.reissueType && this.form.reissueType != -1) ? this.form.reissueType : 0
diff --git a/src/views/warehouseManagement/materialPreserve.vue b/src/views/warehouseManagement/materialPreserve.vue
index 51df5d9..9a608fd 100644
--- a/src/views/warehouseManagement/materialPreserve.vue
+++ b/src/views/warehouseManagement/materialPreserve.vue
@@ -4,7 +4,7 @@
             @row-del="rowDel" @search-change="searchChange" @search-reset="searchReset"
             @row-save="rowSave" @row-update="rowUpdate" :before-open="beforeOpen"
             @selection-change="selectionChange" @current-change="currentChange" @size-change="sizeChange"
-            @refresh-change="refreshChange" @on-load="onLoad">
+            @refresh-change="refreshChange" @on-load="onLoad" >
             <!-- <template #goodsCode="{ row }">{{ row.coGoods.goodsCode }}</template>
             <template #goodsName="{ row }">{{ row.coGoods.goodsName }}</template>
             <template #bsBasicClass="{ row }">{{ row.bsBasicClass.name }}</template>
@@ -469,6 +469,7 @@ export default {
         beforeOpen(done, type) {
             if (['edit', 'view'].includes(type)) {
                 console.log('form---------------------',this.form)
+                this.form.turnover = this.form.turnover + ''
                 this.form.goodsId = this.form.goodsId + ''
             }
             done();