From c1136d8429f660335535afe8ad7c828c16eb7199 Mon Sep 17 00:00:00 2001
From: lxp <1928192722@qq.com>
Date: 星期一, 10 三月 2025 15:28:41 +0800
Subject: [PATCH] Merge branch 'dev' of http://114.132.189.42:9002/r/center-lims-before-ruoyi into dev
---
src/views/CNAS/resourceDemand/standardMaterialAccept/component/AddRecord.vue | 39 +++++++++++----------------------------
1 files changed, 11 insertions(+), 28 deletions(-)
diff --git a/src/views/CNAS/resourceDemand/standardMaterialAccept/component/AddRecord.vue b/src/views/CNAS/resourceDemand/standardMaterialAccept/component/AddRecord.vue
index dc48446..4a762ab 100644
--- a/src/views/CNAS/resourceDemand/standardMaterialAccept/component/AddRecord.vue
+++ b/src/views/CNAS/resourceDemand/standardMaterialAccept/component/AddRecord.vue
@@ -10,14 +10,8 @@
<el-form-item label="鐩稿叧闄勪欢" prop="file">
<div class="table-between">
<el-input v-model="acceptance.file" style="width: 80%;" disabled></el-input>
- <el-upload
- ref="upload"
- style="float: right;"
- :headers="uploadHeader"
- :action="action"
- :show-file-list="false"
- :on-success="onSuccess"
- >
+ <el-upload ref="upload" style="float: right;" :headers="uploadHeader" :action="action"
+ :show-file-list="false" :on-success="onSuccess">
<el-button type="primary">
闄勪欢涓婁紶
</el-button>
@@ -46,28 +40,17 @@
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="娓呭崟" prop="substanceId"
- :rule="[{ required: true, message: '璇烽�夋嫨娓呭崟', trigger: 'change' }]">
+ <el-form-item label="娓呭崟" prop="substanceId" :rule="[{ required: true, message: '璇烽�夋嫨娓呭崟', trigger: 'change' }]">
<el-select v-model="acceptance.substanceId" placeholder="璇烽�夋嫨" style="width: 100%">
- <el-option
- v-for="item in options"
- :key="item.value"
- :label="item.name"
- :value="item.id">
+ <el-option v-for="item in options" :key="item.value" :label="item.name" :value="item.id">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="鍒拌揣鏃ユ湡" prop="arriveDate">
- <el-date-picker
- v-model="acceptance.arriveDate"
- align="right"
- type="date"
- placeholder="閫夋嫨鏃ユ湡"
- style="width: 100%"
- value-format="yyyy-MM-dd"
- >
+ <el-date-picker v-model="acceptance.arriveDate" align="right" type="date" placeholder="閫夋嫨鏃ユ湡"
+ style="width: 100%" value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
</el-col>
@@ -169,7 +152,7 @@
},
methods: {
openDialog(id) {
- if(id) {
+ if (id) {
this.getDetail(id)
} else {
this.clearForm()
@@ -178,7 +161,7 @@
},
getDetail(id) {
this.loading = true
- getAcceptanceDetails({id: id}).then(res => {
+ getAcceptanceDetails({ id: id }).then(res => {
this.acceptance = res.data.acceptance
this.list = res.data.list
this.loading = false
@@ -224,8 +207,8 @@
}
this.acceptance.list = this.HaveJson(this.list)
this.submitLoading = true
- if(this.acceptance.id) {
- updateAcceptance({acceptance: this.acceptance, list: this.list}).then(res => {
+ if (this.acceptance.id) {
+ updateAcceptance({ acceptance: this.acceptance, list: this.list }).then(res => {
this.$message.success('缂栬緫鎴愬姛')
this.submitLoading = false
this.closeDialog()
@@ -234,7 +217,7 @@
this.submitLoading = false
})
} else {
- addAcceptance({acceptance: this.acceptance, list: this.list}).then(res => {
+ addAcceptance({ acceptance: this.acceptance, list: this.list }).then(res => {
this.$message.success('鏂板鎴愬姛')
this.closeDialog()
this.$emit('submit')
--
Gitblit v1.9.3