+
确认
@@ -170,7 +170,7 @@ const formData = reactive({
financial_wechat: "",
financial_alipay: "",
financial_type: "",
- supplier: {}
+ supplier: {},
});
// 表单验证
@@ -192,15 +192,24 @@ const setFormData = async (data: Record
) => {
formData[key] = data[key];
}
}
+ if (formData.supplier) {
+ for (const key in formData.supplier) {
+ if (data[key] != null && data[key] != undefined) {
+ //@ts-ignore
+ formData[key] = data[key];
+ }
+ }
+ }
};
const auditInfo = reactive({
status: 1,
- mark: ''
-})
+ mark: "",
+});
// 审核
const onAudit = () => {
- if(auditInfo.status == 0 && auditInfo.mark == '') return ElMessage.error('请输入拒绝原因');
+ if (auditInfo.status == 0 && auditInfo.mark == "")
+ return ElMessage.error("请输入拒绝原因");
apiSupplierStatus({
id: formData.pid,
status: auditInfo.status,
@@ -209,7 +218,7 @@ const onAudit = () => {
mark: auditInfo.mark,
}).then((res) => {
popupRef.value?.close();
- emit('success')
+ emit("success");
});
};
diff --git a/src/views/data/supplier/audit/index.vue b/src/views/data/supplier/audit/index.vue
index dc96f4d..4b7adcf 100644
--- a/src/views/data/supplier/audit/index.vue
+++ b/src/views/data/supplier/audit/index.vue
@@ -51,7 +51,8 @@
-->
-
+
+
diff --git a/src/views/translationOrder/component/goodsOffer.vue b/src/views/translationOrder/component/goodsOffer.vue
index 43bb37a..a44058f 100644
--- a/src/views/translationOrder/component/goodsOffer.vue
+++ b/src/views/translationOrder/component/goodsOffer.vue
@@ -131,7 +131,8 @@ const route = useRoute();
const queryParams = reactive({
id: route.query.id,
is_adopt: "",
- is_mer: 2
+ is_mer: 2,
+ is_push: 1
});
// 分页相关
const { pager, getLists, resetParams, resetPage } = usePaging({
diff --git a/src/views/translationOrder/component/noPush.vue b/src/views/translationOrder/component/noPush.vue
index 9e62bbb..6227f3b 100644
--- a/src/views/translationOrder/component/noPush.vue
+++ b/src/views/translationOrder/component/noPush.vue
@@ -1,6 +1,8 @@
- 重新推送
+
+ 重新推送
+
+ >
+
+ {{
+ row.sys_labels_arr.map((t: any) => t.name).join(",")
+ }}
+
+