Forráskód Böngészése

Merge branch 'feature-v2.0' into feature-sell

ylong 1 hónapja
szülő
commit
cdbcfdae76

+ 12 - 2
src/views/recycle/orderSetting/components/recycle-order-settings.vue

@@ -24,6 +24,13 @@
                 suffixStr="元"
             />
         </el-form-item>
+        <el-form-item label="满足条件:" prop="andOr">
+            <el-radio-group v-model="form.andOr">
+                <el-radio :label="1">满足任一个</el-radio>
+                <el-radio :label="2">需同时满足</el-radio>
+            </el-radio-group>
+            <div class="ml-4 text-gray-400 text-xs mt-2">(最少本书和最少金额)</div>
+        </el-form-item>
         <el-form-item>
             <el-button
                 type="success"
@@ -53,7 +60,8 @@
     const form = reactive({
         minNum: '',
         maxNum: '',
-        minMoney: ''
+        minMoney: '',
+        andOr: 1
     });
 
     watch(
@@ -63,6 +71,7 @@
                 form.minNum = newVal.recycleOrderMinNum;
                 form.maxNum = newVal.recycleOrderMaxNum;
                 form.minMoney = newVal.recycleOrderMinMoney;
+                form.andOr = newVal.recycleOrderAndOr || 1;
             }
         },
         { immediate: true, deep: true }
@@ -73,7 +82,8 @@
             .post('/recycle/manage/overall/update/recycleOrder', {
                 minNum: form.minNum,
                 maxNum: form.maxNum,
-                minMoney: form.minMoney
+                minMoney: form.minMoney,
+                andOr: form.andOr
             })
             .then((res) => {
                 if (res.data.code === 200) {