Showing
2 changed files
with
22 additions
and
10 deletions
| ... | @@ -4,7 +4,7 @@ | ... | @@ -4,7 +4,7 @@ |
| 4 | :title="title" | 4 | :title="title" |
| 5 | :visible.sync="outerVisible" | 5 | :visible.sync="outerVisible" |
| 6 | :show-close="false" | 6 | :show-close="false" |
| 7 | - width="30%" | 7 | + width="40%" |
| 8 | :close-on-click-modal="false" | 8 | :close-on-click-modal="false" |
| 9 | v-loading="loadings.dialogLoading" | 9 | v-loading="loadings.dialogLoading" |
| 10 | @close="close(false)" | 10 | @close="close(false)" |
| ... | @@ -21,7 +21,7 @@ | ... | @@ -21,7 +21,7 @@ |
| 21 | > | 21 | > |
| 22 | <el-row :gutter="5"> | 22 | <el-row :gutter="5"> |
| 23 | <!-- 用户ID --> | 23 | <!-- 用户ID --> |
| 24 | - <el-col :span="24"> | 24 | + <el-col :span="12"> |
| 25 | <Formitem label="用户ID" prop="userId" type="edit"> | 25 | <Formitem label="用户ID" prop="userId" type="edit"> |
| 26 | <el-input | 26 | <el-input |
| 27 | type="text" | 27 | type="text" |
| ... | @@ -35,7 +35,7 @@ | ... | @@ -35,7 +35,7 @@ |
| 35 | </Formitem> | 35 | </Formitem> |
| 36 | </el-col> | 36 | </el-col> |
| 37 | <!-- key --> | 37 | <!-- key --> |
| 38 | - <!-- <el-col :span="12"> | 38 | + <el-col :span="12"> |
| 39 | <Formitem label="KEY" prop="key" type="edit"> | 39 | <Formitem label="KEY" prop="key" type="edit"> |
| 40 | <el-input | 40 | <el-input |
| 41 | type="text" | 41 | type="text" |
| ... | @@ -47,7 +47,7 @@ | ... | @@ -47,7 +47,7 @@ |
| 47 | placeholder="" | 47 | placeholder="" |
| 48 | ></el-input> | 48 | ></el-input> |
| 49 | </Formitem> | 49 | </Formitem> |
| 50 | - </el-col> --> | 50 | + </el-col> |
| 51 | <!-- 说明 --> | 51 | <!-- 说明 --> |
| 52 | <el-col :span="24"> | 52 | <el-col :span="24"> |
| 53 | <Formitem label="说明" prop="description" type="edit"> | 53 | <Formitem label="说明" prop="description" type="edit"> |
| ... | @@ -114,7 +114,7 @@ export default { | ... | @@ -114,7 +114,7 @@ export default { |
| 114 | rules: { | 114 | rules: { |
| 115 | key: [ | 115 | key: [ |
| 116 | { | 116 | { |
| 117 | - required: true, | 117 | + required: false, |
| 118 | trigger: "blur", | 118 | trigger: "blur", |
| 119 | message: "用户ID不能为空!", | 119 | message: "用户ID不能为空!", |
| 120 | }, | 120 | }, |
| ... | @@ -140,7 +140,7 @@ export default { | ... | @@ -140,7 +140,7 @@ export default { |
| 140 | if (val) { | 140 | if (val) { |
| 141 | this.loadings.dialogLoading = false; | 141 | this.loadings.dialogLoading = false; |
| 142 | if (this.type == "update") { | 142 | if (this.type == "update") { |
| 143 | - this.formData = this.active; | 143 | + this.formData = JSON.parse(JSON.stringify(this.active)); |
| 144 | } | 144 | } |
| 145 | } | 145 | } |
| 146 | }, | 146 | }, |
| ... | @@ -179,6 +179,7 @@ export default { | ... | @@ -179,6 +179,7 @@ export default { |
| 179 | const params = new URLSearchParams(); | 179 | const params = new URLSearchParams(); |
| 180 | params.append("description", description); | 180 | params.append("description", description); |
| 181 | params.append("userId", userId); | 181 | params.append("userId", userId); |
| 182 | + params.append("key", key); | ||
| 182 | 183 | ||
| 183 | generateKey(params) | 184 | generateKey(params) |
| 184 | .then((res) => { | 185 | .then((res) => { | ... | ... |
| ... | @@ -822,17 +822,28 @@ export default { | ... | @@ -822,17 +822,28 @@ export default { |
| 822 | slot: true, | 822 | slot: true, |
| 823 | }, | 823 | }, |
| 824 | { | 824 | { |
| 825 | + name: "申报数量", | ||
| 826 | + value: "qty", | ||
| 827 | + width: "", | ||
| 828 | + align: "left", | ||
| 829 | + }, | ||
| 830 | + { | ||
| 831 | + name: "申报计量单位", | ||
| 832 | + value: "unit", | ||
| 833 | + width: "", | ||
| 834 | + align: "left", | ||
| 835 | + }, | ||
| 836 | + { | ||
| 825 | name: "法定数量", | 837 | name: "法定数量", |
| 826 | value: "qty1", | 838 | value: "qty1", |
| 827 | width: "", | 839 | width: "", |
| 828 | align: "left", | 840 | align: "left", |
| 829 | }, | 841 | }, |
| 830 | { | 842 | { |
| 831 | - name: "法定单位", | 843 | + name: "法定计量单位", |
| 832 | - value: "unit", | 844 | + value: "unit1", |
| 833 | width: "", | 845 | width: "", |
| 834 | align: "left", | 846 | align: "left", |
| 835 | - slot: true, | ||
| 836 | }, | 847 | }, |
| 837 | { | 848 | { |
| 838 | name: "第二数量", | 849 | name: "第二数量", |
| ... | @@ -841,7 +852,7 @@ export default { | ... | @@ -841,7 +852,7 @@ export default { |
| 841 | align: "left", | 852 | align: "left", |
| 842 | }, | 853 | }, |
| 843 | { | 854 | { |
| 844 | - name: "第二单位", | 855 | + name: "第二计量单位", |
| 845 | value: "unit2", | 856 | value: "unit2", |
| 846 | width: "", | 857 | width: "", |
| 847 | align: "left", | 858 | align: "left", | ... | ... |
-
Please register or login to post a comment