Commit 6f1e182cf223a600141ca2054dadd7ec6c4fc40f
1 parent
b29ac7d0
优化了信息订阅界面布局
Showing
1 changed file
with
148 additions
and
134 deletions
src/views/system/modules/newsOrderPart.vue
... | ... | @@ -10,93 +10,108 @@ |
10 | 10 | <a-button @click="handleCancel">关闭</a-button> |
11 | 11 | </template> |
12 | 12 | <a-spin :spinning="confirmLoading"> |
13 | - <a-form :form="form" > | |
13 | + <a-form :form="form"> | |
14 | 14 | <a-row> |
15 | - <a-col :span="24"> | |
15 | + <a-col :span="24/3"> | |
16 | 16 | <a-form-item label="工作令" :labelCol="labelCol" :wrapperCol="wrapperCol"> |
17 | - <a-input v-decorator="['workNo']" disabled></a-input> | |
17 | + <a-input v-decorator="['workNo']" disabled></a-input> | |
18 | 18 | </a-form-item> |
19 | 19 | </a-col> |
20 | - <a-col :span="24"> | |
20 | + <a-col :span="24/3"> | |
21 | 21 | <a-form-item label="物料编码" :labelCol="labelCol" :wrapperCol="wrapperCol"> |
22 | - <a-input v-decorator="['cno']" placeholder="请输入物料编码" disabled></a-input> | |
22 | + <a-input v-decorator="['cno']" placeholder="请输入物料编码" disabled></a-input> | |
23 | 23 | </a-form-item> |
24 | 24 | </a-col> |
25 | + </a-row> | |
25 | 26 | |
26 | - <a-form-item | |
27 | - :labelCol="labelCol" | |
28 | - :wrapperCol="wrapperCol" | |
29 | - label="采购" | |
30 | - hasFeedback> | |
31 | - <a-switch checkedChildren="订阅" unCheckedChildren="不订阅" @change="onChose" v-model="visibleCheck" /> | |
32 | - </a-form-item> | |
33 | - | |
34 | - <a-form-item | |
35 | - :labelCol="labelCol" | |
36 | - :wrapperCol="wrapperCol" | |
37 | - label="到货" | |
38 | - hasFeedback> | |
39 | - <a-switch checkedChildren="订阅" unCheckedChildren="不订阅" @change="onChose2" v-model="visibleCheck2" /> | |
40 | - </a-form-item> | |
41 | - | |
42 | - <a-form-item | |
43 | - :labelCol="labelCol" | |
44 | - :wrapperCol="wrapperCol" | |
45 | - label="入库" | |
46 | - hasFeedback> | |
47 | - <a-switch checkedChildren="订阅" unCheckedChildren="不订阅" @change="onChose3" v-model="visibleCheck3" /> | |
48 | - </a-form-item> | |
49 | - | |
50 | - <a-form-item | |
51 | - :labelCol="labelCol" | |
52 | - :wrapperCol="wrapperCol" | |
53 | - label="领料" | |
54 | - hasFeedback> | |
55 | - <a-switch checkedChildren="订阅" unCheckedChildren="不订阅" @change="onChose4" v-model="visibleCheck4" /> | |
56 | - </a-form-item> | |
57 | - | |
58 | - <a-form-item | |
59 | - :labelCol="labelCol" | |
60 | - :wrapperCol="wrapperCol" | |
61 | - label="制作" | |
62 | - hasFeedback> | |
63 | - <a-switch checkedChildren="订阅" unCheckedChildren="不订阅" @change="onChose5" v-model="visibleCheck5" /> | |
64 | - </a-form-item> | |
27 | + <a-row> | |
28 | + <a-col :span="24/3"> | |
29 | + <a-form-item | |
30 | + :labelCol="labelCol" | |
31 | + :wrapperCol="wrapperCol" | |
32 | + label="采购" | |
33 | + hasFeedback> | |
34 | + <a-switch checkedChildren="订阅" unCheckedChildren="不订阅" @change="onChose" v-model="visibleCheck"/> | |
35 | + </a-form-item> | |
36 | + </a-col> | |
65 | 37 | |
66 | - <a-form-item | |
67 | - :labelCol="labelCol" | |
68 | - :wrapperCol="wrapperCol" | |
69 | - label="工艺" | |
70 | - hasFeedback> | |
71 | - <a-switch checkedChildren="订阅" unCheckedChildren="不订阅" @change="onChose6" v-model="visibleCheck6" /> | |
72 | - </a-form-item> | |
38 | + <a-col :span="24/3"> | |
39 | + <a-form-item | |
40 | + :labelCol="labelCol" | |
41 | + :wrapperCol="wrapperCol" | |
42 | + label="到货" | |
43 | + hasFeedback> | |
44 | + <a-switch checkedChildren="订阅" unCheckedChildren="不订阅" @change="onChose2" v-model="visibleCheck2"/> | |
45 | + </a-form-item> | |
46 | + </a-col> | |
47 | + <a-col :span="24/3"> | |
48 | + <a-form-item | |
49 | + :labelCol="labelCol" | |
50 | + :wrapperCol="wrapperCol" | |
51 | + label="入库" | |
52 | + hasFeedback> | |
53 | + <a-switch checkedChildren="订阅" unCheckedChildren="不订阅" @change="onChose3" v-model="visibleCheck3"/> | |
54 | + </a-form-item> | |
55 | + </a-col> | |
56 | + </a-row> | |
57 | + <a-row> | |
58 | + <a-col :span="24/3"> | |
59 | + <a-form-item | |
60 | + :labelCol="labelCol" | |
61 | + :wrapperCol="wrapperCol" | |
62 | + label="领料" | |
63 | + hasFeedback> | |
64 | + <a-switch checkedChildren="订阅" unCheckedChildren="不订阅" @change="onChose4" v-model="visibleCheck4"/> | |
65 | + </a-form-item> | |
66 | + </a-col> | |
67 | + <a-col :span="24/3"> | |
68 | + <a-form-item | |
69 | + :labelCol="labelCol" | |
70 | + :wrapperCol="wrapperCol" | |
71 | + label="制作" | |
72 | + hasFeedback> | |
73 | + <a-switch checkedChildren="订阅" unCheckedChildren="不订阅" @change="onChose5" v-model="visibleCheck5"/> | |
74 | + </a-form-item> | |
75 | + </a-col> | |
76 | + <a-col :span="24/3"> | |
77 | + <a-form-item | |
78 | + :labelCol="labelCol" | |
79 | + :wrapperCol="wrapperCol" | |
80 | + label="工艺" | |
81 | + hasFeedback> | |
82 | + <a-switch checkedChildren="订阅" unCheckedChildren="不订阅" @change="onChose6" v-model="visibleCheck6"/> | |
83 | + </a-form-item> | |
84 | + </a-col> | |
85 | + </a-row> | |
73 | 86 | |
87 | + <a-row> | |
74 | 88 | |
75 | - <a-col :span="24" style="text-align: center" class="table-page-search-submitButtons"> | |
89 | + <a-col :span="24" style="text-align: center" class="table-page-search-submitButtons"> | |
76 | 90 | <a-button type="primary" @click="submitForm" icon="check-circle">提 交</a-button> |
77 | 91 | </a-col> |
78 | 92 | </a-row> |
79 | 93 | |
80 | - </a-form> | |
94 | + </a-form> | |
81 | 95 | </a-spin> |
82 | 96 | </a-modal> |
83 | 97 | </template> |
84 | 98 | |
85 | 99 | <script> |
86 | 100 | |
87 | -import { httpAction} from '@/api/manage' | |
88 | -import { JeecgListMixin } from '@/mixins/JeecgListMixin' | |
101 | +import {httpAction} from '@/api/manage' | |
102 | +import {JeecgListMixin} from '@/mixins/JeecgListMixin' | |
89 | 103 | import pick from 'lodash.pick' |
104 | + | |
90 | 105 | export default { |
91 | 106 | name: 'PbomTypeForm', |
92 | - mixins:[JeecgListMixin], | |
93 | - components: { | |
94 | - }, | |
107 | + mixins: [JeecgListMixin], | |
108 | + components: {}, | |
95 | 109 | props: { |
96 | 110 | //流程表单data |
97 | 111 | formData: { |
98 | 112 | type: Object, |
99 | - default: ()=>{}, | |
113 | + default: () => { | |
114 | + }, | |
100 | 115 | required: false |
101 | 116 | }, |
102 | 117 | //表单模式:true流程表单 false普通表单 |
... | ... | @@ -112,54 +127,53 @@ export default { |
112 | 127 | required: false |
113 | 128 | } |
114 | 129 | }, |
115 | - data () { | |
130 | + data() { | |
116 | 131 | return { |
117 | 132 | visible: false, |
118 | 133 | modalWidth: '50%', |
119 | - modalStyle: { 'top': '20px'}, | |
134 | + modalStyle: {'top': '20px'}, | |
120 | 135 | form: this.$form.createForm(this), |
121 | - excludeFlag:"", | |
136 | + excludeFlag: "", | |
122 | 137 | visibleCheck: false, |
123 | - excludeFlag2:"", | |
138 | + excludeFlag2: "", | |
124 | 139 | visibleCheck2: false, |
125 | - excludeFlag3:"", | |
140 | + excludeFlag3: "", | |
126 | 141 | visibleCheck3: false, |
127 | - excludeFlag4:"", | |
142 | + excludeFlag4: "", | |
128 | 143 | visibleCheck4: false, |
129 | - excludeFlag5:"", | |
144 | + excludeFlag5: "", | |
130 | 145 | visibleCheck5: false, |
131 | - excludeFlag6:"", | |
146 | + excludeFlag6: "", | |
132 | 147 | visibleCheck6: false, |
133 | 148 | model: {}, |
134 | - no:'', | |
135 | - flag:false, | |
136 | - flag2:false, | |
149 | + no: '', | |
150 | + flag: false, | |
151 | + flag2: false, | |
137 | 152 | labelCol: { |
138 | - xs: { span: 24 }, | |
139 | - sm: { span: 5 }, | |
153 | + xs: {span: 24}, | |
154 | + sm: {span: 5}, | |
140 | 155 | }, |
141 | 156 | wrapperCol: { |
142 | - xs: { span: 24 }, | |
143 | - sm: { span: 16 }, | |
157 | + xs: {span: 24}, | |
158 | + sm: {span: 16}, | |
144 | 159 | }, |
145 | 160 | confirmLoading: false, |
146 | - validatorRules: { | |
147 | - }, | |
148 | - searchOptions:[{ | |
149 | - text:"外协", | |
150 | - value:"外协" | |
151 | - },{ | |
152 | - text:"自制", | |
153 | - value:"自制" | |
154 | - },{ | |
155 | - text:"外购", | |
156 | - value:"外购" | |
157 | - },{ | |
158 | - text:"工序外协", | |
159 | - value:"工序外协" | |
161 | + validatorRules: {}, | |
162 | + searchOptions: [{ | |
163 | + text: "外协", | |
164 | + value: "外协" | |
165 | + }, { | |
166 | + text: "自制", | |
167 | + value: "自制" | |
168 | + }, { | |
169 | + text: "外购", | |
170 | + value: "外购" | |
171 | + }, { | |
172 | + text: "工序外协", | |
173 | + value: "工序外协" | |
160 | 174 | }], |
161 | 175 | url: { |
162 | - list:"1", | |
176 | + list: "1", | |
163 | 177 | add: "/news/userNewsOrder/add", |
164 | 178 | edit: "/pbom_type/pbomType/edit", |
165 | 179 | queryById: "/pbom_type/pbomType/queryById" |
... | ... | @@ -167,18 +181,18 @@ export default { |
167 | 181 | } |
168 | 182 | }, |
169 | 183 | computed: { |
170 | - formDisabled(){ | |
171 | - if(this.formBpm===true){ | |
172 | - if(this.formData.disabled===false){ | |
184 | + formDisabled() { | |
185 | + if (this.formBpm === true) { | |
186 | + if (this.formData.disabled === false) { | |
173 | 187 | return false |
174 | 188 | } |
175 | 189 | return true |
176 | 190 | } |
177 | 191 | return this.disabled |
178 | 192 | }, |
179 | - showFlowSubmitButton(){ | |
180 | - if(this.formBpm===true){ | |
181 | - if(this.formData.disabled===false){ | |
193 | + showFlowSubmitButton() { | |
194 | + if (this.formBpm === true) { | |
195 | + if (this.formData.disabled === false) { | |
182 | 196 | return true |
183 | 197 | } |
184 | 198 | } |
... | ... | @@ -186,58 +200,58 @@ export default { |
186 | 200 | }, |
187 | 201 | |
188 | 202 | }, |
189 | - created () { | |
203 | + created() { | |
190 | 204 | //如果是流程中表单,则需要加载流程表单data |
191 | 205 | this.showFlowData(); |
192 | 206 | }, |
193 | 207 | methods: { |
194 | - add () { | |
208 | + add() { | |
195 | 209 | this.edit({}); |
196 | 210 | }, |
197 | - edit (record,workNo) { | |
198 | - this.visible=true; | |
211 | + edit(record, workNo) { | |
212 | + this.visible = true; | |
199 | 213 | this.form.resetFields(); |
200 | - this.no=record.cno; | |
214 | + this.no = record.cno; | |
201 | 215 | this.model = Object.assign({}, record); |
202 | 216 | this.visible = true; |
203 | 217 | this.$nextTick(() => { |
204 | - this.form.setFieldsValue(pick(this.model,'cno','uuid','f04','code')) | |
218 | + this.form.setFieldsValue(pick(this.model, 'cno', 'uuid', 'f04', 'code')) | |
205 | 219 | this.form.setFieldsValue({ |
206 | - workNo:workNo | |
220 | + workNo: workNo | |
207 | 221 | }) |
208 | 222 | }) |
209 | - if(record.purchase=='1'){ | |
210 | - this.visibleCheck=true | |
211 | - }else { | |
212 | - this.visibleCheck=false | |
223 | + if (record.purchase == '1') { | |
224 | + this.visibleCheck = true | |
225 | + } else { | |
226 | + this.visibleCheck = false | |
213 | 227 | } |
214 | - if(record.arrival=='1'){ | |
215 | - this.visibleCheck2=true | |
216 | - }else { | |
217 | - this.visibleCheck2=false | |
228 | + if (record.arrival == '1') { | |
229 | + this.visibleCheck2 = true | |
230 | + } else { | |
231 | + this.visibleCheck2 = false | |
218 | 232 | } |
219 | - if(record.warehousing=='1'){ | |
220 | - this.visibleCheck3=true | |
221 | - }else { | |
222 | - this.visibleCheck3=false | |
233 | + if (record.warehousing == '1') { | |
234 | + this.visibleCheck3 = true | |
235 | + } else { | |
236 | + this.visibleCheck3 = false | |
223 | 237 | } |
224 | - if(record.picking=='1'){ | |
225 | - this.visibleCheck4=true | |
226 | - }else { | |
227 | - this.visibleCheck4=false | |
238 | + if (record.picking == '1') { | |
239 | + this.visibleCheck4 = true | |
240 | + } else { | |
241 | + this.visibleCheck4 = false | |
228 | 242 | } |
229 | - if(record.make=='1'){ | |
230 | - this.visibleCheck5=true | |
231 | - }else { | |
232 | - this.visibleCheck5=false | |
243 | + if (record.make == '1') { | |
244 | + this.visibleCheck5 = true | |
245 | + } else { | |
246 | + this.visibleCheck5 = false | |
233 | 247 | } |
234 | - if(record.craft=='1'){ | |
235 | - this.visibleCheck6=true | |
236 | - }else { | |
237 | - this.visibleCheck6=false | |
248 | + if (record.craft == '1') { | |
249 | + this.visibleCheck6 = true | |
250 | + } else { | |
251 | + this.visibleCheck6 = false | |
238 | 252 | } |
239 | 253 | }, |
240 | - handleCancel(){ | |
254 | + handleCancel() { | |
241 | 255 | this.visible = false |
242 | 256 | }, |
243 | 257 | |
... | ... | @@ -301,7 +315,7 @@ export default { |
301 | 315 | } |
302 | 316 | }, |
303 | 317 | |
304 | - submitForm () { | |
318 | + submitForm() { | |
305 | 319 | const that = this; |
306 | 320 | // 触发表单验证 |
307 | 321 | this.form.validateFields((err, values) => { |
... | ... | @@ -309,7 +323,7 @@ export default { |
309 | 323 | that.confirmLoading = true; |
310 | 324 | let httpurl = ''; |
311 | 325 | let method = ''; |
312 | - httpurl+=this.url.add; | |
326 | + httpurl += this.url.add; | |
313 | 327 | method = 'post'; |
314 | 328 | let formData = Object.assign(this.model, values); |
315 | 329 | formData.no = this.no |
... | ... | @@ -319,14 +333,14 @@ export default { |
319 | 333 | formData.picking = this.excludeFlag4 |
320 | 334 | formData.make = this.excludeFlag5 |
321 | 335 | formData.craft = this.excludeFlag6 |
322 | - httpAction(httpurl,formData,method).then((res)=>{ | |
323 | - if(res.success){ | |
336 | + httpAction(httpurl, formData, method).then((res) => { | |
337 | + if (res.success) { | |
324 | 338 | that.$message.success(res.message); |
325 | 339 | this.visible = false |
326 | 340 | that.$emit('ok'); |
327 | 341 | that.$emit('fatherMethod', ''); |
328 | 342 | |
329 | - }else{ | |
343 | + } else { | |
330 | 344 | that.$message.warning(res.message); |
331 | 345 | } |
332 | 346 | }).finally(() => { |
... | ... | @@ -336,8 +350,8 @@ export default { |
336 | 350 | |
337 | 351 | }) |
338 | 352 | }, |
339 | - popupCallback(row){ | |
340 | - this.form.setFieldsValue(pick(row,'cno','uuid','f04','code')) | |
353 | + popupCallback(row) { | |
354 | + this.form.setFieldsValue(pick(row, 'cno', 'uuid', 'f04', 'code')) | |
341 | 355 | }, |
342 | 356 | } |
343 | 357 | } |
... | ... |