webapp / GreenwayWeb

Commit 523cfe1924cdbc42e3fdac041aa009cfb13762a9

Authored by wesley88
1 parent f69cdc19

1

Inline Side-by-side
Showing 12 changed files with 33 additions and 24 deletions
admin-web-master/src/components/add/addinformation.vue
  View file @523cfe1
... ... @@ -82,7 +82,10 @@
82 82 </el-col>
83 83 </el-row>
84 84  
85   -
  85 + <el-form-item label="门牌号" prop="houseNumber">
  86 + <el-input v-model="ruleForm.houseNumber" placeholder="请输入"
  87 + maxlength="20"></el-input>
  88 + </el-form-item>
86 89 <el-form-item label="详细位置" prop="detailedLocation">
87 90 <el-input v-model="ruleForm.detailedLocation" placeholder="请输入" maxlength="100">
88 91 </el-input>
... ...
admin-web-master/src/components/add/addmap.vue
  View file @523cfe1
... ... @@ -18,9 +18,9 @@
18 18 </el-form-item>
19 19 <el-form-item label="轮播顺序" prop="rotationOrder" >
20 20 <el-select v-model="formInline.rotationOrder" placeholder="请选择" style="width: 100%;">
21   - <el-option label="1" value="1"></el-option>
22   - <el-option label="2" value="2"></el-option>
23   - <el-option label="3" value="3"></el-option>
  21 + <el-option label="第一张" value="第一张"></el-option>
  22 + <el-option label="第二张" value="第二张"></el-option>
  23 + <el-option label="第三张" value="第三张"></el-option>
24 24 </el-select>
25 25 </el-form-item>
26 26 <el-form-item label="广告尺寸" prop="dimensions" >
... ...
admin-web-master/src/components/add/addmb.vue
  View file @523cfe1
... ... @@ -267,7 +267,7 @@ import { Input } from &quot;element-ui&quot;;
267 267 value: '',
268 268 },
269 269 {
270   - name: '付款日',
  270 + name: '首次付款日',
271 271 key: 'paymentDay',
272 272 type: '付款日',
273 273 isrequired: '是',
... ... @@ -509,7 +509,11 @@ import { Input } from &quot;element-ui&quot;;
509 509 console.log(valid)
510 510 if (valid) {
511 511 let allist = [...this.list2,...this.list1]
512   - this.forminfo.otherInfo = JSON.stringify(allist)
  512 + let listallcl = allist.map((item) => {
  513 + item.value = ''
  514 + return item;
  515 + });
  516 + this.forminfo.otherInfo = JSON.stringify(listallcl)
513 517 console.log(
514 518 {...this.forminfo}
515 519 )
... ...
admin-web-master/src/components/add/addsam.vue
  View file @523cfe1
... ... @@ -74,13 +74,13 @@
74 74 </el-select>
75 75 </el-form-item>
76 76 </el-col>
77   - <el-col :span="12" v-if="ruleForm.isRental !== '0'">
  77 + <!-- <el-col :span="12" v-if="ruleForm.isRental !== '0'">
78 78 <el-form-item label="付款日" prop="payDay">
79 79 <el-select v-model="ruleForm.payDay" placeholder="请选择" style="width: 100%;">
80 80 <el-option :label="item" :value="item" v-for="item in 31" />
81 81 </el-select>
82 82 </el-form-item>
83   - </el-col>
  83 + </el-col> -->
84 84 </el-row>
85 85 <el-form-item v-if="ruleForm.isRental !== '0'" label="优惠政策" prop="preferentialPolicy">
86 86 <wangEditor v-model="ruleForm.preferentialPolicy" ref="editor" :height="100"></wangEditor>
... ... @@ -153,11 +153,11 @@
153 153 {{scope.row.rentalPrice}}/{{scope.row.leaseTerm}}
154 154 </template>
155 155 </el-table-column>
156   - <el-table-column label="付款日">
  156 + <!-- <el-table-column label="付款日">
157 157 <template slot-scope="scope">
158 158 {{scope.row.payDay}}
159 159 </template>
160   - </el-table-column>
  160 + </el-table-column> -->
161 161 <el-table-column label="是否出租" prop="isRental">
162 162 <template slot-scope="scope">
163 163 {{scope.row.isrental == '0'?'自营':'是'}}
... ... @@ -252,13 +252,13 @@
252 252 </el-select>
253 253 </el-form-item>
254 254 </el-col>
255   - <el-col :span="12" v-if="formInline.isRental !== '0'">
  255 + <!-- <el-col :span="12" v-if="formInline.isRental !== '0'">
256 256 <el-form-item label="付款日" prop="payDay">
257 257 <el-select v-model="formInline.payDay" placeholder="请选择" style="width: 100%;">
258 258 <el-option :label="item" :value="item" v-for="item in 31" />
259 259 </el-select>
260 260 </el-form-item>
261   - </el-col>
  261 + </el-col> -->
262 262 </el-row>
263 263 <el-form-item v-if="formInline.isRental !== '0'" label="优惠政策" prop="preferentialPolicy">
264 264 <wangEditor v-model="formInline.preferentialPolicy" ref="editor" :height="100"></wangEditor>
... ...
admin-web-master/src/components/add/addss.vue
  View file @523cfe1
... ... @@ -223,6 +223,7 @@
223 223 cerePlatformMerchantadd({
224 224 ...this.formInline,
225 225 checkState: '2',
  226 + state:'1',
226 227 applyTime: this.updateCurrentTime()
227 228 }).then(res => {
228 229 if (res.code == 200) {
... ...
admin-web-master/src/components/chakan/sam.vue
  View file @523cfe1
... ... @@ -25,11 +25,11 @@
25 25 </el-col>
26 26 </el-row>
27 27 <el-row :gutter="20">
28   - <el-col :span="8">
  28 + <!-- <el-col :span="8">
29 29 <el-form-item label="付款日" prop="payDay">
30 30 <div class="duiqi">{{editbgid.payDay || '无'}}</div>
31 31 </el-form-item>
32   - </el-col>
  32 + </el-col> -->
33 33 <el-col :span="8">
34 34 <el-form-item label="租金" prop="rentalPrice">
35 35 <div class="duiqi">{{editbgid.rentalPrice || '无'}}</div>
... ... @@ -40,13 +40,13 @@
40 40 <div class="duiqi">{{editbgid.leaseTerm || '无'}}</div>
41 41 </el-form-item>
42 42 </el-col>
43   - </el-row>
44   - <el-row :gutter="20">
45 43 <el-col :span="8">
46 44 <el-form-item label="租赁时段" prop="contact">
47 45 <div class="duiqi">{{editbgid.contact || '无'}}</div>
48 46 </el-form-item>
49 47 </el-col>
  48 + </el-row>
  49 + <el-row :gutter="20">
50 50 <el-col :span="8">
51 51 <el-form-item label="免租条件" prop="rentFreeCondition">
52 52 <div class="duiqi">{{editbgid.rentFreeCondition || '无'}}</div>
... ... @@ -57,9 +57,7 @@
57 57 <div class="duiqi">{{editbgid.rentFreePeriod || '无'}}</div>
58 58 </el-form-item>
59 59 </el-col>
60   - </el-row>
61   - <el-row v-if="editbgid.applicableResources == '商铺'">
62   - <el-col :span="8" >
  60 + <el-col :span="8" v-if="editbgid.applicableResources == '商铺'">
63 61 <el-form-item label="经营类型" prop="businessType">
64 62 <div class="duiqi" >{{editbgid.businessType || '无'}}</div>
65 63 </el-form-item>
... ...
admin-web-master/src/components/change/cl.vue
  View file @523cfe1
... ... @@ -27,7 +27,7 @@
27 27 <el-table-column label="适用资源" prop="applicableResources" show-overflow-tooltip></el-table-column>
28 28 <el-table-column label="租金价格" prop="rentalPrice" show-overflow-tooltip></el-table-column>
29 29 <el-table-column label="付款周期" prop="leaseTerm" show-overflow-tooltip></el-table-column>
30   - <el-table-column label="付款日" prop="payDay" show-overflow-tooltip></el-table-column>
  30 + <!-- <el-table-column label="付款日" prop="payDay" show-overflow-tooltip></el-table-column> -->
31 31 </el-table>
32 32 </div>
33 33 </div>
... ...
admin-web-master/src/components/editor/index.vue
  View file @523cfe1
... ... @@ -53,7 +53,7 @@ export default {
53 53  
54 54 },
55 55 editorConfig: {
56   - maxLength:254,
  56 + // maxLength:254,
57 57 readOnly:false,
58 58 placeholder: "请输入内容...",
59 59 MENU_CONF: {
... ...
admin-web-master/src/components/resourceCommodity/index.vue
  View file @523cfe1
... ... @@ -73,6 +73,9 @@
73 73  
74 74 </el-col>
75 75 </el-row>
  76 + <el-form-item label="门牌号" prop="houseNumber">
  77 + <div class="duiqi">{{editbgid.houseNumber || '无'}}</div>
  78 + </el-form-item>
76 79 <el-form-item label="详细位置" prop="detailedLocation">
77 80 <div class="duiqi">{{editbgid.detailedLocation || '无'}}</div>
78 81 </el-form-item>
... ...
admin-web-master/src/views/business/autd/index.vue
  View file @523cfe1
... ... @@ -161,7 +161,7 @@
161 161 pagequery: {
162 162 pageNumber: 0,
163 163 pageSize: 10,
164   - checkState:'1',
  164 + // checkState:'1',
165 165 name: '',
166 166  
167 167 },
... ...
admin-web-master/src/views/shopRental/rentTermination/add.vue
  View file @523cfe1
... ... @@ -30,7 +30,7 @@
30 30 :close-on-click-modal="false" append-to-body>
31 31 <div style="padding:50px 40px;">
32 32 <div class="form-container" ref="contentToConvert" style="background-color:#fff;">
33   - <div class="form-header">退租单</div>
  33 + <div class="form-header">退租告知单</div>
34 34 <div class="form-group">
35 35 <label for="remarks">退租日期：</label>
36 36 <div style="padding:20px;width:100%;border: 1px solid #ccc;" v-html="info.contractTerminationDate"></div>
... ...
admin-web-master/src/views/shopRental/rentalMan/add.vue
  View file @523cfe1
... ... @@ -30,7 +30,7 @@
30 30 :close-on-click-modal="false" append-to-body>
31 31 <div style="padding:50px 40px;">
32 32 <div class="form-container" ref="contentToConvert" style="background-color:#fff;">
33   - <div class="form-header">出租单</div>
  33 + <div class="form-header">入驻告知单</div>
34 34 <div style="width:100%;" v-html="formInline.exitNotice"></div>
35 35 </div>
36 36 <div style="justify-content:flex-end;margin:20px 20px 0 0;display:flex;">
... ...