no message

src/views/mallManagement/activityOrder/detail.vue

@@ -174,7 +174,7 @@
 	import { getDetail, add, follow, getActiveList, getActiveDetail } from "@/api/activityOrder";
 	export default {
 		components: {ImageUpload},
-		props: ['id','title','formType'],
+		props: ['id','title','formType','activeId'],
 		data() {
 			return {
 				dataList: [],
@@ -223,6 +223,10 @@
 			if(this.id){
 				this.getDetail()
 			}
+			if(this.activeId){
+				this.formData.active = {id: this.activeId}
+				this.getActiveDetail(this.activeId)
+			}
 			this.getActiveList()
 		},
 		methods: {
@@ -316,20 +320,20 @@
 							let activeItems = JSON.parse(JSON.stringify(this.activeItems));
 							for(let index = 0; index < activeItems.length; index++) {
 							  // 单选题多选题
-							  if ((activeItems[index].type == 1 || activeItems[index].type == 2) && activeItems[index].answer.some(o => o.active)) {
+							  if ((activeItems[index].type == 1 || activeItems[index].type == 2)) {
 							    activeItems[index].answer = activeItems[index].answer.filter(o => o.active);
 							    activeItems[index].answer = JSON.stringify(activeItems[index].answer);
 							    items.push(activeItems[index]);
 							  }
 							  // 填写题
-							  if (activeItems[index].type == 3 && activeItems[index].inputValue) {
+							  if (activeItems[index].type == 3) {
 							    activeItems[index].answer[0].option_value = activeItems[index].inputValue;
 							    activeItems[index].answer = JSON.stringify(activeItems[index].answer);
 							    items.push(activeItems[index]);
 							  }
 							  // 图片视频
-							  if (activeItems[index].type == 4 && activeItems[index].inputValue.length > 0) {
-							    activeItems[index].answer[0].option_value = activeItems[index].inputValue[0].url;
+							  if (activeItems[index].type == 4) {
+							    activeItems[index].answer[0].option_value = activeItems[index].inputValue.length>0?activeItems[index].inputValue[0].url:'';
 							    activeItems[index].answer = JSON.stringify(activeItems[index].answer);
 							    items.push(activeItems[index]);
 							  }

src/views/mallManagement/activityOrder/index.vue

@@ -13,7 +13,7 @@
 			</div>
 		</template-page>
 		<div class="detail" v-if="formDialog">
-			<detail :id="id" @back="backList" :formType="formDialogType" :title="'活动单' + formDialogTitles[formDialogType]"></detail>
+			<detail :id="id" :activeId="activeId" @back="backList" :formType="formDialogType" :title="'活动单' + formDialogTitles[formDialogType]"></detail>
 		</div>
 		<!-- 选择商品 -->
 		<el-dialog title="批量跟进" :visible.sync="isShow" width="50%" :close-on-click-modal="false" :modal-append-to-body="false" @close="formData = {status: 'END',remark: ''}">
@@ -74,6 +74,7 @@ export default {
 			formDialog: false,
 			status: 'ING',
 			id: '',
+			activeId: '',
 			promotion_questionnaire_id: '',
 			isShow: false,
 			formData: {
@@ -109,7 +110,10 @@ export default {
 		formItems() { },
 	},
 	created(){
-		
+		if(this.$route.query.type == 'detail'){
+			this.activeId = this.$route.query.id
+			this.formDialog = true
+		}
 	},
 	methods: {
 		// 切换状态
@@ -125,7 +129,7 @@ export default {
 		getList(p, cb) {
 			try {
 				var pam = JSON.parse(JSON.stringify(p))
-				pam.params.push({ "param": "a.status", "compare": "=", "value": this.status },{ "param": "a.promotion_questionnaire_id", "compare": "=", "value": this.$route.query.promotion_questionnaire_id })
+				pam.params.push({ "param": "a.status", "compare": "=", "value": this.status },{ "param": "a.promotion_questionnaire_id", "compare": "=", "value": this.$route.query.id?this.$route.query.id:'' })
 				cb && cb(pam)
 				return listPageV2(pam)
 			} catch (error) {