浏览代码

UserField Ranks

master
30117125 4 年前
父节点
当前提交
5ee1742d3b

+ 21
- 11
src/components/property/commercial/createProperty/commercialCreateNew.vue 查看文件

96
                   <currency-input
96
                   <currency-input
97
                     onClick="this.setSelectionRange(0, this.value.length)"
97
                     onClick="this.setSelectionRange(0, this.value.length)"
98
                     name="price"
98
                     name="price"
99
-                    :value="value"
100
-                    @input="value = $event"
99
+                    :value="property.price"
100
+                    @input="property.price = $event"
101
                     v-model="property.price"
101
                     v-model="property.price"
102
                     id="price"
102
                     id="price"
103
                     class="form-control uniInput"
103
                     class="form-control uniInput"
139
                   class="form-control uniInput"
139
                   class="form-control uniInput"
140
                   type="text"
140
                   type="text"
141
                   name="streetNumber"
141
                   name="streetNumber"
142
-                  id="unit"
142
+                  id="streetNumber"
143
                   v-model="property.streetNumber"
143
                   v-model="property.streetNumber"
144
                   disabled
144
                   disabled
145
                 />
145
                 />
154
                   class="form-control uniInput"
154
                   class="form-control uniInput"
155
                   type="text"
155
                   type="text"
156
                   name="streetName"
156
                   name="streetName"
157
-                  id="unit"
157
+                  id="streetName"
158
                   v-model="property.streetName"
158
                   v-model="property.streetName"
159
                   disabled
159
                   disabled
160
                 />
160
                 />
169
                   class="form-control uniInput"
169
                   class="form-control uniInput"
170
                   type="text"
170
                   type="text"
171
                   name="suburb"
171
                   name="suburb"
172
-                  id="unit"
172
+                  id="suburb"
173
                   v-model="property.suburb"
173
                   v-model="property.suburb"
174
                   disabled
174
                   disabled
175
                 />
175
                 />
184
                   class="form-control uniInput"
184
                   class="form-control uniInput"
185
                   type="text"
185
                   type="text"
186
                   name="city"
186
                   name="city"
187
-                  id="unit"
187
+                  id="city"
188
                   v-model="property.city"
188
                   v-model="property.city"
189
                   disabled
189
                   disabled
190
                 />
190
                 />
199
                   class="form-control uniInput"
199
                   class="form-control uniInput"
200
                   type="text"
200
                   type="text"
201
                   name="province"
201
                   name="province"
202
-                  id="unit"
202
+                  id="province"
203
                   v-model="property.province"
203
                   v-model="property.province"
204
                   disabled
204
                   disabled
205
                 />
205
                 />
214
                   class="form-control uniInput"
214
                   class="form-control uniInput"
215
                   type="text"
215
                   type="text"
216
                   name="postalCode"
216
                   name="postalCode"
217
-                  id="unit"
217
+                  id="postalCode"
218
                   v-model="property.postalCode"
218
                   v-model="property.postalCode"
219
                   disabled
219
                   disabled
220
                 />
220
                 />
229
                   class="form-control uniInput"
229
                   class="form-control uniInput"
230
                   type="text"
230
                   type="text"
231
                   name="country"
231
                   name="country"
232
-                  id="unit"
232
+                  id="country"
233
                   v-model="property.country"
233
                   v-model="property.country"
234
                   disabled
234
                   disabled
235
                 />
235
                 />
261
         <div v-for="item in propertyFields" :key="item.id">
261
         <div v-for="item in propertyFields" :key="item.id">
262
           <div v-if="item.name === 'Commercial Fields'">
262
           <div v-if="item.name === 'Commercial Fields'">
263
             <UserField
263
             <UserField
264
-              :fields="item.fields"
264
+              :fields="sortFields"
265
               :id="item.name"
265
               :id="item.name"
266
               @UpdateUserDefinedFields="UpdateUserDefinedFields"
266
               @UpdateUserDefinedFields="UpdateUserDefinedFields"
267
               :fieldValues="item.fields"
267
               :fieldValues="item.fields"
268
             />
268
             />
269
           </div>
269
           </div>
270
         </div>
270
         </div>
271
+
271
         <div class="row">
272
         <div class="row">
272
           <div class="col-sm-12">
273
           <div class="col-sm-12">
273
             <div class="section-header">
274
             <div class="section-header">
374
       addressSet: false,
375
       addressSet: false,
375
       showPropertyTypeError: false,
376
       showPropertyTypeError: false,
376
       showDateError: false,
377
       showDateError: false,
377
-      user: Log.getUser(),
378
+      userParam: Log.getUser(),
378
       mayEdit: Log.isLoggedIn()
379
       mayEdit: Log.isLoggedIn()
379
     };
380
     };
380
   },
381
   },
407
     TypeChanged() {
408
     TypeChanged() {
408
       this.property.propertyUsageType = this.propertyType;
409
       this.property.propertyUsageType = this.propertyType;
409
     },
410
     },
411
+
410
     SubmitData() {
412
     SubmitData() {
411
       if (this.property.propertyTypeId === 0) {
413
       if (this.property.propertyTypeId === 0) {
412
         this.showPropertyTypeError = true;
414
         this.showPropertyTypeError = true;
542
     ]),
544
     ]),
543
     ...mapState("authentication", ["user"]),
545
     ...mapState("authentication", ["user"]),
544
     ...mapGetters("fees", ["getListingFee"]),
546
     ...mapGetters("fees", ["getListingFee"]),
547
+    sortFields() {
548
+      var display = [];
549
+
550
+      display = this.propertyFields[0].fields.sort((a, b) => (a.rank > b.rank ? 1 : -1));
551
+      console.log(display);
552
+
553
+      return display;
554
+    },
545
     SalesTypeChanged() {
555
     SalesTypeChanged() {
546
       // eslint-disable-next-line vue/no-side-effects-in-computed-properties
556
       // eslint-disable-next-line vue/no-side-effects-in-computed-properties
547
       // this.propertyType = this.$route.params.propType;
557
       // this.propertyType = this.$route.params.propType;

+ 15
- 13
src/components/property/residential/createProperty/residentialCreateNew.vue 查看文件

80
                 </div>
80
                 </div>
81
                 <float-label label="Price">
81
                 <float-label label="Price">
82
                   <currency-input
82
                   <currency-input
83
-                    onClick="this.setSelectionRange(0, this.value.length)"
84
                     name="price"
83
                     name="price"
85
-                    :value="value"
86
-                    @input="value = $event"
84
+                    :value="property.price"
85
+                    @input="property.price = $event"
87
                     v-model="property.price"
86
                     v-model="property.price"
88
                     id="price"
87
                     id="price"
89
                     class="form-control uniInput"
88
                     class="form-control uniInput"
125
                   class="form-control uniInput"
124
                   class="form-control uniInput"
126
                   type="text"
125
                   type="text"
127
                   name="streetNumber"
126
                   name="streetNumber"
128
-                  id="unit"
127
+                  id="streetNumber"
129
                   v-model="property.streetNumber"
128
                   v-model="property.streetNumber"
130
                   disabled
129
                   disabled
131
                 />
130
                 />
140
                   class="form-control uniInput"
139
                   class="form-control uniInput"
141
                   type="text"
140
                   type="text"
142
                   name="streetName"
141
                   name="streetName"
143
-                  id="unit"
142
+                  id="streetName"
144
                   v-model="property.streetName"
143
                   v-model="property.streetName"
145
                   disabled
144
                   disabled
146
                 />
145
                 />
155
                   class="form-control uniInput"
154
                   class="form-control uniInput"
156
                   type="text"
155
                   type="text"
157
                   name="suburb"
156
                   name="suburb"
158
-                  id="unit"
157
+                  id="suburb"
159
                   v-model="property.suburb"
158
                   v-model="property.suburb"
160
                   disabled
159
                   disabled
161
                 />
160
                 />
170
                   class="form-control uniInput"
169
                   class="form-control uniInput"
171
                   type="text"
170
                   type="text"
172
                   name="city"
171
                   name="city"
173
-                  id="unit"
172
+                  id="city"
174
                   v-model="property.city"
173
                   v-model="property.city"
175
                   disabled
174
                   disabled
176
                 />
175
                 />
185
                   class="form-control uniInput"
184
                   class="form-control uniInput"
186
                   type="text"
185
                   type="text"
187
                   name="province"
186
                   name="province"
188
-                  id="unit"
187
+                  id="province"
189
                   v-model="property.province"
188
                   v-model="property.province"
190
                   disabled
189
                   disabled
191
                 />
190
                 />
200
                   class="form-control uniInput"
199
                   class="form-control uniInput"
201
                   type="text"
200
                   type="text"
202
                   name="postalCode"
201
                   name="postalCode"
203
-                  id="unit"
202
+                  id="postalCode"
204
                   v-model="property.postalCode"
203
                   v-model="property.postalCode"
205
                   disabled
204
                   disabled
206
                 />
205
                 />
215
                   class="form-control uniInput"
214
                   class="form-control uniInput"
216
                   type="text"
215
                   type="text"
217
                   name="country"
216
                   name="country"
218
-                  id="unit"
217
+                  id="country"
219
                   v-model="property.country"
218
                   v-model="property.country"
220
                   disabled
219
                   disabled
221
                 />
220
                 />
261
           :fields="propertyOverviewFields[0].fields"
260
           :fields="propertyOverviewFields[0].fields"
262
           @UpdateUserDefinedFields="UpdateUserDefinedFields"
261
           @UpdateUserDefinedFields="UpdateUserDefinedFields"
263
           :id="1"
262
           :id="1"
264
-        ></UserField>
265
-        <div class="row">
263
+        ></UserField> -->
264
+        <!-- <div class="row">
266
           <div class="col-md-12">
265
           <div class="col-md-12">
267
             <div v-for="item in propertyFields" :key="item.id">
266
             <div v-for="item in propertyFields" :key="item.id">
268
               <div class="row">
267
               <div class="row">
387
       addressSet: false,
386
       addressSet: false,
388
       showPropertyTypeError: false,
387
       showPropertyTypeError: false,
389
       showDateError: false,
388
       showDateError: false,
390
-      user: Log.getUser(),
389
+      userParam: Log.getUser(),
391
       mayEdit: Log.isLoggedIn()
390
       mayEdit: Log.isLoggedIn()
392
     };
391
     };
393
   },
392
   },
568
     ]),
567
     ]),
569
     ...mapState("authentication", ["user"]),
568
     ...mapState("authentication", ["user"]),
570
     ...mapGetters("fees", ["getListingFee"]),
569
     ...mapGetters("fees", ["getListingFee"]),
570
+    sortFields() {
571
+      return this.propertyFields[0].fields.sort((a, b) => (a.rank > b.rank ? 1 : -1));
572
+    },
571
     SalesTypeChanged() {
573
     SalesTypeChanged() {
572
       // eslint-disable-next-line vue/no-side-effects-in-computed-properties
574
       // eslint-disable-next-line vue/no-side-effects-in-computed-properties
573
       // this.propertyType = this.$route.params.propType;
575
       // this.propertyType = this.$route.params.propType;

+ 1
- 1
vue.config.js 查看文件

2
   devServer: {
2
   devServer: {
3
     proxy: {
3
     proxy: {
4
       "/api": {
4
       "/api": {
5
-        // target: "http://localhost:57260/",
5
+        //target: "http://localhost:57260/",
6
         target: "http://training.provision-sa.com:82",
6
         target: "http://training.provision-sa.com:82",
7
         changeOrigin: true
7
         changeOrigin: true
8
       },
8
       },

正在加载...
取消
保存