feat(crm/order): 添加合同号字段并创建订单绑定功能
- 在订单编辑、详情和表格中添加合同号字段 - 创建新的OrderTable组件用于订单选择 - 添加发货单与订单的绑定功能 - 在运单详情中显示合同号信息 - 调整表格列宽和字体大小
This commit is contained in:
@@ -33,7 +33,7 @@
|
||||
<el-table-column label="数量" align="center" prop="quantity" />
|
||||
<el-table-column label="重量" align="center" prop="weight" />
|
||||
<!-- <el-table-column label="单价" align="center" prop="unitPrice" /> -->
|
||||
<el-table-column label="备注" align="center" prop="remark" />
|
||||
<el-table-column label="备注" align="center" prop="remark" show-overflow-tooltip />
|
||||
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
||||
<template slot-scope="scope">
|
||||
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)">修改</el-button>
|
||||
@@ -106,7 +106,7 @@
|
||||
<el-form-item label="单价" prop="unitPrice">
|
||||
<el-input v-model="form.unitPrice" placeholder="请输入单价" />
|
||||
</el-form-item>
|
||||
<el-form-item label="备注" prop="remark">
|
||||
<el-form-item label="备注" prop="remark" >
|
||||
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
|
||||
@@ -34,6 +34,10 @@
|
||||
<span class="label">电话:</span>
|
||||
<div class="editable-input transparent-input" contenteditable>{{ localWaybill.principalPhone }}</div>
|
||||
</div>
|
||||
<div class="header-right">
|
||||
<span class="label">合同号:</span>
|
||||
<div class="editable-input transparent-input" contenteditable>{{ localWaybill.contractCode }}</div>
|
||||
</div>
|
||||
<div class="header-center">
|
||||
<span class="label">车牌:</span>
|
||||
<div class="editable-input transparent-input" contenteditable>{{ localWaybill.licensePlate }}</div>
|
||||
@@ -54,9 +58,9 @@
|
||||
<th>规格</th>
|
||||
<th>材质</th>
|
||||
<!-- <th>数量(件)</th> -->
|
||||
<th>重量(T)</th>
|
||||
<!-- <th>单价</th> -->
|
||||
|
||||
<th>重量(t)</th>
|
||||
<th>单价</th>
|
||||
<th>备注</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
@@ -83,7 +87,8 @@
|
||||
placeholder="0" /></td> -->
|
||||
<td><input type="number" class="table-input transparent-input" v-model.number="item.weight"
|
||||
placeholder="0.00" /></td>
|
||||
<!-- <td><input type="text" class="table-input transparent-input" v-model="item.unitPrice" /></td> -->
|
||||
<td><div class="table-input transparent-input" contenteditable>{{ item.unitPrice }}</div></td>
|
||||
<td><div class="table-input transparent-input" contenteditable>{{ item.remark }}</div></td>
|
||||
</tr>
|
||||
<!-- 加粗最后一行的线 -->
|
||||
<tr style="height: 0;">
|
||||
@@ -99,6 +104,8 @@
|
||||
<!-- <td><input type="number" class="table-input transparent-input" v-model.number="item.quantity"
|
||||
placeholder="0" /></td> -->
|
||||
<td style="height: 0;"></td>
|
||||
<td style="height: 0;"></td>
|
||||
<td style="height: 0;"></td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
@@ -207,7 +214,8 @@ export default {
|
||||
principal: newVal.principal || '',
|
||||
principalPhone: newVal.principalPhone || '',
|
||||
licensePlate: newVal.licensePlate || '',
|
||||
pickupLocation: newVal.pickupLocation || ''
|
||||
pickupLocation: newVal.pickupLocation || '',
|
||||
contractCode: newVal.contractCode || ''
|
||||
};
|
||||
}
|
||||
},
|
||||
@@ -551,7 +559,7 @@ export default {
|
||||
line-height: 6mm;
|
||||
text-align: center;
|
||||
vertical-align: middle;
|
||||
font-size: 18px;
|
||||
font-size: 16px;
|
||||
font-weight: 900;
|
||||
padding: 0;
|
||||
overflow: hidden;
|
||||
@@ -561,7 +569,7 @@ export default {
|
||||
/* 表格列宽设置 */
|
||||
.waybill-table th:nth-child(1),
|
||||
.waybill-table td:nth-child(1) {
|
||||
width: 60px;
|
||||
width: 70px;
|
||||
/* 品名 */
|
||||
}
|
||||
|
||||
@@ -573,37 +581,37 @@ export default {
|
||||
|
||||
.waybill-table th:nth-child(3),
|
||||
.waybill-table td:nth-child(3) {
|
||||
width: 40px;
|
||||
width: 50px;
|
||||
/* 包装 */
|
||||
}
|
||||
|
||||
.waybill-table th:nth-child(4),
|
||||
.waybill-table td:nth-child(4) {
|
||||
width: 80px;
|
||||
width: 90px;
|
||||
/* 仓库位置 */
|
||||
}
|
||||
|
||||
.waybill-table th:nth-child(5),
|
||||
.waybill-table td:nth-child(5) {
|
||||
width: 40px;
|
||||
width: 60px;
|
||||
/* 结算 */
|
||||
}
|
||||
|
||||
.waybill-table th:nth-child(6),
|
||||
.waybill-table td:nth-child(6) {
|
||||
width: 80px;
|
||||
width: 70px;
|
||||
/* 原料厂家 */
|
||||
}
|
||||
|
||||
.waybill-table th:nth-child(7),
|
||||
.waybill-table td:nth-child(7) {
|
||||
width: 100px;
|
||||
width: 110px;
|
||||
/* 卷号 */
|
||||
}
|
||||
|
||||
.waybill-table th:nth-child(8),
|
||||
.waybill-table td:nth-child(8) {
|
||||
width: 80px;
|
||||
width: 90px;
|
||||
/* 规格 */
|
||||
}
|
||||
|
||||
@@ -620,18 +628,24 @@ export default {
|
||||
|
||||
} */
|
||||
|
||||
/* 重量(kg) */
|
||||
.waybill-table th:nth-child(10),
|
||||
.waybill-table td:nth-child(10) {
|
||||
width: 80px;
|
||||
/* 重量(kg) */
|
||||
width: 70px;
|
||||
|
||||
}
|
||||
|
||||
/* 单价 */
|
||||
/* .waybill-table th:nth-child(12),
|
||||
.waybill-table td:nth-child(12) {
|
||||
width: 40px;
|
||||
.waybill-table th:nth-child(11),
|
||||
.waybill-table td:nth-child(11) {
|
||||
width: 50px;
|
||||
}
|
||||
|
||||
} */
|
||||
/* 备注 */
|
||||
.waybill-table th:nth-child(12),
|
||||
.waybill-table td:nth-child(12) {
|
||||
/* width: 40px; */
|
||||
}
|
||||
|
||||
|
||||
.waybill-table th {
|
||||
@@ -654,7 +668,7 @@ export default {
|
||||
outline: none;
|
||||
background: transparent;
|
||||
/* font-family: inherit; */
|
||||
font-size: 18px;
|
||||
font-size: 16px;
|
||||
line-height: 6mm;
|
||||
text-align: center;
|
||||
vertical-align: middle;
|
||||
|
||||
Reference in New Issue
Block a user