diff --git a/.DS_Store b/.DS_Store index ee3fe3da..6568d3f8 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/src/views/ProjectManage/components/SurveyAction.vue b/src/views/ProjectManage/components/SurveyAction.vue index 7702dbc8..a21e67ef 100644 --- a/src/views/ProjectManage/components/SurveyAction.vue +++ b/src/views/ProjectManage/components/SurveyAction.vue @@ -152,6 +152,12 @@ export default defineComponent({ if (status === 1 && i.action === 'build') { return false; } + if(i.action === 'save' && props.info.template_type === 1) { + return false + } + if(i.action === 'copy' && props.info.template_type === 1) { + return false + } return true; }); }); diff --git a/src/views/ProjectManage/fragment/TableList.vue b/src/views/ProjectManage/fragment/TableList.vue index 1b7fb5f9..d07b9c10 100644 --- a/src/views/ProjectManage/fragment/TableList.vue +++ b/src/views/ProjectManage/fragment/TableList.vue @@ -31,7 +31,9 @@ {{ record.status_txt }} @@ -43,7 +45,10 @@ @click="handleJumpTo($event, 'design', record.sn)" >编辑 - 发布 分析 - + 更多 - + - + - + - + {{ item.title }} ... - + {{ item.title }} @@ -81,7 +111,10 @@ - {{ record.project_name }} + + {{ record.project_name }} + #{{ record.template_tag }} + + + + + + + + + + + + + + 口味关键属性配置 + + + + 口味关键属性 + + + + + + {{ `${item.taste_attr.length} / 30` }} + + + + + + + + {{ item.text }} + + + + + + + 包装关键性配置 + + + + 包装关键属性 + + + + + + {{ `${item.package_attr.length} / 30` }} + + + + + + + + {{ item.text }} + + + + + + + + + + + + + + diff --git a/src/views/TempMarket/fragment/TableList.vue b/src/views/TempMarket/fragment/TableList.vue index 629dd6c4..344f8e8f 100644 --- a/src/views/TempMarket/fragment/TableList.vue +++ b/src/views/TempMarket/fragment/TableList.vue @@ -26,7 +26,11 @@ {{ record?.title }} - + - + {{ item.title }} ... - + {{ item.title }} @@ -50,13 +63,20 @@ 预览 使用 - + 更多 - + - 重命名模版 + 重命名模版 - + + + + 创建问卷 + + + + + 说明 + + + 此处主要配置问卷内产品口味包装参与调研的关键属性,您可以自定义关键属性。其中,口味和包装的关键属性分别不可重复且至少配置一个关键属性。 + + + 您配置几个口味关键属性就会生成几道“口味属性喜欢成都”的题目,配置几个包装关键属性就会生成几道“包装属性喜欢程度”的题目。 + + + 示例 + + + 示例配置了一个口味关键属性“甜味”和一个包装关键属性“高端”,创建的问卷中对应的题目见下图,区别于普通题型,固定题型会展示固定标签以及对应属性信息。 + + + + + + + + + + + 创建问卷 + + - + @@ -118,14 +185,24 @@ @update="update" /> - + - + 预览问卷 @@ -139,16 +216,24 @@ import MoveGroup from "../components/MoveGroup"; import editLabel from "../components/editLabel.vue"; import ReName from "../components/ReName"; import TempPreview from "@views/ProjectManage/components/TempPreview"; -import CreateSurvey from "@/views/ProjectManage/components/CreateSurvey"; +import CreateSurvey from "../components/CreateSurveyCopy.vue"; import { getGroupList } from "@/api/template-market"; -import { nextTick, defineComponent, ref, onBeforeMount, watch, getCurrentInstance } from "vue"; +import { + nextTick, + defineComponent, + ref, + onBeforeMount, + watch, + getCurrentInstance, +} from "vue"; import { useRouter } from "vue-router"; import { DownOutlined } from "@ant-design/icons-vue"; import { delTemplate, getTemplateList } from "@/api/template-market"; import { getSurveySorts } from "@/views/ProjectManage/api.js"; +import { baseOss } from "../../../config"; const router = useRouter(); const columns = [ { @@ -236,6 +321,7 @@ export default defineComponent({ const preview_visible = ref(false); const createVisible = ref(false); const info = { sn: "" }; + const curTemp = ref(null); const table = ref(null); watch( @@ -409,7 +495,7 @@ export default defineComponent({ onBeforeMount(async () => { page.value = props.pageIndex ? props.pageIndex : 1; const { data } = await getSurveySorts(1); - if(data){ + if (data) { search.value.sort = data.sort || ""; } getTemplates(); @@ -420,6 +506,7 @@ export default defineComponent({ }; function handleUse(record) { temp_sn.value = record.sn; + curTemp.value = record; createVisible.value = true; } // 标签颜色 @@ -491,6 +578,7 @@ export default defineComponent({ createVisible.value = false; } return { + baseOss, table, sn, handleChangeTable, @@ -530,6 +618,7 @@ export default defineComponent({ info, ProjectGroupList, handleClose, + curTemp, }; }, }); @@ -612,6 +701,38 @@ export default defineComponent({ border: 1px solid #4db8fa; color: #4db8fa; } +.custom-head { + display: flex; + align-items: center; + font-size: 16px; + font-weight: 500; + color: #262626; + .iconfont { + line-height: 14px; + height: 16px; + margin-left: 9px; + color: $yili-default-color; + cursor: pointer; + &:hover { + opacity: 0.8; + } + } + &-tip { + padding: 14px 25px; + &-fz14 { + line-height: 22px; + font-size: 14px; + } + &-fz12 { + line-height: 22px; + font-size: 12px; + } + &-img { + width: 342px; + height: 166px; + } + } +} :deep(.ant-table) { width: 100%; } @@ -621,4 +742,8 @@ export default defineComponent({ .ant-table-title { padding: 0 !important; } +.ant-dropdown-link-disable { + color: rgba(0, 0, 0, 0.25); + cursor: not-allowed; +} diff --git a/src/views/planetDesign/Design/fragement/QuesBaseItem.vue b/src/views/planetDesign/Design/fragement/QuesBaseItem.vue index 2971e6f5..f017df18 100644 --- a/src/views/planetDesign/Design/fragement/QuesBaseItem.vue +++ b/src/views/planetDesign/Design/fragement/QuesBaseItem.vue @@ -1,5 +1,6 @@ + 标签属性#{{ info?.question_value }} @@ -130,6 +131,10 @@ export default defineComponent({ margin-bottom: 25px; flex: 1; } +.sell-verify { + padding-left: 37px; + color: $yili-default-color; +} .related-option { display: flex; font-size: 14px;