From 723793a0aa8d69cbbb463830a3344dbd6655cee5 Mon Sep 17 00:00:00 2001
From: chenhaozhe <gaozhechen26@gmail.com>
Date: 星期六, 04 四月 2026 14:57:02 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI
---
src/views/basic/gyCar/gyCarEdit.vue | 26 ++++++++++++++++----------
1 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/src/views/basic/gyCar/gyCarEdit.vue b/src/views/basic/gyCar/gyCarEdit.vue
index 3769c34..5345abb 100644
--- a/src/views/basic/gyCar/gyCarEdit.vue
+++ b/src/views/basic/gyCar/gyCarEdit.vue
@@ -7,9 +7,9 @@
<el-button type="primary" @click="submitForm" :disabled="subDisabled"
>淇� 瀛�</el-button
>
- <el-button type="primary" @click="set_CheckBill(0, form)" :disabled="checkDisabled"
+ <!-- <el-button type="primary" @click="set_CheckBill(0, form)" :disabled="checkDisabled"
>瀹� 鏍�</el-button
- >
+ > -->
<el-button type="primary" @click="close">閫� 鍑�</el-button>
<!-- <el-button @click="cancel">鍙� 娑�</el-button> -->
</div>
@@ -64,7 +64,7 @@
</el-col>
</el-row>
<el-row>
- <el-col :span="16">
+ <!-- <el-col :span="16">
<el-form-item label="杞﹁締琛岄┒璇佺収鐗�" prop="HCarCardIDPic" label-width="8em">
<div
class="image-input-outer"
@@ -104,7 +104,7 @@
>
</el-upload>
</el-form-item>
- </el-col>
+ </el-col> -->
<el-col :span="8">
<el-form-item label="杞﹁締骞存鏃ユ湡" prop="HCarCheckDate" label-width="7em">
<el-date-picker
@@ -116,7 +116,7 @@
</el-col>
</el-row>
<el-row>
- <el-col :span="16">
+ <!-- <el-col :span="16">
<el-form-item label="杞﹁締鐓х墖" prop="HCarPric" label-width="8em">
<div class="image-input-outer" @click="openImagePreview('HCarPric')">
<el-input v-model="form.HCarPric"> </el-input>
@@ -153,7 +153,7 @@
>
</el-upload>
</el-form-item>
- </el-col>
+ </el-col> -->
<el-col :span="8">
<el-form-item label="杞﹀瀷" prop="HCarTypeName">
<el-input v-model="form.HCarTypeName" placeholder="璇烽�夋嫨杞﹀瀷" disabled>
@@ -169,8 +169,8 @@
</el-row>
<el-row>
<el-col :span="6">
- <el-form-item label="鎵�灞炲叕鍙�" prop="HCompName">
- <el-input v-model="form.HCompName" placeholder="璇烽�夋嫨鎵�灞炲叕鍙�" disabled>
+ <el-form-item label="鎵�灞炰緵搴斿晢" prop="HCompName">
+ <el-input v-model="form.HCompName" placeholder="璇烽�夋嫨鎵�灞炰緵搴斿晢" disabled>
<el-button
slot="append"
icon="el-icon-search"
@@ -440,6 +440,7 @@
rules: {
HNumber: [{ required: true, message: "杞︾墝鍙蜂笉鑳戒负绌�", trigger: "blur" }],
HName: [{ required: true, message: "杞﹁締鍚嶇О涓嶈兘涓虹┖", trigger: "blur" }],
+ HCarTypeName:[{required: true, message: "杞﹀瀷璇烽�夋嫨", trigger: "blur"}],
},
preUploadFiles: {
HCarPric: [], // 杞﹁締鐓х墖 鏂囦欢缂撳瓨(鍙繚瀛樹竴寮�)
@@ -814,6 +815,8 @@
//鏂板鑾峰彇鍗曟嵁鍙�
// this.getHBillNo();
let date = new Date();
+ this.form.HCompID = sessionStorage["HSupID"];
+ this.form.HCompName = sessionStorage["HSupName"];
this.form.HDate = moment(date).format("YYYY-MM-DDTHH:mm:ss");
this.resetForm();
if (this.OperationType == 1) {
@@ -853,7 +856,7 @@
HCarPric: data.杞﹁締鐓х墖,
HCarCardIDPic: data.杞﹁締琛岄┒璇佺収鐗�,
HCompID: data.HCompID,
- HCompName: data.鎵�灞炲叕鍙�,
+ HCompName: data.鎵�灞炰緵搴斿晢,
HModel: data.杞﹁締鍨嬪彿,
HColor: data.杞﹁締棰滆壊,
HBuyDate: data.璐拱鏃ユ湡 ? dayjs(data.璐拱鏃ユ湡).format("YYYY-MM-DD") : "",
@@ -1093,6 +1096,9 @@
this.subDisabled = true; //璁剧疆淇濆瓨鎸夐挳涓嶅彲鐢�
this.$modal.msgSuccess(response.data.Message);
this.addBtnShow = true;
+ }else {
+ // 鏄剧ず鍚庣杩斿洖鐨勯敊璇紙杞︾墝鍙烽噸澶嶃�佷繚瀛樺け璐ョ瓑锛�
+ this.$modal.msgError(response.data.Message);
}
})
.catch((error) => {
@@ -1159,7 +1165,7 @@
// 鎵�灞炲叕鍙�
this.iframeUrl = "/iframe/GySupplier";
- this.dialogTitle = "鎵�灞炲叕鍙�";
+ this.dialogTitle = "鎵�灞炰緵搴斿晢";
// this.materialShow = true;
this.openData = true;
}
--
Gitblit v1.9.1