Merge branch 'pengyouhao_dev'

src/views/mallManagement/activityOrder/detail.vue

@@ -263,7 +263,8 @@
 						if(items){
 							item.answer.forEach((it,ind) => {
 								let data = JSON.parse(items[index].answer)
-								if(data[ind]?.active){
+								console.log(data[ind]?.option_value,it.option_value)
+								if(data[ind]?.active && data[ind]?.option_value == it.option_value){
 									it.active = true;
 								}else{
 									it.active = false;
@@ -327,7 +328,7 @@
 							for(let index = 0; index < activeItems.length; index++) {
 							  // 单选题多选题
 							  if ((activeItems[index].type == 1 || activeItems[index].type == 2)) {
-							    activeItems[index].answer = activeItems[index].answer.filter(o => o.active);
+							    // activeItems[index].answer = activeItems[index].answer.filter(o => o.active);
 							    activeItems[index].answer = JSON.stringify(activeItems[index].answer);
 							    items.push(activeItems[index]);
 							  }

src/views/mallManagement/activityOrder/index.vue

@@ -266,14 +266,8 @@ export default {
 		formConfirm1() {
 			this.$refs.formData1.validate((valid, invalidFields, errLabels) => {
 				if (valid) {
-					pageExport({
-						statDate: this.formData1.date[0] + ' 00:00:00',
-						endDate: this.formData1.date[1] + ' 23:59:59'
-					}).then(res => {
-						this.isShowDate = false
-						this.$refs?.formData1?.resetFields()
-						this.$message({ type: 'success', message: '导出成功！' })
-					})
+					downloadFiles('promotion/activity/export',{statDate: this.formData1.date[0] + ' 00:00:00',endDate: this.formData1.date[1] + ' 23:59:59'});
+					this.isShowDate = false
 				}
 			})	
 		},

src/views/mallManagement/goods/goodsWarehouse/index.vue

@@ -1,204 +1,202 @@
 <template>
-	<div>
-		<zj-tab-page ref="tabPage" :defaultActives="[{ key: 'list', label: $route.meta.title+'-列表', essential: true }]">
-			<template slot-scope="{activeKey, data}">
-				<template-page v-if="activeKey == 'list'" ref="pageRef" :get-list="getList"
-					:table-attributes="tableAttributes" :table-events="tableEvents" :options-evens-group="optionsEvensGroup"
-					:moreParameters="moreParameters" :column-parsing="columnParsing" :operation="operation()"
-					:exportList="exportList" :operationColumnWidth="80">
-					<div slot="moreSearch">
-						<el-radio-group v-model="status" size="mini" @change="changeType">
-							<el-radio-button label="">全部</el-radio-button>
-							<el-radio-button :label="false">已关闭</el-radio-button>
-							<el-radio-button :label="true">已开启</el-radio-button>
-						</el-radio-group>
-						<br><br>
-					</div>
-				</template-page>
-				<div v-if="~['add', 'edit', 'detail'].indexOf(activeKey)">
-					<div class="page">
-						<el-steps :active="stepIndex" align-center>
-							<el-step title="编辑基础信息" description=""></el-step>
-							<el-step title="编辑价格库存" description=""></el-step>
-							<el-step title="编辑商品详情" description=""></el-step>
-						</el-steps>
-						<el-card class="box-card">
-							<div slot="header" class="clearfix">
-								<span>{{stepIndex == 0?'基础信息':stepIndex == 1?'价格库存':stepIndex == 2?'详情内容':''}}</span>
-							</div>
-							<div class="mymain-container">
-								<el-form ref="formRef" :rules="rules" :model="formData" label-width="110px" size="small"
-									label-position="left">
-									<el-row :gutter="20" justify="start">
-										<div v-show="stepIndex == 0">
-											<el-col :span="24">
-												<el-form-item label="商品可选状态" prop="status" :required="true">
-													<div class="flex_ac">
-														<el-radio-group v-model="formData.status">
-														    <el-radio :label="true">开启</el-radio>
-														    <el-radio :label="false">关闭</el-radio>
-														</el-radio-group>
-														<div class="hui" style="margin-left: 80px;">开启状态，商户可选择本商品；关闭则不允许商户选择；</div>
-													</div>
-												</el-form-item>
-											</el-col>
-											<el-col :span="6">
-												<el-form-item label="品牌" prop="brandName" :rules="[{ required: true, message: `请输入品牌`, trigger: 'blur' }]">
-													<el-input type="text" v-model="formData.brandName" placeholder="请输入"></el-input>
-												</el-form-item>
-											</el-col>
-											<el-col :span="6">
-												<el-form-item label="是否虚拟商品" prop="isVr" :required="true">
-													<el-radio-group v-model="formData.isVr">
-													    <el-radio :label="true">是</el-radio>
-													    <el-radio :label="false">否</el-radio>
+	<zj-tab-page ref="tabPage" :defaultActives="[{ key: 'list', label: $route.meta.title+'-列表', essential: true }]">
+		<template slot-scope="{activeKey, data}">
+			<template-page v-if="activeKey == 'list'" ref="pageRef" :get-list="getList"
+				:table-attributes="tableAttributes" :table-events="tableEvents" :options-evens-group="optionsEvensGroup"
+				:moreParameters="moreParameters" :column-parsing="columnParsing" :operation="operation()"
+				:exportList="exportList" :operationColumnWidth="80">
+				<div slot="moreSearch">
+					<el-radio-group v-model="status" size="mini" @change="changeType">
+						<el-radio-button label="">全部</el-radio-button>
+						<el-radio-button :label="false">已关闭</el-radio-button>
+						<el-radio-button :label="true">已开启</el-radio-button>
+					</el-radio-group>
+					<br><br>
+				</div>
+			</template-page>
+			<div v-if="~['add', 'edit', 'detail'].indexOf(activeKey)">
+				<div class="page">
+					<el-steps :active="stepIndex" align-center>
+						<el-step title="编辑基础信息" description=""></el-step>
+						<el-step title="编辑价格库存" description=""></el-step>
+						<el-step title="编辑商品详情" description=""></el-step>
+					</el-steps>
+					<el-card class="box-card">
+						<div slot="header" class="clearfix">
+							<span>{{stepIndex == 0?'基础信息':stepIndex == 1?'价格库存':stepIndex == 2?'详情内容':''}}</span>
+						</div>
+						<div class="mymain-container">
+							<el-form ref="formRef" :rules="rules" :model="formData" label-width="110px" size="small"
+								label-position="left">
+								<el-row :gutter="20" justify="start">
+									<div v-show="stepIndex == 0">
+										<el-col :span="24">
+											<el-form-item label="商品可选状态" prop="status" :required="true">
+												<div class="flex_ac">
+													<el-radio-group v-model="formData.status">
+													    <el-radio :label="true">开启</el-radio>
+													    <el-radio :label="false">关闭</el-radio>
 													</el-radio-group>
-												</el-form-item>
-											</el-col>
-											<el-col :span="6">
-												<el-form-item label="商品大类" prop="category1" :rules="[{ required: true, message: `请输入商品大类`, trigger: 'blur' }]">
-													<el-input type="text" v-model="formData.category1" placeholder="请输入"></el-input>
-												</el-form-item>
-											</el-col>
-											<el-col :span="6">
-												<el-form-item label="商品小类" prop="category2" :rules="[{ required: true, message: `请输入商品小类`, trigger: 'blur' }]">
-													<el-input type="text" v-model="formData.category2" placeholder="请输入"></el-input>
-												</el-form-item>
-											</el-col>
-											<el-col :span="24">
-												<el-form-item label="商品名称" prop="goodsName" :rules="[{ required: true, message: `请输入商品名称`, trigger: 'blur' }]">
-													<el-input type="textarea" :rows="3" v-model="formData.goodsName" placeholder="请输入"></el-input>
-													<div class="hui">商品名称将显示在商品详情，让用户更直接了解商品内涵</div>
-												</el-form-item>
-											</el-col>
-											<el-col :span="24">
-												<el-form-item label="商品描述" prop="describeText">
-													<el-input type="textarea" :rows="3" v-model="formData.describeText" placeholder="请输入"></el-input>
-													<div class="hui">商品描述将显示在商品详情，让用户更了解商品细节</div>
-												</el-form-item>
-											</el-col>
-											<el-col :span="12">
-												<el-form-item label="商品主图" prop="imgUrl" :rules="[{ required: true, message: `请上传商品主图`, trigger: 'change' }]">
-													<ImageUpload :fileList="formData.imgUrl" :limit="1" :isEdit="true" :fileType="['image']"/>
-													<div class="suggest">建议尺寸800*800</div>
-												</el-form-item>
-											</el-col>
-											<el-col :span="12">
-												<el-form-item label="商品视频" prop="vedio">
-													<ImageUpload :fileList="formData.vedio" :limit="1" :isEdit="true" :fileType="['video']"/>
-													<div class="suggest">建议视频宽高比16:9，建议时长9-30秒</div>
-												</el-form-item>
-											</el-col>
-											<el-col :span="24">
-												<el-form-item label="轮播图" prop="imgs" :rules="[{ required: true, message: `请上传轮播图`, trigger: 'change' }]">
-													<ImageUpload :fileList="formData.imgs" :limit="6" :isEdit="true" :fileType="['image']"/>
-													<div class="suggest">建议尺寸800*800，最多上传6张</div>
-												</el-form-item>
-											</el-col>
-										</div>
-										<div v-show="stepIndex == 1">
-											<el-col :span="24">
-												<el-form-item label="规格类型" prop="goodsLibrarySpecList" class="is-required">
-													<el-button size="mini" @click="add()" type="primary">添加规格</el-button>
-												</el-form-item>
-											</el-col>
-											<el-form ref="formData" :model="formData" label-width="110px" size="small">
-												<el-table :data="formData.goodsLibrarySpecList" element-loading-text="Loading" border fit highlight-current-row stripe>
-													<el-table-column prop="" align="center" label="*大类">
-														<template slot-scope="scope">
-															<el-form-item :prop="'goodsLibrarySpecList.' + scope.$index + '.mainName'" :rules="[{ required: true, message: `请输入大类`, trigger: 'blur' }]" label-width="0">
-																<el-input type="text" v-model="scope.row.mainName" :disabled="isEdit != scope.$index" placeholder="请输入"></el-input>
-															</el-form-item>
-														</template>
-													</el-table-column>
-													<el-table-column prop="" align="center" label="*小类">
-														<template slot-scope="scope">
-															<el-form-item :prop="'goodsLibrarySpecList.' + scope.$index + '.smallName'" :rules="[{ required: true, message: `请输入小类`, trigger: 'blur' }]" label-width="0">
-																<el-input type="text" v-model="scope.row.smallName" :disabled="isEdit != scope.$index" placeholder="请输入"></el-input>
-															</el-form-item>
-														</template>
-													</el-table-column>
-													<el-table-column prop="" align="center" label="*规格型号">
-														<template slot-scope="scope">
-															<el-form-item :prop="'goodsLibrarySpecList.' + scope.$index + '.specValue'" :rules="[{ required: true, message: `请输入规格型号`, trigger: 'blur' }]" label-width="0">
-																<el-input type="text" v-model="scope.row.specValue" :disabled="isEdit != scope.$index" placeholder="请输入"></el-input>
-															</el-form-item>
-														</template>
-													</el-table-column>
-													<el-table-column prop="" align="center" label="*参考销售价格">
-														<template slot-scope="scope">
-															<el-form-item :prop="'goodsLibrarySpecList.' + scope.$index + '.price'" :rules="[{ required: true, message: `请输入参考销售价格`, trigger: 'blur' },{ pattern:/^(([0-9]\d*)|([0][.]{1}[0-9]{0,2}[1-9]+)|([1-9]\d*[.]{1}[0-9]+))$/g, message: '请输入大于等于0的数', trigger: 'blur' }]" label-width="0">
-																<el-input type="number" v-model="scope.row.price" :disabled="isEdit != scope.$index" placeholder="请输入"></el-input>
-															</el-form-item>
-														</template>
-													</el-table-column>
-													<el-table-column prop="" align="center" label="*参考划线价格">
-														<template slot-scope="scope">
-															<el-form-item :prop="'goodsLibrarySpecList.' + scope.$index + '.orgPrice'" :rules="[{ required: true, message: `请输入参考划线价格`, trigger: 'blur' },{ pattern:/^(([0-9]\d*)|([0][.]{1}[0-9]{0,2}[1-9]+)|([1-9]\d*[.]{1}[0-9]+))$/g, message: '请输入大于等于0的数', trigger: 'blur' }]" label-width="0">
-																<el-input type="number" v-model="scope.row.orgPrice" :disabled="isEdit != scope.$index" placeholder="请输入"></el-input>
-															</el-form-item>
-														</template>
-													</el-table-column>
-													<el-table-column prop="" align="center" label="*参考成本价">
-														<template slot-scope="scope">
-															<el-form-item :prop="'goodsLibrarySpecList.' + scope.$index + '.costPrice'" :rules="[{ required: true, message: `请输入参考成本价`, trigger: 'blur' },{ pattern:/^(([0-9]\d*)|([0][.]{1}[0-9]{0,2}[1-9]+)|([1-9]\d*[.]{1}[0-9]+))$/g, message: '请输入大于等于0的数', trigger: 'blur' }]" label-width="0">
-																<el-input type="number" v-model="scope.row.costPrice" :disabled="isEdit != scope.$index" placeholder="请输入"></el-input>
-															</el-form-item>
-														</template>
-													</el-table-column>
-													<el-table-column prop="" align="center" label="*参考佣金">
-														<template slot-scope="scope">
-															<el-form-item :prop="'goodsLibrarySpecList.' + scope.$index + '.shareAmount'" :rules="[{ required: true, message: `请输入参考佣金`, trigger: 'blur' },{ pattern:/^(([0-9]\d*)|([0][.]{1}[0-9]{0,2}[1-9]+)|([1-9]\d*[.]{1}[0-9]+))$/g, message: '请输入大于等于0的数', trigger: 'blur' }]" label-width="0">
-																<el-input type="number" v-model="scope.row.shareAmount" :disabled="isEdit != scope.$index" placeholder="请输入"></el-input>
-															</el-form-item>
-														</template>
-													</el-table-column>
-													<el-table-column prop="" align="center" label="*参考内部佣金">
-														<template slot-scope="scope">
-															<el-form-item :prop="'goodsLibrarySpecList.' + scope.$index + '.innerShareAmount'" :rules="[{ required: true, message: `请输入参考内部佣金`, trigger: 'blur' },{ pattern:/^(([0-9]\d*)|([0][.]{1}[0-9]{0,2}[1-9]+)|([1-9]\d*[.]{1}[0-9]+))$/g, message: '请输入大于等于0的数', trigger: 'blur' }]" label-width="0">
-																<el-input type="number" v-model="scope.row.innerShareAmount" :disabled="isEdit != scope.$index" placeholder="请输入"></el-input>
-															</el-form-item>
-														</template>
-													</el-table-column>
-													<el-table-column prop="" align="center" label="*参考规格图片">
-														<template slot-scope="scope">
-															<el-form-item :prop="'goodsLibrarySpecList.' + scope.$index + '.imgUrl'" :rules="[{ required: true, message: `请上传参考规格图片`, trigger: 'change' }]" label-width="0">
-																<div class="flex_ac">
-																	<ImageUpload :fileList="scope.row.imgUrl" :limit="1" :download="false" :viewOnline="false" :isEdit="true" modType="text" :fileType="['image']"/>
-																</div>
-															</el-form-item>
-														</template>
-													</el-table-column>
-													<el-table-column label="操作" align="center" width="160">
-														<template slot-scope="scope">
-															<el-button size="mini" type="primary" v-if="scope.$index != isEdit" @click="edit(scope.$index)">编辑</el-button>
-															<el-button size="mini" type="danger" @click="del(scope.$index)">删除</el-button>
-														</template>
-													</el-table-column>
-												</el-table>
-											</el-form>
-										</div>
-										<div v-show="stepIndex == 2">
-											<el-form-item label="详情内容" prop="content" :rules="[{ required: true, message: `请输入详情内容`, trigger: 'change' }]">
-												<quillEditor v-model="formData.content"></quillEditor>
-												<input type="hidden" v-model="formData.content">
+													<div class="hui" style="margin-left: 80px;">开启状态，商户可选择本商品；关闭则不允许商户选择；</div>
+												</div>
 											</el-form-item>
-										</div>
-									</el-row>
-								</el-form>
-							</div>
-						</el-card>
-					</div>
-					<div class="footer">
-						<el-button v-if="stepIndex > 0" size="mini" @click="up()">上一步</el-button>
-						<el-button v-if="stepIndex < 2" size="mini" @click="next()">下一步</el-button>
-						<el-button size="mini" @click="formConfirm(data.removeTab)" type="primary">提交</el-button>
-						<el-button size="mini" @click="data.removeTab()">关闭</el-button>
-					</div>
+										</el-col>
+										<el-col :span="6">
+											<el-form-item label="品牌" prop="brandName" :rules="[{ required: true, message: `请输入品牌`, trigger: 'blur' }]">
+												<el-input type="text" v-model="formData.brandName" placeholder="请输入"></el-input>
+											</el-form-item>
+										</el-col>
+										<el-col :span="6">
+											<el-form-item label="是否虚拟商品" prop="isVr" :required="true">
+												<el-radio-group v-model="formData.isVr">
+												    <el-radio :label="true">是</el-radio>
+												    <el-radio :label="false">否</el-radio>
+												</el-radio-group>
+											</el-form-item>
+										</el-col>
+										<el-col :span="6">
+											<el-form-item label="商品大类" prop="category1" :rules="[{ required: true, message: `请输入商品大类`, trigger: 'blur' }]">
+												<el-input type="text" v-model="formData.category1" placeholder="请输入"></el-input>
+											</el-form-item>
+										</el-col>
+										<el-col :span="6">
+											<el-form-item label="商品小类" prop="category2" :rules="[{ required: true, message: `请输入商品小类`, trigger: 'blur' }]">
+												<el-input type="text" v-model="formData.category2" placeholder="请输入"></el-input>
+											</el-form-item>
+										</el-col>
+										<el-col :span="24">
+											<el-form-item label="商品名称" prop="goodsName" :rules="[{ required: true, message: `请输入商品名称`, trigger: 'blur' }]">
+												<el-input type="textarea" :rows="3" v-model="formData.goodsName" placeholder="请输入"></el-input>
+												<div class="hui">商品名称将显示在商品详情，让用户更直接了解商品内涵</div>
+											</el-form-item>
+										</el-col>
+										<el-col :span="24">
+											<el-form-item label="商品描述" prop="describeText">
+												<el-input type="textarea" :rows="3" v-model="formData.describeText" placeholder="请输入"></el-input>
+												<div class="hui">商品描述将显示在商品详情，让用户更了解商品细节</div>
+											</el-form-item>
+										</el-col>
+										<el-col :span="12">
+											<el-form-item label="商品主图" prop="imgUrl" :rules="[{ required: true, message: `请上传商品主图`, trigger: 'change' }]">
+												<ImageUpload :fileList="formData.imgUrl" :limit="1" :isEdit="true" :fileType="['image']"/>
+												<div class="suggest">建议尺寸800*800</div>
+											</el-form-item>
+										</el-col>
+										<el-col :span="12">
+											<el-form-item label="商品视频" prop="vedio">
+												<ImageUpload :fileList="formData.vedio" :limit="1" :isEdit="true" :fileType="['video']"/>
+												<div class="suggest">建议视频宽高比16:9，建议时长9-30秒</div>
+											</el-form-item>
+										</el-col>
+										<el-col :span="24">
+											<el-form-item label="轮播图" prop="imgs" :rules="[{ required: true, message: `请上传轮播图`, trigger: 'change' }]">
+												<ImageUpload :fileList="formData.imgs" :limit="6" :isEdit="true" :fileType="['image']"/>
+												<div class="suggest">建议尺寸800*800，最多上传6张</div>
+											</el-form-item>
+										</el-col>
+									</div>
+									<div v-show="stepIndex == 1">
+										<el-col :span="24">
+											<el-form-item label="规格类型" prop="goodsLibrarySpecList" class="is-required">
+												<el-button size="mini" @click="add()" type="primary">添加规格</el-button>
+											</el-form-item>
+										</el-col>
+										<el-form ref="formData" :model="formData" label-width="110px" size="small">
+											<el-table :data="formData.goodsLibrarySpecList" element-loading-text="Loading" border fit highlight-current-row stripe>
+												<el-table-column prop="" align="center" label="*大类">
+													<template slot-scope="scope">
+														<el-form-item :prop="'goodsLibrarySpecList.' + scope.$index + '.mainName'" :rules="[{ required: true, message: `请输入大类`, trigger: 'blur' }]" label-width="0">
+															<el-input type="text" v-model="scope.row.mainName" :disabled="isEdit != scope.$index" placeholder="请输入"></el-input>
+														</el-form-item>
+													</template>
+												</el-table-column>
+												<el-table-column prop="" align="center" label="*小类">
+													<template slot-scope="scope">
+														<el-form-item :prop="'goodsLibrarySpecList.' + scope.$index + '.smallName'" :rules="[{ required: true, message: `请输入小类`, trigger: 'blur' }]" label-width="0">
+															<el-input type="text" v-model="scope.row.smallName" :disabled="isEdit != scope.$index" placeholder="请输入"></el-input>
+														</el-form-item>
+													</template>
+												</el-table-column>
+												<el-table-column prop="" align="center" label="*规格型号">
+													<template slot-scope="scope">
+														<el-form-item :prop="'goodsLibrarySpecList.' + scope.$index + '.specValue'" :rules="[{ required: true, message: `请输入规格型号`, trigger: 'blur' }]" label-width="0">
+															<el-input type="text" v-model="scope.row.specValue" :disabled="isEdit != scope.$index" placeholder="请输入"></el-input>
+														</el-form-item>
+													</template>
+												</el-table-column>
+												<el-table-column prop="" align="center" label="*参考销售价格">
+													<template slot-scope="scope">
+														<el-form-item :prop="'goodsLibrarySpecList.' + scope.$index + '.price'" :rules="[{ required: true, message: `请输入参考销售价格`, trigger: 'blur' },{ pattern:/^(([0-9]\d*)|([0][.]{1}[0-9]{0,2}[1-9]+)|([1-9]\d*[.]{1}[0-9]+))$/g, message: '请输入大于等于0的数', trigger: 'blur' }]" label-width="0">
+															<el-input type="number" v-model="scope.row.price" :disabled="isEdit != scope.$index" placeholder="请输入"></el-input>
+														</el-form-item>
+													</template>
+												</el-table-column>
+												<el-table-column prop="" align="center" label="*参考划线价格">
+													<template slot-scope="scope">
+														<el-form-item :prop="'goodsLibrarySpecList.' + scope.$index + '.orgPrice'" :rules="[{ required: true, message: `请输入参考划线价格`, trigger: 'blur' },{ pattern:/^(([0-9]\d*)|([0][.]{1}[0-9]{0,2}[1-9]+)|([1-9]\d*[.]{1}[0-9]+))$/g, message: '请输入大于等于0的数', trigger: 'blur' }]" label-width="0">
+															<el-input type="number" v-model="scope.row.orgPrice" :disabled="isEdit != scope.$index" placeholder="请输入"></el-input>
+														</el-form-item>
+													</template>
+												</el-table-column>
+												<el-table-column prop="" align="center" label="*参考成本价">
+													<template slot-scope="scope">
+														<el-form-item :prop="'goodsLibrarySpecList.' + scope.$index + '.costPrice'" :rules="[{ required: true, message: `请输入参考成本价`, trigger: 'blur' },{ pattern:/^(([0-9]\d*)|([0][.]{1}[0-9]{0,2}[1-9]+)|([1-9]\d*[.]{1}[0-9]+))$/g, message: '请输入大于等于0的数', trigger: 'blur' }]" label-width="0">
+															<el-input type="number" v-model="scope.row.costPrice" :disabled="isEdit != scope.$index" placeholder="请输入"></el-input>
+														</el-form-item>
+													</template>
+												</el-table-column>
+												<el-table-column prop="" align="center" label="*参考佣金">
+													<template slot-scope="scope">
+														<el-form-item :prop="'goodsLibrarySpecList.' + scope.$index + '.shareAmount'" :rules="[{ required: true, message: `请输入参考佣金`, trigger: 'blur' },{ pattern:/^(([0-9]\d*)|([0][.]{1}[0-9]{0,2}[1-9]+)|([1-9]\d*[.]{1}[0-9]+))$/g, message: '请输入大于等于0的数', trigger: 'blur' }]" label-width="0">
+															<el-input type="number" v-model="scope.row.shareAmount" :disabled="isEdit != scope.$index" placeholder="请输入"></el-input>
+														</el-form-item>
+													</template>
+												</el-table-column>
+												<el-table-column prop="" align="center" label="*参考内部佣金">
+													<template slot-scope="scope">
+														<el-form-item :prop="'goodsLibrarySpecList.' + scope.$index + '.innerShareAmount'" :rules="[{ required: true, message: `请输入参考内部佣金`, trigger: 'blur' },{ pattern:/^(([0-9]\d*)|([0][.]{1}[0-9]{0,2}[1-9]+)|([1-9]\d*[.]{1}[0-9]+))$/g, message: '请输入大于等于0的数', trigger: 'blur' }]" label-width="0">
+															<el-input type="number" v-model="scope.row.innerShareAmount" :disabled="isEdit != scope.$index" placeholder="请输入"></el-input>
+														</el-form-item>
+													</template>
+												</el-table-column>
+												<el-table-column prop="" align="center" label="*参考规格图片">
+													<template slot-scope="scope">
+														<el-form-item :prop="'goodsLibrarySpecList.' + scope.$index + '.imgUrl'" :rules="[{ required: true, message: `请上传参考规格图片`, trigger: 'change' }]" label-width="0">
+															<div class="flex_ac">
+																<ImageUpload :fileList="scope.row.imgUrl" :limit="1" :download="false" :viewOnline="false" :isEdit="true" modType="text" :fileType="['image']"/>
+															</div>
+														</el-form-item>
+													</template>
+												</el-table-column>
+												<el-table-column label="操作" align="center" width="160">
+													<template slot-scope="scope">
+														<el-button size="mini" type="primary" v-if="scope.$index != isEdit" @click="edit(scope.$index)">编辑</el-button>
+														<el-button size="mini" type="danger" @click="del(scope.$index)">删除</el-button>
+													</template>
+												</el-table-column>
+											</el-table>
+										</el-form>
+									</div>
+									<div v-show="stepIndex == 2">
+										<el-form-item label="详情内容" prop="content" :rules="[{ required: true, message: `请输入详情内容`, trigger: 'change' }]">
+											<quillEditor v-model="formData.content"></quillEditor>
+											<input type="hidden" v-model="formData.content">
+										</el-form-item>
+									</div>
+								</el-row>
+							</el-form>
+						</div>
+					</el-card>
+				</div>
+				<div class="footer">
+					<el-button v-if="stepIndex > 0" size="mini" @click="up()">上一步</el-button>
+					<el-button v-if="stepIndex < 2" size="mini" @click="next()">下一步</el-button>
+					<el-button size="mini" @click="formConfirm(data.removeTab)" type="primary">提交</el-button>
+					<el-button size="mini" @click="data.removeTab()">关闭</el-button>
 				</div>
-			</template>
-		</zj-tab-page>
-	</div>
+			</div>
+		</template>
+	</zj-tab-page>
 </template>
 
 <script>