From e5454b769d44a34af423bf87ac8a740bf8c20341 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期二, 29 四月 2025 13:25:29 +0800
Subject: [PATCH] Merge branch 'dev' into dev_tides
---
src/views/business/materialOrder/customsInspectionView.vue | 34 +++++++++++++++++-----------------
1 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/src/views/business/materialOrder/customsInspection.vue b/src/views/business/materialOrder/customsInspectionView.vue
similarity index 98%
copy from src/views/business/materialOrder/customsInspection.vue
copy to src/views/business/materialOrder/customsInspectionView.vue
index e9a28fa..33b7687 100644
--- a/src/views/business/materialOrder/customsInspection.vue
+++ b/src/views/business/materialOrder/customsInspectionView.vue
@@ -32,17 +32,17 @@
<el-form ref="addObj" :inline="true" :model="addObj" :rules="addObjRules" label-width="90px">
<el-row>
<el-col :span="6">
- <el-form-item class="addObj-form-item" label="閲囪喘璁㈠崟鍙�:">
+ <el-form-item class="addObj-form-item" label="閲囪喘璁㈠崟鍙�:" prop="orderNo">
<el-input v-model="addObj.orderNo" class="addObj-info" clearable disabled placeholder="" size="small"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item class="addObj-form-item" label="濮旀墭鍗曚綅:">
+ <el-form-item class="addObj-form-item" label="濮旀墭鍗曚綅:" prop="company">
<el-input v-model="addObj.company" class="addObj-info" clearable disabled placeholder="" size="small"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item class="addObj-form-item" label="鎺ユ敹鏃堕棿:">
+ <el-form-item class="addObj-form-item" label="鎺ユ敹鏃堕棿:" prop="receiverDate">
<el-date-picker
v-model="addObj.receiverDate"
disabled
@@ -55,29 +55,29 @@
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item class="addObj-form-item" label="闆朵欢鍙�:">
+ <el-form-item class="addObj-form-item" label="闆朵欢鍙�:" prop="partNo">
<el-input v-model="addObj.partNo" class="addObj-info" clearable disabled placeholder="" size="small"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
- <el-form-item class="addObj-form-item" label="鏍峰搧鍚嶇О:">
+ <el-form-item class="addObj-form-item" label="鏍峰搧鍚嶇О:" prop="sample">
<el-input v-model="addObj.sample" class="addObj-info" clearable disabled placeholder="" size="small"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item class="addObj-form-item" label="鏍峰搧鎬绘暟:">
+ <el-form-item class="addObj-form-item" label="鏍峰搧鎬绘暟:" prop="qtyArrived">
<el-input v-model="addObj.qtyArrived" class="addObj-info" clearable disabled placeholder="" size="small"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item class="addObj-form-item" label="鎶ユ浜�:">
+ <el-form-item class="addObj-form-item" label="鎶ユ浜�:" prop="declareUser">
<el-input v-model="addObj.declareUser" class="addObj-info" clearable disabled size="small"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item class="addObj-form-item" label="鎵规鍙�:">
+ <el-form-item class="addObj-form-item" label="鎵规鍙�:" prop="updateBatchNo">
<el-input v-model="addObj.updateBatchNo" class="addObj-info" clearable disabled size="small"></el-input>
</el-form-item>
</el-col>
@@ -133,7 +133,7 @@
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item class="addObj-form-item" label="澶囨敞:">
+ <el-form-item class="addObj-form-item" label="澶囨敞:" prop="remark">
<el-input v-model="addObj.remark" :autosize="{ minRows: 2, maxRows: 2}" :disabled="active>1" :placeholder="active>1 ? '' : '璇疯緭鍏�'" clearable
size="small" type="textarea"></el-input>
</el-form-item>
@@ -356,10 +356,9 @@
</span>
</el-dialog>
<el-dialog :close-on-click-modal="false" :close-on-press-escape="false"
- :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border
:show-close="false" :visible.sync="bsm3Dia"
title="鍖洪棿鍊煎～鍐�" width="800px">
- <el-table :data="editTable" height="80vh" style="width: 100%">
+ <el-table :data="editTable" height="80vh" style="width: 100%" :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border>
<!-- inspectionItemList -->
<el-table-column label="妫�楠岄」" prop="inspectionItemList" width="180">
</el-table-column>
@@ -450,7 +449,7 @@
} from "@/api/business/rawMaterialOrder";
export default {
- name: "CustomsInspection",
+ name: "CustomsInspectionView",
dicts: ['check_type', 'urgency_level'],
components: {},
props: {
@@ -609,6 +608,7 @@
watch: {
sampleList() {
this.addObj.method = null
+ this.productList = []
},
productList: {
deep: true,
@@ -652,11 +652,9 @@
this.customsInspection = this.$route.query.customsInspection
this.getInfo();
},
- getInfo() {
- this.getUserNowList() // 鑾峰彇褰撳墠鐢ㄦ埛淇℃伅
- this.selectStandardMethods() // 鑾峰彇妫�楠屾爣鍑嗕笅鎷夋鏁版嵁
- this.getInfo() // 鑾峰彇鏁版嵁
- },
+ // getInfo() {
+ // this.getInfo() // 鑾峰彇鏁版嵁
+ // },
methods: {
save1 () {
if (this.bsm1DiaList.length > 0) {
@@ -697,6 +695,8 @@
},
// 鑾峰彇鏁版嵁
getInfo () {
+ this.getUserNowList() // 鑾峰彇褰撳墠鐢ㄦ埛淇℃伅
+ this.selectStandardMethods() // 鑾峰彇妫�楠屾爣鍑嗕笅鎷夋鏁版嵁
if (this.active == 2) {
let orderId = ''
if (!this.customsInspection.enterOrderId && this.customsInspection.quarterOrderId) {
--
Gitblit v1.9.3