diff --git a/src/views/DataAnalyse/components/diagram/newBtnList.vue b/src/views/DataAnalyse/components/diagram/newBtnList.vue
index 4831aed8..cb269b80 100644
--- a/src/views/DataAnalyse/components/diagram/newBtnList.vue
+++ b/src/views/DataAnalyse/components/diagram/newBtnList.vue
@@ -58,7 +58,15 @@
产品测试模块会同步该列表数据并作统计展示
- 同步数据
+
+ {{ other_send_status ? "更新数据" : "同步数据" }}
+
@@ -86,7 +94,9 @@ const props = defineProps({
type: Array,
default: () => []
},
- selectedSns: {}
+ selectedSns: {},
+ template_type: {},
+ other_send_status: {},
})
const store = useStore()
const { selectedSns } = toRefs(props)
@@ -256,10 +266,13 @@ async function syncData() {
syncDataLoading.value = true;
try {
await syncProductTest(sn.value);
- message.success('同步成功!');
- // message.success('同步成功,您还需在产品测试模块导入该问卷哦~');
+ if (props.other_send_status) {
+ return message.success("同步成功,您还需在产品测试模块导入该问卷哦~");
+ }
+ message.success("同步成功!");
+ emit("update:other_send_status", 1);
} catch (error) {
- console.error('同步数据错误', error)
+ console.error("同步数据错误", error);
}
syncDataLoading.value = false;
}
diff --git a/src/views/DataAnalyse/particulars/list.vue b/src/views/DataAnalyse/particulars/list.vue
index 3baa8bfc..d26f629e 100644
--- a/src/views/DataAnalyse/particulars/list.vue
+++ b/src/views/DataAnalyse/particulars/list.vue
@@ -19,7 +19,23 @@
-
+
@@ -188,6 +204,8 @@ const selectedSns = computed(() => {
})
const answer_columns = ref([])
+const template_type = ref([])
+const other_send_status = ref([])
const isFilted = ref(false)
// function onSearch(payload) {
@@ -292,6 +310,9 @@ const getSurveysHead = async () => {
columns.value = res.columns
// 筛选条件
questions.value = res?.filters?.answer_questions
+ // 同步数据
+ template_type.value = res.template_type;
+ other_send_status.value = res.other_send_status;
console.log('传', questions.value)
} catch (error) {
console.error(error)
diff --git a/src/views/TempMarket/components/CreateSurveyProduct.vue b/src/views/TempMarket/components/CreateSurveyProduct.vue
index 7e03d25d..3a98129e 100644
--- a/src/views/TempMarket/components/CreateSurveyProduct.vue
+++ b/src/views/TempMarket/components/CreateSurveyProduct.vue
@@ -143,6 +143,7 @@
showCount
:maxlength="30"
placeholder="请输入测试产品名称"
+ @blur="validateFlavorInput(item)"
>
@@ -157,6 +158,7 @@
showCount
:maxlength="30"
placeholder="请输入产品口味名称"
+ @blur="validateFlavorInput(item)"
>
@@ -774,6 +776,17 @@ export default defineComponent({
}
};
+ // 输入框校验
+ function validateFlavorInput(item) {
+ if (
+ (item.text === "产品名称不能为空" && item.productName) ||
+ (item.text === "口味名称不能为空" && item.flavorName)
+ ) {
+ item.status = false;
+ item.text = "";
+ }
+ }
+
// 校验包装测试
function validatePacking() {
const innerStatus = validatePackingCardList(packingData.value.inner);
@@ -881,6 +894,7 @@ export default defineComponent({
delFlavor,
flavorBlur,
packingData,
+ validateFlavorInput,
};
},
});
diff --git a/src/views/TempMarket/components/Packing/PackingCardList.vue b/src/views/TempMarket/components/Packing/PackingCardList.vue
index 2b21b9a8..80b9235e 100644
--- a/src/views/TempMarket/components/Packing/PackingCardList.vue
+++ b/src/views/TempMarket/components/Packing/PackingCardList.vue
@@ -52,7 +52,12 @@
产品名称:
-
+
{{ `${item.packName.length}/30` }}
@@ -62,7 +67,12 @@
包装类型:
-
+
{{ `${item.packName.length}/30` }}
@@ -236,8 +246,19 @@ export default defineComponent({
item.text = "";
}
+ // 输入框校验
+ function validateInput(item) {
+ if (
+ (item.text === "产品名称不能为空" && item.packName) ||
+ (item.text === "包装类型不能为空" && item.packType)
+ ) {
+ item.status = false;
+ item.text = "";
+ }
+ }
+
// 图片上传校验
- function validateImg(item, index) {
+ function validateImg(item) {
if (item.text === "请上传产品图片" && item.packImg) {
item.status = false;
item.text = "";
@@ -255,6 +276,7 @@ export default defineComponent({
handlePreview,
setVisible,
validate,
+ validateInput,
};
},
});