Merge branch 'master' of https://gitee.com/nny_1/oilSystem

fuintAdmin/src/views/EventMarketing/SaveBlock/index.vue

@@ -163,8 +163,8 @@
         ref="drawer"
       >
         <div class="demo-drawer__content">
-          <el-form :model="form"  :rules="rules" :inline="true"  >
+          <el-form :model="form"  :rules="rules" :inline="true" :label-position="labelPosition"  >
-            <el-form-item label="面向群体" :label-width="formLabelWidth" >
+            <el-form-item label="面向群体" prop="groupOriented" :label-width="formLabelWidth" >
               <el-radio-group v-model="form.groupOriented">
                 <el-radio label="1">不限群体</el-radio>
                 <el-radio label="2">会员等级</el-radio>
@@ -181,7 +181,7 @@
             </el-row>
             <el-row :gutter="20">
             <el-col :span="14">
-              <el-form-item label="充值金额" :label-width="formLabelWidth" prop="rechargeBalance">
+              <el-form-item   label="充值金额" :label-width="formLabelWidth" prop="rechargeBalance">
                 <el-input type="number" v-model="form.rechargeBalance" autocomplete="off">
                   <template slot="append">元</template>
                 </el-input>
@@ -217,12 +217,6 @@
               </el-col>
             </el-row>
 
-
-
-
-
-
-
             <el-form-item label="赠送特权" :label-width="formLabelWidth" prop="resource">
               <el-radio-group v-model="form.resource">
                 <el-radio label="1">显示</el-radio>
@@ -238,7 +232,7 @@
                 <el-radio label="2">会员每次充值提成</el-radio>
               </el-radio-group>
             </el-form-item>
-            <el-form-item label="提成类型" :label-width="formLabelWidth" prop="formLabelWidth">
+            <el-form-item label="提成类型" :label-width="formLabelWidth" prop="royaltyType">
               <el-radio-group v-model="form.royaltyType">
                 <el-radio label="1">无</el-radio>
                 <el-radio label="2">按提成金额</el-radio>
@@ -580,6 +574,7 @@
     name: 'index',
     data(){
       return{
+        labelPosition:'left',
         pdidlist:[],//判断优惠券id
         pddhidlist:[],//判断兑换券id
         youhuiquanlist:[],
@@ -683,7 +678,7 @@
           cardValueChildList:[],
         },
         tableDatas: [],
-        formLabelWidth: '160px',
+        formLabelWidth: '100px',
         timer: null,
         options: [ ],
         total:0,
@@ -994,4 +989,9 @@
 
 
   }
+  .demo-drawer__content{
+    width: 100%;
+    box-sizing: border-box;
+    padding: 0px 20px;
+  }
 </style>

fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue

@@ -42,7 +42,7 @@
       </el-col>
     </el-row>
 
-    <el-table v-loading="loading" :data="activeConsumptionList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" :data="activeConsumptionList" :label-position="labelPosition" @selection-change="handleSelectionChange">
 
       <el-table-column
         type="index"
@@ -109,7 +109,7 @@
     </el-card>
     <!-- 添加或修改消费有礼活动对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="45%" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="110px">
+      <el-form ref="form" :model="form" :rules="rules" :label-position="labelPosition" label-width="110px">
 
         <el-form-item label="活动名称" prop="name">
           <el-input v-model="form.name" placeholder="请输入活动名称" />
@@ -524,6 +524,7 @@ export default {
   name: "ActiveConsumption",
   data() {
     return {
+      labelPosition:'left',
       userGradeList:[],
       pdidlist:[],//判断优惠券id
       pddhidlist:[],//判断兑换券id

fuintAdmin/src/views/EventMarketing/activeDiscount/index.vue

@@ -95,7 +95,7 @@
     </el-card>
     <!-- 添加或修改折扣营销对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="45%" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+      <el-form ref="form" :model="form" :rules="rules" :label-position="labelPosition" label-width="120px">
         <el-form-item label="活动名称" prop="name">
           <el-input v-model="form.name" placeholder="请输入活动名称" />
         </el-form-item>
@@ -199,6 +199,7 @@ export default {
   name: "ActiveDiscount",
   data() {
     return {
+      labelPosition:'left',
       discount:'',
       amount:'',
       userGradeList:[],

fuintAdmin/src/views/EventMarketing/activeFullminus/index.vue

@@ -42,7 +42,7 @@
         </el-col>
       </el-row>
 
-    <el-table v-loading="loading" :data="activeFullminusList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" :data="activeFullminusList"  @selection-change="handleSelectionChange">
       <el-table-column
         type="index"
         align="center"
@@ -102,7 +102,7 @@
 
     <!-- 添加或修改满减营销对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="45%" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="110px">
+      <el-form ref="form" :model="form" :rules="rules" :label-position="labelPosition" label-width="110px">
         <el-form-item label="活动名称" prop="name">
           <el-input v-model="form.name" placeholder="请输入活动名称" />
         </el-form-item>
@@ -204,6 +204,7 @@ export default {
   name: "ActiveFullminus",
   data() {
     return {
+      labelPosition:'left',
       oillist:['92#','95#','98#','0#','-10#','LNG','CNG','京92#','京95#','京0#'],
       userGradeList: [],
       // 遮罩层

fuintAdmin/src/views/EventMarketing/activeNewlyweds/index.vue

@@ -43,7 +43,7 @@
         </el-col>
       </el-row>
 
-    <el-table v-loading="loading" :data="activeNewlywedsList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" :data="activeNewlywedsList"  :label-position="labelPosition"  @selection-change="handleSelectionChange">
       <el-table-column
         type="index"
         align="center"
@@ -116,8 +116,8 @@
     </el-card>
 
     <!-- 添加或修改新人有礼活动对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="45%" append-to-body>
+    <el-dialog :title="title" :visible.sync="open"  width="45%" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+      <el-form ref="form" :model="form" :rules="rules" :label-position="labelPosition" label-width="110px">
         <el-form-item label="活动名称" prop="name">
           <el-input v-model="form.name" placeholder="请输入活动名称" />
         </el-form-item>
@@ -451,6 +451,7 @@ export default {
   name: "ActiveNewlyweds",
   data() {
     return {
+      labelPosition:'left',
       loadingdialog:false,
       centerDialogVisible:false,
       pdidlist:[],//判断优惠券id

fuintAdmin/src/views/EventMarketing/cardExchange/index.vue

@@ -142,7 +142,7 @@
     </el-card>
     <!-- 添加或修改兑换券对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="40%" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+      <el-form ref="form" :model="form" :rules="rules" :label-position="labelPosition" label-width="100px">
         <!--        <el-form-item label="所属连锁店id" prop="chainStorId">-->
         <!--          <el-input v-model="form.chainStorId" placeholder="请输入所属连锁店id" />-->
         <!--        </el-form-item>-->
@@ -218,6 +218,7 @@ export default {
   name: 'Exchange',
   data() {
     return {
+      labelPosition:'left',
       centerDialogVisible: false,
       loadingdialog:true,
       // 遮罩层

fuintAdmin/src/views/EventMarketing/cardFavorable/index.vue

@@ -142,8 +142,8 @@
     />
     </el-card>
     <!-- 添加或修改优惠券对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="50%" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="50%"  append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+      <el-form ref="form" :model="form" :rules="rules" :label-position="labelPosition"  label-width="100px">
         <el-form-item label="优惠券名称" prop="name">
           <el-input v-model="form.name" placeholder="请输入优惠券名称" />
         </el-form-item>
@@ -215,23 +215,6 @@
           </el-radio-group>
         </el-form-item>
 
-<!--        <el-form-item label="满减金额" prop="fullDeduction">-->
-<!--          <el-input v-model="form.fullDeduction" placeholder="请输入满减金额" />-->
-<!--        </el-form-item>-->
-<!--        <el-form-item label="生效时间" prop="effectiveDateType">
-          <el-radio-group v-model="form.effectiveDateType">
-            <el-radio label="0">领取时间</el-radio>
-            <el-radio label="1">指定时间</el-radio>
-
-          </el-radio-group>
-        </el-form-item>-->
-<!--        <el-form-item label="生效时间" v-if="form.effectiveDateType == 1" prop="effectiveDateStart">
-          <el-time-picker
-            arrow-control
-            v-model="form.effectiveDateStart"
-            placeholder="任意时间点">
-          </el-time-picker>
-        </el-form-item>-->
         <el-form-item label="可用时段" prop="availablePeriod">
             <el-checkbox-group v-model="form.availablePeriod" size="mini" >
               <el-checkbox-button v-for="city in cities" :label="city" :key="city">{{city}}</el-checkbox-button>
@@ -384,6 +367,7 @@ export default {
   name: "Favorable",
   data() {
     return {
+      labelPosition:'left',
       table: false,
       gridData: [
         {

fuintAdmin/src/views/EventMarketing/giftBlock/index.vue

@@ -133,7 +133,7 @@
         width="30%"
         >
 <!--          表-->
-        <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm">
+        <el-form :model="ruleForm" :rules="rules" :label-position="labelPosition" ref="ruleForm" label-width="100px" class="demo-ruleForm">
           <el-form-item label="生成数量" prop="quantity">
             <el-input-number v-model="ruleForm.quantity" controls-position="right" :min="1" :max="10"></el-input-number>
           </el-form-item>
@@ -167,6 +167,7 @@
     name: 'index',
     data() {
       return {
+        labelPosition:'left',
         queryParams: {
           number:'',
           remark:'',