From a1cc3f87d24ae2a19295c7b38faa17228cd863ec Mon Sep 17 00:00:00 2001
From: wangyi <2946747746@qq.com>
Date: 星期六, 28 二月 2026 15:11:24 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI
---
src/views/basic/gytransport/cgContractTransportBillList/Cg_ContractTransportBillEdit.vue | 153 +++++++++++++++++++++++++++++++++++----------------
1 files changed, 105 insertions(+), 48 deletions(-)
diff --git a/src/views/basic/gytransport/cgContractTransportBillList/Cg_ContractTransportBillEdit.vue b/src/views/basic/gytransport/cgContractTransportBillList/Cg_ContractTransportBillEdit.vue
index 0412f6c..0946f36 100644
--- a/src/views/basic/gytransport/cgContractTransportBillList/Cg_ContractTransportBillEdit.vue
+++ b/src/views/basic/gytransport/cgContractTransportBillList/Cg_ContractTransportBillEdit.vue
@@ -17,7 +17,7 @@
<el-tab-pane label="鍩烘湰淇℃伅" name="first">
<el-row>
<el-col :span="6">
- <el-form-item label="鍗曟嵁鍙�" prop="HBillNo">
+ <el-form-item label="鍗曟嵁鍙�" prop="HBillNo" required>
<el-input v-model="form.HBillNo" placeholder="璇疯緭鍏ュ崟鎹彿" />
</el-form-item>
</el-col>
@@ -33,7 +33,7 @@
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="鍚堝悓缂栧彿" prop="HContractNumber">
+ <el-form-item label="鍚堝悓缂栧彿" prop="HContractNumber" required>
<el-input v-model="form.HContractNumber" placeholder="" />
</el-form-item>
</el-col>
@@ -49,8 +49,8 @@
</el-col>
<el-col :span="6">
- <el-form-item label="渚涘簲鍟�" prop="HSupName">
- <el-input v-model="form.HSupName" placeholder="璇烽�夋嫨渚涘簲鍟�" disabled>
+ <el-form-item label="鎵胯繍鍟�" prop="HSupName" required>
+ <el-input v-model="form.HSupName" placeholder="璇烽�夋嫨鎵胯繍鍟�" disabled>
<el-button
slot="append"
icon="el-icon-search"
@@ -62,7 +62,7 @@
</el-row>
<el-row>
<el-col :span="6">
- <el-form-item label="涓氬姟鍛�" prop="HEmpName">
+ <el-form-item label="涓氬姟鍛�" prop="HEmpName" required>
<el-input v-model="form.HEmpName" placeholder="璇烽�夋嫨" disabled>
<el-button
slot="append"
@@ -75,7 +75,7 @@
</el-row>
<el-row>
<el-col :span="6">
- <el-form-item label="甯佸埆" prop="HCurName">
+ <el-form-item label="甯佸埆" prop="HCurName" required>
<el-input v-model="form.HCurName" placeholder="璇烽�夋嫨璋冨叆甯佸埆" disabled>
<el-button
slot="append"
@@ -86,7 +86,7 @@
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="缁撶畻鏂瑰紡" prop="HSSName">
+ <el-form-item label="缁撶畻鏂瑰紡" prop="HSSName" required>
<el-input v-model="form.HSSName" placeholder="璇烽�夋嫨缁撶畻鏂瑰紡" disabled>
<el-button
slot="append"
@@ -98,11 +98,11 @@
</el-col>
<el-col :span="6">
<el-form-item label="姹囩巼" prop="HExRate">
- <el-input v-model="form.HExRate" placeholder="" />
+ <el-input v-model="form.HExRate" placeholder="" disabled/>
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="閮ㄩ棬" prop="HDeptName">
+ <el-form-item label="閮ㄩ棬" prop="HDeptName" required>
<el-input v-model="form.HDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" disabled>
<el-button
slot="append"
@@ -120,7 +120,7 @@
</el-row>
<el-row>
<el-col :span="6">
- <el-form-item label="缁勭粐" prop="HSTOCKINORGID" >
+ <el-form-item label="缁勭粐" prop="HSTOCKINORGID" required>
<el-select v-model="form.HSTOCKINORGID" placeholder="璇烽�夋嫨缁勭粐" :disabled="OperationType == 3" @change="StockInOrgChangeHandler">
<el-option
v-for="(item, index) in organizationList"
@@ -175,8 +175,9 @@
<el-form-item label="鍒跺崟鏃ユ湡" prop="HMakeDate">
<el-date-picker
v-model="form.HMakeDate"
- type="date"
+ type="datetime"
placeholder="閫夋嫨鍒跺崟鏃ユ湡"
+ value-format="yyyy-MM-dd HH:mm:ss"
disabled
>
</el-date-picker>
@@ -186,8 +187,9 @@
<el-form-item label="淇敼鏃ユ湡" prop="HUpDateDate">
<el-date-picker
v-model="form.HUpDateDate"
- type="date"
+ type="datetime"
placeholder="閫夋嫨瀹℃牳鏃ユ湡"
+ value-format="yyyy-MM-dd HH:mm:ss"
disabled
>
</el-date-picker>
@@ -197,8 +199,9 @@
<el-form-item label="瀹℃牳鏃ユ湡" prop="HCheckDate">
<el-date-picker
v-model="form.HCheckDate"
- type="date"
+ type="datetime"
placeholder="閫夋嫨瀹℃牳鏃ユ湡"
+ value-format="yyyy-MM-dd HH:mm:ss"
disabled
>
</el-date-picker>
@@ -208,8 +211,9 @@
<el-form-item label="鍏抽棴鏃ユ湡" prop="HCloseDate">
<el-date-picker
v-model="form.HCloseDate"
- type="date"
+ type="datetime"
placeholder="閫夋嫨鍏抽棴鏃ユ湡"
+ value-format="yyyy-MM-dd HH:mm:ss"
disabled
>
</el-date-picker>
@@ -318,7 +322,7 @@
</el-table-column>
- <el-table-column align="center" label="杩愯緭鏂瑰紡" width="120">
+ <el-table-column align="center" label="杞﹀瀷" width="120">
<template slot-scope="scope">
<el-input
v-model="scope.row.杩愯緭鏂瑰紡鍚嶇О"
@@ -335,13 +339,26 @@
</template>
</el-table-column>
<el-table-column align="center" label="璺濈锛堝叕閲岋級" width="120">
+ <template slot-scope="scope">
+ <el-input-number
+ v-model="scope.row.HDistance"
+ placeholder="璇疯緭鍏�"
+ :controls="false"
+ :min="0"
+
+ style="width: 100%"
+ />
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="杩愯緭鏃舵晥锛堟椂锛�" width="120">
<template slot-scope="scope">
- <el-input v-model="scope.row.HDistance" placeholder="璇疯緭鍏�" />
- </template>
- </el-table-column>
- <el-table-column align="center" label="杩愯緭鏃舵晥" width="120">
- <template slot-scope="scope">
- <el-input v-model="scope.row.HTransportTimes" placeholder="璇疯緭鍏�" />
+ <el-input-number
+ v-model="scope.row.HTransportTimes"
+ placeholder="璇疯緭鍏�"
+ :controls="false"
+ :min="0"
+ style="width: 100%"
+ />
</template>
</el-table-column>
<el-table-column align="center" label="杩愯緭绫诲瀷" width="120">
@@ -367,12 +384,24 @@
</el-table-column>
<el-table-column align="center" label="杩愯緭璐圭敤" width="120">
<template slot-scope="scope">
- <el-input v-model="scope.row.HMoney" placeholder="璇疯緭鍏�" />
+ <el-input-number
+ v-model="scope.row.HMoney"
+ placeholder="璇疯緭鍏�"
+ :controls="false"
+ :min="0"
+ style="width: 100%"
+ />
</template>
</el-table-column>
<el-table-column align="center" label="鍘嗗彶杩愯緭璐圭敤" width="120">
<template slot-scope="scope">
- <el-input v-model="scope.row.HMoney_His" placeholder="璇疯緭鍏�" />
+ <el-input-number
+ v-model="scope.row.HMoney_His"
+ placeholder="璇疯緭鍏�"
+ :controls="false"
+ :min="0"
+ style="width: 100%"
+ />
</template>
</el-table-column>
@@ -583,15 +612,17 @@
form: {},
// 琛ㄥ崟鏍￠獙
rules: {
- HDate: [{ required: true, message: "鏃ユ湡涓嶈兘涓虹┖", trigger: "blur" }],
- HSupName: [{ required: true, message: "寰�鏉ュ崟浣嶄笉鑳戒负绌�", trigger: "blur" }],
- HEmpName: [{ required: true, message: "涓氬姟鍛樹笉鑳戒负绌�", trigger: "blur" }],
- HMangerName: [{ required: true, message: "涓荤涓嶈兘涓虹┖", trigger: "blur" }],
- HSecManagerName: [{ required: true, message: "楠屾敹鍛樹笉鑳戒负绌�", trigger: "blur" }],
- HKeeperName: [{ required: true, message: "淇濈鍛樹笉鑳戒负绌�", trigger: "blur" }],
- HCurName: [{ required: true, message: "璋冨叆浠撳簱涓嶈兘涓虹┖", trigger: "blur" }],
- HSSName: [{ required: true, message: "璋冨嚭浠撳簱涓嶈兘涓虹┖", trigger: "blur" }],
- HDeptName: [{ required: true, message: "閮ㄩ棬涓嶈兘涓虹┖", trigger: "blur" }],
+ HDate: [{ required: true, message: "鏃ユ湡涓嶈兘涓虹┖", trigger: "blur" }],
+ HBillNo: [{ required: true, message: "鍗曟嵁鍙蜂笉鑳戒负绌�", trigger: "blur" }],
+ HContractNumber: [{ required: true, message: "鍚堝悓缂栧彿涓嶈兘涓虹┖", trigger: "blur" }],
+ HContractName: [{ required: true, message: "鍚堝悓鍚嶇О涓嶈兘涓虹┖", trigger: "blur" }],
+ HSupID: [{ required: true, message: "渚涘簲鍟嗕笉鑳戒负绌�", trigger: "blur" }],
+ HEmpID: [{ required: true, message: "涓氬姟鍛樹笉鑳戒负绌�", trigger: "blur" }],
+ HDeptID: [{ required: true, message: "閮ㄩ棬涓嶈兘涓虹┖", trigger: "blur" }],
+ HCurID: [{ required: true, message: "甯佸埆涓嶈兘涓虹┖", trigger: "blur" }],
+ HExRate: [{ required: true, message: "姹囩巼涓嶈兘涓虹┖", trigger: "blur" }],
+ HSTOCKINORGID: [{ required: true, message: "缁勭粐涓嶈兘涓虹┖", trigger: "change" }],
+ HSSName: [{ required: true, message: "缁撶畻鏂瑰紡涓嶈兘涓虹┖", trigger: "blur" }],
},
};
},
@@ -667,6 +698,7 @@
} else if (num == 2) {
this.form.HCurName = deptRow.璐у竵鍚嶇О;
this.form.HCurID = deptRow.HItemID;
+ this.form.HExRate = deptRow.姹囩巼;
this.CurrencyDialogShow = false;
this.openData = false;
} else if (num == 3) {
@@ -708,10 +740,10 @@
} else if (num == 5) {
this.form.HSSName = deptRow.缁撶畻鏂瑰紡鍚嶇О;
this.form.HSSID = deptRow.HItemID;
- this.form.HExRate = deptRow.姹囩巼;
+ //this.form.HExRate = deptRow.姹囩巼;
this.SettleStyleDialogShow = false;
this.openData = false;
- }else if (num == 7) {
+ }else if (num == 13) {
this.editData[this.zbIndex].HTransportCar = deptRow.HItemID;
this.editData[this.zbIndex].杩愯緭鏂瑰紡鍚嶇О = deptRow.杞﹀瀷鍚嶇О;
this.CarTypeShow = false;
@@ -732,6 +764,9 @@
deptClose() {
this.deptform = {};
this.openData = false;
+ this.$nextTick(() => {
+ this.showReset();
+ });
},
//琛ㄥ崟鍒濆鍖�
@@ -750,8 +785,8 @@
HExRate: 1,
HSSName: "",
HSSID: 0,
- HEmpName: "",
- HEmpID: "",
+ HEmpName: sessionStorage["HEmpName"] || "",
+ HEmpID: sessionStorage["HEmpID"] || 0,
HMangerName: "",
HMangerID: "",
HSecManagerName: "",
@@ -920,6 +955,7 @@
HDeleteDate: data[0].浣滃簾鏃ユ湡,
// HSTOCKOUTORGID: data[0].HSTOCKOUTORGID.toString(),
//HSTOCKINORGID: data[0].HSTOCKINORGID.toString(),
+ HSTOCKINORGID:sessionStorage["OrganizationID"],
},
};
//瀛愯〃
@@ -1070,19 +1106,36 @@
this.$refs["form"].validate((valid) => {
if (valid) {
let fhck = false;
- if (this.editData.length == 0) {
- fhck = true;
- this.$modal.msgError("娌℃湁鐗╂枡鏄庣粏璁板綍锛�");
- }
- this.editData.map((item, index) => {
- if (!item.HMaterID) {
+ const requiredFields = [
+ { field: 'HBillNo', name: '鍗曟嵁鍙�' },
+ { field: 'HContractNumber', name: '鍚堝悓缂栧彿' },
+ { field: 'HContractName', name: '鍚堝悓鍚嶇О' },
+ { field: 'HSupID', name: '渚涘簲鍟�' },
+ { field: 'HEmpID', name: '涓氬姟鍛�' },
+ { field: 'HDeptID', name: '閮ㄩ棬' },
+ { field: 'HCurID', name: '甯佸埆' },
+ { field: 'HExRate', name: '姹囩巼' },
+ { field: 'HSTOCKINORGID', name: '缁勭粐' },
+ { field: 'HSSName', name: '缁撶畻鏂瑰紡' }
+ ];
+ for (let i = 0; i < requiredFields.length; i++) {
+ const field = requiredFields[i].field;
+ const name = requiredFields[i].name;
+ if (!this.form[field] || this.form[field] === 0 || this.form[field] === '') {
fhck = true;
- this.$modal.msgError("绗�" + (index + 1) + "琛岋細鍣ㄥ叿鏈�夋嫨锛�");
- } else if (!item.HQty || item.HQty == 0) {
- fhck = true;
- this.$modal.msgError("绗�" + (index + 1) + "琛岋細鏁伴噺涓嶈兘涓�0锛�");
+ this.$modal.msgError(name + "涓嶈兘涓虹┖锛�");
}
- });
+ }
+
+ // this.editData.map((item, index) => {
+ // if (!item.HMaterID) {
+ // fhck = true;
+ // this.$modal.msgError("绗�" + (index + 1) + "琛岋細鍣ㄥ叿鏈�夋嫨锛�");
+ // } else if (!item.HQty || item.HQty == 0) {
+ // fhck = true;
+ // this.$modal.msgError("绗�" + (index + 1) + "琛岋細鏁伴噺涓嶈兘涓�0锛�");
+ // }
+ // });
this.$nextTick(() => {
if (!fhck) {
var Operation = null;
@@ -1110,7 +1163,7 @@
axios({
method: "post",
url:
- this.$baseUrl + "/Kf_MoveStockRequestBill/Kf_MoveStockRequestBillEdit",
+ this.$baseUrl + "/Cg_ContractTransportBillListController/Save%EF%BB%BFCg_ContractTransportBillList",
data: {
sMainSub: sMainSub,
},
@@ -1139,6 +1192,9 @@
this.gyEmployeeShow = false;
this.gySupplierShow = false;
this.AreaDialogShow = false;
+ this.CurrencyDialogShow = false;
+ this.SettleStyleDialogShow = false;
+ this.CarTypeShow = false;
},
// 鎵撳紑鏁版嵁鍒楄〃寮圭獥
openDataDialog(num, row) {
@@ -1146,6 +1202,7 @@
if (row) {
this.zbIndex = row.index - 1;
}
+
this.showReset();
if (num == 1) {
this.dialogTitle = "閮ㄩ棬鍒楄〃";
--
Gitblit v1.9.1