From 1b8b8bafca4fe4c3556bda5e66e3ff6252bd7acc Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期一, 16 六月 2025 14:27:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/tms/modules/outBound/OutboundOrderModal.vue | 82 +++++++++++++++++++++++++++++++++++++++-
1 files changed, 79 insertions(+), 3 deletions(-)
diff --git a/src/views/tms/modules/outBound/OutboundOrderModal.vue b/src/views/tms/modules/outBound/OutboundOrderModal.vue
index 9d1a4e7..8171597 100644
--- a/src/views/tms/modules/outBound/OutboundOrderModal.vue
+++ b/src/views/tms/modules/outBound/OutboundOrderModal.vue
@@ -18,7 +18,7 @@
</a-col>
<a-col :span="12">
<a-form-model-item label="鍑哄簱绫诲瀷" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="outStorehouseType">
- <j-dict-select-tag :disabled="disableSubmit" @change="handleTypeChange" type="list" v-model="model.outStorehouseType" dictCode="out_storehouse_type" placeholder="璇烽�夋嫨鍑哄簱绫诲瀷" disabled/>
+ <j-dict-select-tag :disabled="disableSubmit || addShow" @change="handleTypeChange" type="list" v-model="model.outStorehouseType" dictCode="out_storehouse_type" placeholder="璇烽�夋嫨鍑哄簱绫诲瀷"/>
</a-form-model-item>
</a-col>
</a-row>
@@ -31,6 +31,54 @@
<a-col :span="12">
<a-form-model-item label="棰嗙敤浜嬬敱" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="subjectMatter">
<a-input :disabled="disableSubmit" v-model="model.subjectMatter" placeholder="璇疯緭鍏ラ鐢ㄤ簨鐢�" ></a-input>
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ <a-row>
+ <a-col :span="12">
+ <a-form-model-item label="闆朵欢鍥惧彿" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="partDrawingNo">
+ <a-input :disabled="disableSubmit" v-model="model.partDrawingNo" placeholder="璇疯緭鍏ラ浂浠跺浘鍙�" ></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="12">
+ <a-form-model-item label="闆朵欢鍚嶇О" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="partName">
+ <a-input :disabled="disableSubmit" v-model="model.partName" placeholder="璇疯緭鍏ラ浂浠跺悕绉�" ></a-input>
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ <a-row>
+ <a-col :span="12">
+ <a-form-model-item label="闆朵欢鏉愭枡" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="partMaterial">
+ <a-input :disabled="disableSubmit" v-model="model.partMaterial" placeholder="璇疯緭鍏ラ浂浠舵潗鏂�" ></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="12">
+ <a-form-model-item label="宸ュ簭锛堝伐姝ュ彿锛�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="productionProcessesNo">
+ <a-input :disabled="disableSubmit" v-model="model.productionProcessesNo" placeholder="璇疯緭鍏ュ伐搴忥紙宸ユ鍙凤級" ></a-input>
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ <a-row>
+ <a-col :span="12">
+ <a-form-model-item label="鍔犲伐鎵规" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="batchCode">
+ <a-input :disabled="disableSubmit" v-model="model.batchCode" placeholder="璇疯緭鍏ュ姞宸ユ壒娆�" ></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="12">
+ <a-form-model-item label="鍔犲伐鏁伴噺" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="machiningCount">
+ <a-input-number :disabled="disableSubmit" v-model="model.machiningCount" placeholder="璇疯緭鍏ュ姞宸ユ暟閲�" :min="1" style="width: 100%"></a-input-number>
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ <a-row>
+ <a-col :span="12">
+ <a-form-model-item label="鍔犲伐璁惧" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="equipmentCode">
+ <a-input :disabled="disableSubmit" v-model="model.equipmentCode" placeholder="璇疯緭鍏ュ姞宸ヨ澶�" ></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="12">
+ <a-form-model-item label="绋嬪簭鍚�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="ncName">
+ <a-input :disabled="disableSubmit" v-model="model.ncName" placeholder="璇疯緭鍏ョ▼搴忓悕" ></a-input>
</a-form-model-item>
</a-col>
</a-row>
@@ -94,7 +142,22 @@
<div :key="col.dataIndex">
<a-input-number
v-if="col.dataIndex === 'outboundQuantity'"
- :disabled="record.quantity <= 1"
+ :disabled="record.accuracyClass === '1'"
+ :value="text"
+ @change="(e) => handleChange(e, record.key, col, index)"
+ :min="1"
+ />
+
+ <a-input-number
+ v-if="col.dataIndex === 'ratedLife'"
+ :disabled="record.quantity > 1"
+ :value="text"
+ @change="(e) => handleChange(e, record.key, col, index)"
+ :min="1"
+ />
+ <a-input-number
+ v-if="col.dataIndex === 'useLife'"
+ :disabled="record.quantity > 1"
:value="text"
@change="(e) => handleChange(e, record.key, col, index)"
:min="1"
@@ -206,6 +269,18 @@
align:"center",
dataIndex: 'outboundLocation'
},
+ // {
+ // title:'棰濆畾瀵垮懡',
+ // align:"center",
+ // dataIndex: 'ratedLife',
+ // scopedSlots: { customRender: 'ratedLife' },
+ // },
+ // {
+ // title:'浣跨敤瀵垮懡',
+ // align:"center",
+ // dataIndex: 'useLife',
+ // scopedSlots: { customRender: 'useLife' },
+ // },
// {
// title:'鍑哄簱鐘舵��;1.鏈嚭搴擄紱2.閮ㄥ垎鍑哄簱锛�3.鍑哄簱瀹屾垚',
// align:"center",
@@ -259,7 +334,8 @@
outboundQuantity: data[i].quantity,
storageLocation: data[i].warehouseId,
warehouseName: data[i].warehouseName,
- outboundLocation: data[i].positionCode
+ outboundLocation: data[i].positionCode,
+ accuracyClass:data[i].accuracyClass
})
}
this.ipagination.total = this.dataSource.length
--
Gitblit v1.9.3