|
@@ -9,62 +9,57 @@
|
|
|
:width="800"
|
|
|
:centered="true">
|
|
|
<a-form :form="form" @submit="handleSubmit">
|
|
|
- <!-- 箱体类型名称 -->
|
|
|
- <a-form-item label="箱体类型" :label-col="{ span: 5 }" :wrapper-col="{ span: 16 }">
|
|
|
+ <!-- 规则名称 -->
|
|
|
+ <a-form-item label="规则名称" :label-col="{ span: 5 }" :wrapper-col="{ span: 14 }">
|
|
|
<a-input
|
|
|
- placeholder="请输入箱体类型名称(最多30个字符)"
|
|
|
+ placeholder="请输入规则名称(最多30个字符)"
|
|
|
allowClear
|
|
|
:maxLength="30"
|
|
|
- id="roleModal-name"
|
|
|
+ id="addSetModal-name"
|
|
|
v-decorator="['formData.name', {
|
|
|
initialValue: formData.name,getValueFromEvent: $filterEmpty,
|
|
|
- rules: [{ required: true, message: '请输入箱体类型名称(最多30个字符)!' }] }]" />
|
|
|
+ rules: [{ required: true, message: '请输入规则名称(最多30个字符)!' }] }]" />
|
|
|
</a-form-item>
|
|
|
- <!-- 内置箱体数量 -->
|
|
|
- <a-form-item
|
|
|
- label="内置箱体数量"
|
|
|
- :label-col="{ span: 5 }"
|
|
|
- :wrapper-col="{ span: 16 }"
|
|
|
- >
|
|
|
- <a-select
|
|
|
+ <!-- 规则说明 -->
|
|
|
+ <a-form-item label="规则说明" :label-col="{ span: 5 }" :wrapper-col="{ span: 14 }">
|
|
|
+ <a-input
|
|
|
+ placeholder="请输入规则说明(最多500个字符)"
|
|
|
allowClear
|
|
|
- @change="handleNumChange"
|
|
|
- placeholder="请选择"
|
|
|
- v-decorator="['formData.num', {
|
|
|
- initialValue: formData.num,
|
|
|
- rules: [{ required: true, message: '请选择箱体类型!' }] }]">
|
|
|
- <a-select-option v-for="item in numList" :value="item" :key="item">
|
|
|
- {{ item }}
|
|
|
- </a-select-option>
|
|
|
- </a-select>
|
|
|
+ :autoSize="{minRows: 3}"
|
|
|
+ type="textarea"
|
|
|
+ :maxLength="500"
|
|
|
+ id="addSetModal-remarks"
|
|
|
+ v-decorator="['formData.remarks', {
|
|
|
+ initialValue: formData.remarks,getValueFromEvent: $filterEmpty,
|
|
|
+ rules: [{ required: true, message: '请输入规则说明(最多500个字符)!' }] }]" />
|
|
|
</a-form-item>
|
|
|
<!-- 箱体限投 -->
|
|
|
<a-row
|
|
|
type="flex"
|
|
|
align="middle"
|
|
|
- v-for="(k, index) in keys"
|
|
|
- :key="k">
|
|
|
+ v-for="(item, index) in keys"
|
|
|
+ :key="index">
|
|
|
<a-col span="12">
|
|
|
- <!-- 投放开始时间 -->
|
|
|
+ <!-- 请输入投放重量 -->
|
|
|
<a-form-item
|
|
|
- :label=" '内置'+(index+1)+'号箱限投(kg)'"
|
|
|
+ :label="item.dispName"
|
|
|
:required="true"
|
|
|
:label-col=" { span: 10 }"
|
|
|
:wrapper-col=" { span: 14 }"
|
|
|
>
|
|
|
- <a-input
|
|
|
- type="number"
|
|
|
- placeholder="请输入数字(最大1000)"
|
|
|
+ <a-input-number
|
|
|
+ :min="1"
|
|
|
+ :max="999999"
|
|
|
+ precision="2"
|
|
|
+ style="width: 200px;"
|
|
|
+ placeholder="请输入投放重量(g)(最大999999)"
|
|
|
v-decorator="[
|
|
|
- `formData.settings[${k}].limitNum`,
|
|
|
+ `formData.settings[${index}].weight`,
|
|
|
{
|
|
|
validateTrigger: ['change', 'blur'],
|
|
|
rules: [
|
|
|
{
|
|
|
- required: true, message: '请输入限投数量(最大1000)!'
|
|
|
- },
|
|
|
- {
|
|
|
- validator: limitNumChange
|
|
|
+ required: true, message: '请输入投放重量(g)(最大999999)!'
|
|
|
},
|
|
|
],
|
|
|
},
|
|
@@ -72,30 +67,31 @@
|
|
|
/>
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
- <a-form-item ><span class="linenums">至</span></a-form-item>
|
|
|
+ <a-col span="1"></a-col>
|
|
|
<a-col span="9">
|
|
|
- <!-- 请选择分类 -->
|
|
|
+ <!-- 请输入可兑乐豆数 -->
|
|
|
<a-form-item
|
|
|
:label="''"
|
|
|
:required="false"
|
|
|
:wrapper-col="{ span: 18 }">
|
|
|
- <v-select
|
|
|
- ref="orderStatus"
|
|
|
- id="addBoxModal-status"
|
|
|
- code="SETTLE_STATUS_ALL"
|
|
|
- placeholder="请选择分类"
|
|
|
- allowClear
|
|
|
+ <a-input-number
|
|
|
+ :min="1"
|
|
|
+ :max="999999"
|
|
|
+ precision="0"
|
|
|
+ style="width: 200px;"
|
|
|
+ placeholder="请输入可兑乐豆数(最大999999)"
|
|
|
v-decorator="[
|
|
|
- `formData.settings[${k}].type`,
|
|
|
+ `formData.settings[${index}].num`,
|
|
|
{
|
|
|
validateTrigger: ['change', 'blur'],
|
|
|
rules: [
|
|
|
{
|
|
|
- required: true, message: '请选择分类!'
|
|
|
+ required: true, message: '请输入可兑乐豆数(最大999999)!'
|
|
|
},
|
|
|
],
|
|
|
},
|
|
|
- ]">
|
|
|
+ ]"
|
|
|
+ />
|
|
|
</v-select>
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
@@ -122,8 +118,6 @@ import {
|
|
|
import {
|
|
|
saveRolePower
|
|
|
} from '@/api/power-role.js'
|
|
|
-import moment from 'moment'
|
|
|
-import numberToFixed from '@/utils/util.js'
|
|
|
export default {
|
|
|
name: 'RoleModal',
|
|
|
components: {
|
|
@@ -151,67 +145,19 @@ export default {
|
|
|
form: this.$form.createForm(this, {
|
|
|
name: 'AddBoxModal'
|
|
|
}),
|
|
|
- numList: [2, 4, 5], // 内置箱体数量选择
|
|
|
formData: {
|
|
|
name: '',
|
|
|
- num: '',
|
|
|
+ remarks: '',
|
|
|
settings: []
|
|
|
},
|
|
|
keys: []
|
|
|
}
|
|
|
},
|
|
|
methods: {
|
|
|
- numberToFixed,
|
|
|
cancel (e) {
|
|
|
this.clear()
|
|
|
this.$emit('close')
|
|
|
},
|
|
|
- // 校验
|
|
|
- limitNumChange (rule, value, callback) {
|
|
|
- console.log('value', value, rule)
|
|
|
- const times = this.form.getFieldValue('times')
|
|
|
- if ((value <= 0 || value > 1000) && value !== '') {
|
|
|
- callback(new Error('请输入1到1000以内的数字'))
|
|
|
- }
|
|
|
- callback()
|
|
|
- },
|
|
|
- handleChange (e) {
|
|
|
- console.log(e, e.target.value, 'eeeeeee')
|
|
|
- const value = e.target.value
|
|
|
- const ret = this.numberToFixed(value, 2, 1000)
|
|
|
- this.$nextTick(() => {
|
|
|
- this.formData.settings[num][key] = Number(ret)
|
|
|
- })
|
|
|
- // this.value = this.numberToFixed(value, 2, this.max)
|
|
|
- // this.$emit('change', this.value)
|
|
|
- },
|
|
|
- // 内置箱体选择修改
|
|
|
- handleNumChange (v) {
|
|
|
- console.log(v, 'vvvvvvvvvv')
|
|
|
- const arr = []
|
|
|
- const setting = []
|
|
|
- for (let x = 0; x < v; x++) {
|
|
|
- arr.push(x)
|
|
|
- const p = {
|
|
|
- limitNum: '',
|
|
|
- type: ''
|
|
|
- }
|
|
|
- setting.push(p)
|
|
|
- }
|
|
|
- this.formData.settings = setting
|
|
|
- this.keys = arr
|
|
|
- console.log(this.keys, 'this.keys')
|
|
|
- },
|
|
|
- // 小数点后两位
|
|
|
- // numberToFixed (key, index) {
|
|
|
- // console.log(index, key, 'eeeeeeeee')
|
|
|
- // const val = this.form.getFieldValue('settings')
|
|
|
- // console.log(val, 'val')
|
|
|
- // const ret = numberToFixed(val, 2, 1000)
|
|
|
- // this.$nextTick(() => {
|
|
|
- // this.formData.settings[num][key] = Number(ret)
|
|
|
- // })
|
|
|
- // },
|
|
|
// 保存提交
|
|
|
handleSubmit () {
|
|
|
const _this = this
|
|
@@ -258,11 +204,13 @@ export default {
|
|
|
},
|
|
|
isshow (newValue, oldValue) {
|
|
|
if (newValue) {
|
|
|
- this.form.getFieldDecorator('keys', {
|
|
|
- initialValue: [],
|
|
|
- preserve: true
|
|
|
- })
|
|
|
- this.id = 0
|
|
|
+ this.keys = [
|
|
|
+ { dispName: '废旧衣物', code: 'fjyw', id: 11 },
|
|
|
+ { dispName: '废旧衣物', code: 'fjyw', id: 12 },
|
|
|
+ { dispName: '废旧衣物', code: 'fjyw', id: 13 },
|
|
|
+ { dispName: '废旧衣物', code: 'fjyw', id: 14 },
|
|
|
+ { dispName: '废旧衣物', code: 'fjyw', id: 15 }
|
|
|
+ ]
|
|
|
if (this.data.id) { // 编辑
|
|
|
this.titleText = '编辑'
|
|
|
this.formData = Object.assign({}, this.data)
|