Browse Source

Merge branch '11/24SAAS' into jin_yin_bao_biao

lex 2 years ago
parent
commit
df7ef0571a

File diff suppressed because it is too large
+ 0 - 0
dist/index.html


File diff suppressed because it is too large
+ 0 - 0
dist/static/css/chunk-222b889a.e9e425b7.css


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.e7c89f36.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-222b889a.1983b813.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-982535a0.1f5d2915.js


+ 4 - 4
src/views/categroyManager/specialSetup/discountManage.vue

@@ -69,7 +69,7 @@
           </el-table-column>
           <el-table-column align='center'
                            prop="fee"
-                           label="经营报表确认收入(%)">
+                           label="经营报表确认收入()">
           </el-table-column>
           <el-table-column align='center'
                            label="操作">
@@ -147,7 +147,7 @@
                     min="0"
                     max="100"></el-input>
         </el-form-item>
-        <el-form-item label="经营报表确认收入(%)"
+        <el-form-item label="经营报表确认收入()"
                       prop="fee"
                       :label-width="formLabelWidth">
           <el-input v-model.trim="form.fee"
@@ -219,8 +219,8 @@ export default {
           { pattern: /^(\d{1,2}(\.[0-9]{1,8})?)$|^100$/, message: '请输入正确的折扣' }
         ],
         fee: [
-          { required: true, message: '请输入折扣值', trigger: 'blur' },
-          { pattern: /^\d{1,2}(\.[0-9]{1,8})?$|^100$/, message: '请输入正确的折扣' }
+          { required: true, message: '请输入经营报表确认收入', trigger: 'blur' },
+          { pattern: /^\d{1,}(\.[0-9]{1,2})?$/, message: '请输入正确的经营报表确认收入' }
         ],
       },
       pageInfo: {

+ 5 - 5
src/views/categroyManager/specialSetup/modals/create-discount.vue

@@ -49,19 +49,19 @@
                         :prop="`types[${index}].fee`"
                         :label-width="formLabelWidth"
                         :rules="[
-                          { required: true, message: '请输入折扣比例', trigger: 'blur' },
-                          { pattern: /^(\d{1,2}(\.[1-9]{1,8})?)$|^100$/, message: '请输入正确的折扣' }
+                          { required: true, message: '请输入经营报表确认收入', trigger: 'blur' },
+                          { pattern: /^(\d{1,}(\.[0-9]{1,2})?)$/, message: '请输入正确的经营报表确认收入' }
                           // { pattern: /^\d+(\.\d{1,8})?$/, message: '请输入正确的折扣' }
                         ]">
             <el-input v-model.trim="form.types[index].fee"
                       autocomplete="off"
                       type="number"
-                      placeholder="请输入折扣比例"
+                      placeholder="请输入经营报表"
                       controls-position="right"
                       class="number-input"
                       :min="0"
                       :max="100">
-                      <template slot="append">%</template>
+                      <template slot="append"></template>
                     </el-input>
           </el-form-item>
         </div>
@@ -137,7 +137,7 @@ export default {
           label: this.typesList[i].label,
           chargeTypeId: this.typesList[i].value,
           goodsDiscountRate: '',
-          fee: 100
+          fee: null
         })
       }
       list = list.sort((a, b) => a.label - b.label)

Some files were not shown because too many files changed in this diff