合并

MrShi

18 小时以前 e4f9739d74323aacf09d139700f22a383910ee97

 admin/src/components/business/OperaLabelsFeeAreaWindow.vue

@@ -2,12 +2,12 @@
  <GlobalWindow
    v-loading="isUploading"
    :title="title"
    width="70%"
    width="60%"
    :visible.sync="visible"
    :confirm-working="isWorking"
    @confirm="confirm"
  >
    <el-form :model="form" ref="form" :rules="rules" label-width="120px" label-suffix="："  inline>
    <el-form :model="form" ref="form" :rules="rules" label-width="120px" label-suffix="："   >
      <el-form-item label="规则名称" prop="name">
        <el-input v-model="form.name" placeholder="请输入规则名称"  v-trim/>
      </el-form-item>
@@ -21,20 +21,20 @@
          ></el-option>
        </el-select>
      </el-form-item>
      <div style="display: flex">
        <el-form-item label="首重" prop="weight0" style="display: inline-block;flex: 1;">
          <el-input  v-model="form.weight0"    style="width: 150px" placeholder="请输入首重"    type="number">    <template slot="append" >kg</template>  </el-input>
      <div style="display: flex;width: 100%;">
        <el-form-item label="首重" prop="weight0" style="flex: 1" >
          <el-input  v-model="form.weight0"    style="width: 200px" placeholder="请输入首重"    type="number">    <template slot="append" >kg</template>  </el-input>
        </el-form-item>
        <el-form-item label="首重运费" prop="fee0" style="display: inline-block;flex: 1;">
          <el-input  v-model="form.fee0"  style="width: 150px"    placeholder="请输入金额"  > <template slot="append" >元</template> </el-input>
        <el-form-item label="首重运费" prop="fee0"  style="flex: 1"  >
          <el-input  v-model="form.fee0"  style="width: 200px"    placeholder="请输入金额"  > <template slot="append" >元</template> </el-input>
        </el-form-item>
      </div>
      <div style="display: flex">
      <el-form-item label="续重" prop="weight1" style="display: inline-block;flex:1">
        <el-input  v-model="form.weight1" style="width: 150px"    placeholder="请输入续重"    type="number">    <template slot="append" >kg</template>  </el-input>
      <div style="display: flex;width: 100%;">
      <el-form-item label="续重" prop="weight1"  style="flex: 1" >
        <el-input  v-model="form.weight1" style="width: 200px"    placeholder="请输入续重"    type="number">    <template slot="append" >kg</template>  </el-input>
      </el-form-item>
      <el-form-item label="续重运费增加" prop="fee1" style="display: inline-block;flex: 1;">
        <el-input  v-model="form.fee1" style="width: 150px"    placeholder="请输入金额"  > <template slot="append" >元</template> </el-input>
      <el-form-item label="续重运费增加" prop="fee1"   style="flex: 1" >
        <el-input  v-model="form.fee1" style="width: 200px"    placeholder="请输入金额"  > <template slot="append" >元</template> </el-input>
      </el-form-item>
    </div>
      <el-form-item label="排序码" prop="sortnum">