修改包邮规则

src/components/setup/mailRules.vue

@@ -25,14 +25,19 @@
             </el-table-column>
            
             <el-table-column
-                prop="FullMoneyPinkage"
-                width="150"
-                label="满额金额">
+                prop="Name"
+                width="180"
+                label="包邮名称">
             </el-table-column>
              <el-table-column
                 prop="FullNumPinkage"
                 width="150"
                 label="满件数">
+            </el-table-column>
+             <el-table-column
+                prop="FullMoneyPinkage"
+                width="150"
+                label="满额金额">
             </el-table-column>
             <el-table-column
             prop="GradeName"

src/components/setup/mailRulesSet.vue

@@ -15,11 +15,22 @@
           <el-button type="primary" @click="flDig=true,keepCategoryList=addMsg.CategoryList" style="margin:0 10px;"
             size="small">选择分类</el-button>
         </el-form-item>
+        <el-form-item label="包邮名称" prop="Name" class="is-required">
+          <el-input v-model="addMsg.Name" placeholder="请输入包邮名称" />
+        </el-form-item>
+        <el-form-item label="包邮类型" prop="IsEnable">
+          <el-radio v-model="rulesType" :label="1" @change='addMsg.FullMoneyPinkage=0'>件数包邮</el-radio>
+          <el-radio v-model="rulesType" :label="2" @change='addMsg.FullNumPinkage=0'>满额包邮</el-radio>
+        </el-form-item>
         <el-form-item label="包邮件数" prop="FullNumPinkage" class="is-required">
-          <el-input v-model="addMsg.FullNumPinkage" placeholder="请输入包邮件数" type='number' :min='0'/>
+          <el-input :disabled="rulesType==1?false:true" v-model="addMsg.FullNumPinkage" placeholder="请输入包邮件数" type='number' :min='0'>
+            <template slot="append">件</template>
+          </el-input>
         </el-form-item>
         <el-form-item label="满额包邮" prop="FullMoneyPinkage" class="is-required">
-          <el-input v-model="addMsg.FullMoneyPinkage" placeholder="请输入满额度"  type='number' :min='0'/>
+          <el-input :disabled="rulesType==2?false:true" v-model="addMsg.FullMoneyPinkage" placeholder="请输入满额度"  type='number' :min='0'>
+             <template slot="append">元</template>
+          </el-input>
         </el-form-item>
         <el-form-item label="是否启用" prop="IsEnable">
           <el-radio v-model="addMsg.IsEnable" :label="1">是</el-radio>
@@ -105,11 +116,13 @@
         cityOptions: [],
         isIndeterminate: true,
         flDig: false,
+        rulesType:1,
         addMsg: {
           Id: 0,
           FullNumPinkage:0,
           FullMoneyPinkage:0,
           IsEnable: 0,
+          Name:'',
           CategoryList: [],
         },
         rules: {
@@ -117,6 +130,11 @@
             required: true,
             message: '请输入件数',
             trigger: 'blur'
+          }],
+           Name: [{
+            required: true,
+            message: '请输入包邮名称',
+            trigger: 'blur'
           }],
           FullMoneyPinkage: [{
             required: true,
@@ -256,6 +274,9 @@
         }, res => {
           this.loading = false;
           this.addMsg = res.data.data;
+          if(this.addMsg.FullMoneyPinkage!=0 && this.addMsg.FullNumPinkage==0){
+            this.rulesType=2
+          }
           this.NewCategoryList = [];
           this.addMsg.CategoryList.forEach(item => {
             item.Name = item.CategoryName;