1

wesley88
1 parent f69cdc19
Showing 12 changed files with 33 additions and 24 deletions
admin-web-master/src/components/add/addinformation.vue
admin-web-master/src/components/add/addmap.vue
admin-web-master/src/components/add/addmb.vue
admin-web-master/src/components/add/addsam.vue
admin-web-master/src/components/add/addss.vue
admin-web-master/src/components/chakan/sam.vue
admin-web-master/src/components/change/cl.vue
admin-web-master/src/components/editor/index.vue
admin-web-master/src/components/resourceCommodity/index.vue
admin-web-master/src/views/business/autd/index.vue
admin-web-master/src/views/shopRental/rentTermination/add.vue
admin-web-master/src/views/shopRental/rentalMan/add.vue
@@ -82,7 +82,10 @@
         </el-col>
       </el-row>
-
+      <el-form-item label="门牌号" prop="houseNumber">
+        <el-input v-model="ruleForm.houseNumber" placeholder="请输入" 
+          maxlength="20"></el-input>
+      </el-form-item>
       <el-form-item label="详细位置" prop="detailedLocation">
         <el-input v-model="ruleForm.detailedLocation" placeholder="请输入" maxlength="100">
         </el-input>
@@ -18,9 +18,9 @@
       </el-form-item>
       <el-form-item label="轮播顺序" prop="rotationOrder" >
         <el-select v-model="formInline.rotationOrder" placeholder="请选择" style="width: 100%;">
-          <el-option label="1" value="1"></el-option>
-          <el-option label="2" value="2"></el-option>
-          <el-option label="3" value="3"></el-option>
+          <el-option label="第一张" value="第一张"></el-option>
+          <el-option label="第二张" value="第二张"></el-option>
+          <el-option label="第三张" value="第三张"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="广告尺寸" prop="dimensions" >
@@ -267,7 +267,7 @@ import { Input } from &quot;element-ui&quot;;
             value: '',
           },
           {
-            name: '付款日',
+            name: '首次付款日',
             key: 'paymentDay',
             type: '付款日',
             isrequired: '是',
@@ -509,7 +509,11 @@ import { Input } from &quot;element-ui&quot;;
             console.log(valid)
             if (valid) {
               let allist = [...this.list2,...this.list1]
-              this.forminfo.otherInfo = JSON.stringify(allist)
+              let listallcl = allist.map((item) => {
+                item.value = ''
+                 return item;
+              });
+              this.forminfo.otherInfo = JSON.stringify(listallcl)
               console.log(
                 {...this.forminfo}
               )
@@ -74,13 +74,13 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="12" v-if="ruleForm.isRental !== '0'">
+        <!-- <el-col :span="12" v-if="ruleForm.isRental !== '0'">
           <el-form-item label="付款日" prop="payDay">
             <el-select v-model="ruleForm.payDay" placeholder="请选择" style="width: 100%;">
               <el-option :label="item" :value="item" v-for="item in 31" />
             </el-select>
           </el-form-item>
-        </el-col>
+        </el-col> -->
       </el-row>
       <el-form-item v-if="ruleForm.isRental !== '0'" label="优惠政策" prop="preferentialPolicy">
         <wangEditor v-model="ruleForm.preferentialPolicy" ref="editor" :height="100"></wangEditor>
@@ -153,11 +153,11 @@
                 {{scope.row.rentalPrice}}/{{scope.row.leaseTerm}}
               </template>
             </el-table-column>
-            <el-table-column label="付款日">
+            <!-- <el-table-column label="付款日">
               <template slot-scope="scope">
                 {{scope.row.payDay}}
               </template>
-            </el-table-column>
+            </el-table-column> -->
             <el-table-column label="是否出租" prop="isRental">
               <template slot-scope="scope">
                 {{scope.row.isrental == '0'?'自营':'是'}}
@@ -252,13 +252,13 @@
                   </el-select>
                 </el-form-item>
               </el-col>
-              <el-col :span="12" v-if="formInline.isRental !== '0'">
+              <!-- <el-col :span="12" v-if="formInline.isRental !== '0'">
                 <el-form-item label="付款日" prop="payDay">
                   <el-select v-model="formInline.payDay" placeholder="请选择" style="width: 100%;">
                     <el-option :label="item" :value="item" v-for="item in 31" />
                   </el-select>
                 </el-form-item>
-              </el-col>
+              </el-col> -->
             </el-row>
             <el-form-item v-if="formInline.isRental !== '0'" label="优惠政策" prop="preferentialPolicy">
               <wangEditor v-model="formInline.preferentialPolicy" ref="editor" :height="100"></wangEditor>
@@ -223,6 +223,7 @@
             cerePlatformMerchantadd({
               ...this.formInline,
               checkState: '2',
+              state:'1',
               applyTime: this.updateCurrentTime()
             }).then(res => {
               if (res.code == 200) {
@@ -25,11 +25,11 @@
                   </el-col>
                 </el-row>
                 <el-row :gutter="20">
-                  <el-col :span="8">
+                  <!-- <el-col :span="8">
                     <el-form-item label="付款日" prop="payDay">
                       <div  class="duiqi">{{editbgid.payDay  || '无'}}</div>
                     </el-form-item>
-                  </el-col>
+                  </el-col> -->
                   <el-col :span="8">
                     <el-form-item label="租金" prop="rentalPrice">
                       <div  class="duiqi">{{editbgid.rentalPrice  || '无'}}</div>
@@ -40,13 +40,13 @@
                       <div  class="duiqi">{{editbgid.leaseTerm  || '无'}}</div>
                     </el-form-item>
                   </el-col>
-                </el-row>
-                <el-row :gutter="20">
                   <el-col :span="8">
                     <el-form-item label="租赁时段" prop="contact">
                       <div  class="duiqi">{{editbgid.contact  || '无'}}</div>
                     </el-form-item>
                   </el-col>
+                </el-row>
+                <el-row :gutter="20">
                   <el-col :span="8">
                     <el-form-item label="免租条件" prop="rentFreeCondition">
                       <div  class="duiqi">{{editbgid.rentFreeCondition  || '无'}}</div>
@@ -57,9 +57,7 @@
                       <div  class="duiqi">{{editbgid.rentFreePeriod  || '无'}}</div>
                     </el-form-item>
                   </el-col>
-                </el-row>
-                <el-row v-if="editbgid.applicableResources == '商铺'">
-                  <el-col :span="8" >
+                  <el-col :span="8"  v-if="editbgid.applicableResources == '商铺'">
                     <el-form-item label="经营类型" prop="businessType">
                       <div  class="duiqi" >{{editbgid.businessType  || '无'}}</div>
                     </el-form-item>
@@ -27,7 +27,7 @@
               <el-table-column label="适用资源" prop="applicableResources" show-overflow-tooltip></el-table-column>
               <el-table-column label="租金价格" prop="rentalPrice" show-overflow-tooltip></el-table-column>
               <el-table-column label="付款周期" prop="leaseTerm" show-overflow-tooltip></el-table-column>
-              <el-table-column label="付款日" prop="payDay" show-overflow-tooltip></el-table-column>
+              <!-- <el-table-column label="付款日" prop="payDay" show-overflow-tooltip></el-table-column> -->
             </el-table>
           </div>
         </div>
@@ -53,7 +53,7 @@ export default {
       },
       editorConfig: {
-        maxLength:254,
+        // maxLength:254,
         readOnly:false,
         placeholder: "请输入内容...",
         MENU_CONF: {
@@ -73,6 +73,9 @@
                   </el-col>
                 </el-row>
+                <el-form-item label="门牌号" prop="houseNumber">
+                  <div class="duiqi">{{editbgid.houseNumber || '无'}}</div>
+                </el-form-item>
                 <el-form-item label="详细位置" prop="detailedLocation">
                   <div class="duiqi">{{editbgid.detailedLocation || '无'}}</div>
                 </el-form-item>
@@ -161,7 +161,7 @@
         pagequery: {
           pageNumber: 0,
           pageSize: 10,
-          checkState:'1',
+          // checkState:'1',
           name: '',
         },
@@ -30,7 +30,7 @@
       :close-on-click-modal="false" append-to-body>
       <div style="padding:50px 40px;">
         <div class="form-container" ref="contentToConvert" style="background-color:#fff;">
-          <div class="form-header">退租单</div>
+          <div class="form-header">退租告知单</div>
           <div class="form-group">
             <label for="remarks">退租日期：</label>
             <div style="padding:20px;width:100%;border: 1px solid #ccc;" v-html="info.contractTerminationDate"></div>
@@ -30,7 +30,7 @@
       :close-on-click-modal="false" append-to-body>
       <div style="padding:50px 40px;">
         <div class="form-container" ref="contentToConvert" style="background-color:#fff;">
-          <div class="form-header">出租单</div>
+          <div class="form-header">入驻告知单</div>
           <div style="width:100%;" v-html="formInline.exitNotice"></div>
         </div>
         <div style="justify-content:flex-end;margin:20px 20px 0 0;display:flex;">