diff --git a/src/views/distribution/inventory/CreateOrder.vue b/src/views/distribution/inventory/CreateOrder.vue
index 58385aaf..0d3fedbc 100644
--- a/src/views/distribution/inventory/CreateOrder.vue
+++ b/src/views/distribution/inventory/CreateOrder.vue
@@ -432,9 +432,9 @@
-
+
合计费用
- {{ totalCost }}
+ {{ totalCost }}
@@ -557,7 +557,7 @@
@@ -1371,6 +1371,7 @@ const details = reactive({
popUpShow: {
/** 订单选择 */
columnListVisited: false,
+ /** 是否继续开单 */
titleVisited: false,
},
/** 列表Dom节点 */
@@ -2315,14 +2316,14 @@ $borderColor: #172e60;
align-items: center;
font-size: 14px;
- &::before {
- content: '';
- display: block;
- width: 2px;
- height: 25px;
- background-color: var(--el-color-primary);
- margin-right: 10px;
- }
+ // &::before {
+ // content: '';
+ // display: block;
+ // width: 2px;
+ // height: 25px;
+ // background-color: var(--el-color-primary);
+ // margin-right: 10px;
+ // }
}
.table_row_number {
@@ -2417,4 +2418,21 @@ $borderColor: #172e60;
color: var(--el-color-primary);
font-weight: bold;
}
+
+.fwb {
+ display: flex;
+ align-items: center;
+ font-weight: bold;
+ color: var(--el-color-danger) !important;
+ position: relative;
+
+ &::before {
+ content: '';
+ margin-right: 10px;
+ display: block;
+ width: 2px;
+ height: 1rem;
+ background: #f00;
+ }
+}
diff --git a/src/views/waybill/CreateZeroOrder.vue b/src/views/waybill/CreateZeroOrder.vue
index eb9ebf6b..40ab8bba 100644
--- a/src/views/waybill/CreateZeroOrder.vue
+++ b/src/views/waybill/CreateZeroOrder.vue
@@ -367,6 +367,7 @@
合计费用
- {{ totalCost }}
+ {{ totalCost }}
@@ -560,6 +561,7 @@
v-model="query.payWay"
:teleported="false"
class="m-2"
+ @change="handlePayWay"
placeholder="付款方式"
>
+ 关闭
提交
-
- 关闭
+
+
+
+
+ 是否继续开单
+
+ 取 消
+ 确 认
+
+
+
@@ -869,7 +891,7 @@ const details = reactive
({
/** 支付方式 */
payType: '',
/** 付款方式 */
- payWay: '',
+ payWay: '2',
/** 现付 */
xianPay: 0,
/** 到付 */
@@ -884,13 +906,13 @@ const details = reactive({
/** 三方操作费 */
thirdOperationFee: 0,
/** 送货方式 */
- deliveryWay: '',
+ deliveryWay: '1',
/** 紧急度 */
- urgency: '',
+ urgency: '1',
/** 回单方式(多选) */
- receipt: '',
+ receipt: [],
/** 运输方式 */
- transportType: '',
+ transportType: '1',
/** 开单人 */
openOrderUserName: '',
/** 回单数 */
@@ -900,7 +922,7 @@ const details = reactive({
/** 备注 */
remark: '',
/** 运单类型 */
- waybillType: 1,
+ waybillType: 2,
},
/** 合计 */
totalObj: {
@@ -1233,8 +1255,11 @@ const details = reactive({
},
],
},
- payRules: [],
-
+ /** 弹出层显示 */
+ popUpShow: {
+ /** 是否继续开单 */
+ titleVisited: false,
+ },
itemRules: {
/** 计价方式 */
chargeType: [
@@ -1281,7 +1306,7 @@ const details = reactive({
submitData: {},
});
-const { query, data, drawerShow, page, loadingObj } = toRefs(details);
+const { query, data, drawerShow, loadingObj } = toRefs(details);
// 合计费用
const totalCost = computed(() => {
@@ -1378,6 +1403,8 @@ const initPageInfo = async () => {
details.query.openOrderDate = data.warehouseWaybill.createTime;
details.query.orderCode = data.warehouseWaybill.orderNo;
details.query.transportType = '1';
+ details.query.deliveryWay = '1';
+ details.query.urgency = '1';
details.query.receipt = data.warehouseWaybill.receipt
? data.warehouseWaybill.receipt.split(',')
: [];
@@ -1471,6 +1498,9 @@ const onLoad = async () => {
details.info.payWayList.find(val => val.dictValue === '到付').dictKey || '2';
}
details.query.transportType = '1';
+ details.query.deliveryWay = '1';
+ details.query.urgency = '1';
+ details.query.destination = '';
};
/** 新增 */
@@ -1567,6 +1597,7 @@ const handleComputed = (row: any) => {
else if (row.chargeType === 3)
row.subtotalFreight = computeNumber(row.weight, '*', row.price).result;
// row.subtotalFreight = 1;
+ handlePayWay();
};
let _ant = null;
@@ -1840,13 +1871,14 @@ const handleSubmit = (formEl: FormInstance | undefined) => {
});
}
- if (res.data.code !== 200) return;
+ const { code, msg } = res.data;
+ if (code !== 200) return;
ElMessage({
- message: '开单成功',
+ message: msg,
type: 'success',
});
- back();
- console.log('res :>> ', res);
+ // 开启提示框, 是否继续开单
+ if (details.pageInfo.type === 'add') details.popUpShow.titleVisited = true;
} else {
console.log('error submit!');
return false;
@@ -1854,6 +1886,11 @@ const handleSubmit = (formEl: FormInstance | undefined) => {
});
};
+/** 重复开单 */
+const handleRepetition = () => {
+ onLoad();
+};
+
watch(
() => $route.query,
() => {