hz/ylst-pc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature-template2' into uat

Browse Source
This commit is contained in:
steven
2022-11-30 13:50:50 +08:00
parent 1ccaf9187a 151459a612
commit c86ae1cf60
4 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/DataAnalyse/components/diagram/newBtnList.vue
View File

@@ -58,7 +58,7 @@
<template v-slot:title> <template v-slot:title>
产品测试模块会同步该列表数据并作统计展示 产品测试模块会同步该列表数据并作统计展示
</template> </template>
<a-button type="primary" class="operChd custom-button" @click="syncData" :loading="syncDataLoading">同步数据</a-button> <a-button type="primary" class="operChd custom-button" @click="syncData" :loading="syncDataLoading">更新数据</a-button>
</a-tooltip> </a-tooltip>
</div> </div>
<!-- 配置 --> <!-- 配置 -->

12
src/views/TempMarket/components/CreateSurveyProduct.vue
View File

@@ -143,7 +143,6 @@
showCount showCount
:maxlength="30" :maxlength="30"
placeholder="请输入测试产品名称" placeholder="请输入测试产品名称"
@blur="flavorBlur(item, index)"
> >
<template #suffix> <template #suffix>
<span class="suffix"> <span class="suffix">
@@ -158,7 +157,6 @@
showCount showCount
:maxlength="30" :maxlength="30"
placeholder="请输入产品口味名称" placeholder="请输入产品口味名称"
@blur="flavorBlur(item, index)"
> >
<template #suffix> <template #suffix>
<span class="suffix"> <span class="suffix">
@@ -544,16 +542,16 @@ export default defineComponent({
product_title: item.packName, product_title: item.packName,
taste_title: item.packType, taste_title: item.packType,
})); }));
params.shelves_cover_picture = packingData.value.shelvesImgs.urls; params.shelves_cover_picture = packingData.value.stackImgs.urls;
params.package_shelves_test_list = packingData.value.shelves params.package_shelves_test_list = packingData.value.stack
.filter((item) => !item.status) .filter((item) => !item.status)
.map((item) => ({ .map((item) => ({
product_picture: item.packImg, product_picture: item.packImg,
product_title: item.packName, product_title: item.packName,
taste_title: item.packType, taste_title: item.packType,
})); }));
params.package_cover_picture = packingData.value.stackImgs.urls; params.package_cover_picture = packingData.value.shelvesImgs.urls;
params.package_pile_test_list = packingData.value.stack params.package_pile_test_list = packingData.value.shelves
.filter((item) => !item.status) .filter((item) => !item.status)
.map((item) => ({ .map((item) => ({
product_picture: item.packImg, product_picture: item.packImg,
@@ -659,7 +657,7 @@ export default defineComponent({
packingData.value = JSON.parse(packingInit); packingData.value = JSON.parse(packingInit);
ruleForm.tags = []; ruleForm.tags = [];
ruleForm.remarks = ""; ruleForm.remarks = "";
ruleForm.project_name = props.info.project_name; ruleForm.project_name = "";
modalVisible.value = false; modalVisible.value = false;
}, },
}); });

2
src/views/TempMarket/components/Packing/PackingCardList.vue
View File

@@ -54,7 +54,6 @@
v-model:value="item.packName" v-model:value="item.packName"
:maxlength="30" :maxlength="30"
placeholder="请输入产品名称" placeholder="请输入产品名称"
@blur="validate(item, index)"
> >
<template #suffix> <template #suffix>
<span class="suffix"> <span class="suffix">
@@ -69,7 +68,6 @@
v-model:value="item.packType" v-model:value="item.packType"
:maxlength="30" :maxlength="30"
placeholder="请输入包装类型" placeholder="请输入包装类型"
@blur="validate(item, index)"
> >
<template #suffix> <template #suffix>
<span class="suffix"> <span class="suffix">

2
src/views/TempMarket/fragment/TableList.vue
View File

@@ -738,7 +738,7 @@ export default defineComponent({
padding: 0 !important; padding: 0 !important;
} }
.ant-dropdown-link-disable { .ant-dropdown-link-disable {
color: rgba(0, 0, 0, 0.25); opacity: 50%;
cursor: not-allowed; cursor: not-allowed;
} }
</style> </style>