1

src/components/my-dialog/bigDialog.vue

@@ -69,9 +69,7 @@ export default {
 
 }
 
-.el-dialog__body {
-	padding: 0 !important;
-}
+
 
 .el-dialog {
 	pointer-events: auto;

src/components/my-dialog/detailDialogBack.vue

@@ -73,9 +73,7 @@ export default {
     }
 
 }
-/deep/ .el-dialog__body {
-    padding: 0 !important;
-}
+
 
 .dd_class_div {
     width: 1920px;

src/components/my-dialog/dialogFor.vue

@@ -74,9 +74,7 @@ export default {
     }
 
 }
-/deep/ .el-dialog__body {
-    padding: 0 !important;
-}
+
 
 .dd_class_div {
     width: 1920px;

src/components/my-dialog/dialogWarning.vue

@@ -73,9 +73,7 @@ export default {
 //    }
 //
 //}
-/deep/ .el-dialog__body {
-    padding: 0 !important;
-}
+
 
 .dialogWarning {
     height: 1059px !important;

src/components/my-dialog/index.vue

@@ -73,9 +73,7 @@ export default {
 	}
 
 }
-/deep/ .el-dialog__body {
-	padding: 0 !important;
-}
+
 
 .dd_class_div {
 	width: 3840px;

src/views/door/gateway.vue

@@ -2517,9 +2517,7 @@ line-height: 14px;
                 cursor: pointer;
             }
         }
-        .el-dialog__body{
-            padding: 0;
-        }
+
         .dialog_content{
             padding: 16px 0;
             max-height: 800px;

src/views/life-line/components/emergency-List/list/expertsList.vue

@@ -417,9 +417,7 @@ export default {
         line-height: 40px !important;
     }
 
-    .el-dialog__body {
-        padding: 0 !important;
-    }
+
 
     .el-dialog {
         pointer-events: auto;

src/views/life-line/components/emergency-List/list/majorHazardList.vue

@@ -482,9 +482,7 @@ export default {
         line-height: 40px !important;
     }
 
-    .el-dialog__body {
-        padding: 0 !important;
-    }
+
 
     .el-dialog {
         pointer-events: auto;

src/views/life-line/components/emergency-List/list/medicalList.vue

@@ -434,9 +434,7 @@ export default {
         line-height: 40px !important;
     }
 
-    .el-dialog__body {
-        padding: 0 !important;
-    }
+
 
     .el-dialog {
         pointer-events: auto;

src/views/life-line/components/emergency-List/list/planList.vue

@@ -409,9 +409,7 @@ export default {
         line-height: 40px !important;
     }
 
-    .el-dialog__body {
-        padding: 0 !important;
-    }
+
 
     .el-dialog {
         pointer-events: auto;

src/views/life-line/components/emergency-List/list/rescueTeamList.vue

@@ -455,9 +455,7 @@ export default {
         line-height: 40px !important;
     }
 
-    .el-dialog__body {
-        padding: 0 !important;
-    }
+
 
     .el-dialog {
         pointer-events: auto;

src/views/life-line/components/emergency-List/list/shelterList.vue

@@ -501,9 +501,7 @@ export default {
         line-height: 40px !important;
     }
 
-    .el-dialog__body {
-        padding: 0 !important;
-    }
+
 
     .el-dialog {
         pointer-events: auto;

src/views/life-line/components/emergency-List/list/suppliesList.vue

@@ -494,9 +494,7 @@ export default {
         line-height: 40px !important;
     }
 
-    .el-dialog__body {
-        padding: 0 !important;
-    }
+
 
     .el-dialog {
         pointer-events: auto;

src/views/life-line/components/emergency-List/list/warehouseList.vue

@@ -493,9 +493,7 @@ export default {
             line-height: 40px !important;
         }
 
-        .el-dialog__body {
-            padding: 0 !important;
-        }
+
 
         .el-dialog {
             pointer-events: auto;

src/views/life-line/monitor/components/event-analysis.vue

@@ -648,9 +648,7 @@ export default {
             line-height: 80px !important;
         }
 
-        .el-dialog__body {
-            padding: 0 !important;
-        }
+
 
         .el-dialog {
             pointer-events: auto;

src/views/life-line/monitor/components/hiddenDanger-analysis.vue

@@ -462,9 +462,7 @@ export default {
             height: 80px !important;
             line-height: 80px !important;
         }
-        .el-dialog__body {
-            padding: 0 !important;
-        }
+
 
         .el-dialog {
             pointer-events: auto;

src/views/life-line/monitor/components/hiddenDangereventAnalysis.vue

@@ -672,9 +672,7 @@ export default {
             line-height: 80px !important;
         }
 
-        .el-dialog__body {
-            padding: 0 !important;
-        }
+
 
         .el-dialog {
             pointer-events: auto;

src/views/life-line/monitor/components/risk-analysis.vue

@@ -642,9 +642,7 @@ export default {
             line-height: 80px !important;
         }
 
-        .el-dialog__body {
-            padding: 0 !important;
-        }
+
 
         .el-dialog {
             pointer-events: auto;

src/views/life-line/situational-components/realTimingList/realTiming.vue

@@ -627,9 +627,7 @@ export default {
         line-height: 80px !important;
     }
 
-    .el-dialog__body {
-        padding: 0 !important;
-    }
+
 
     .el-dialog {
         pointer-events: auto;

src/views/receiveRefundsManagement/depositManagement/index.vue

@@ -84,7 +84,7 @@
           <el-table-column header-align="center" label="操作" width="380">
             <template scope="scope">
               <el-button size="mini" type="text" @click="handleView(scope.row)">查看</el-button>
-              <el-button size="mini" type="text" @click="downLoad(scope.row)">定金收据</el-button>
+              <el-button :disabled="scope.row.statusStr == '未收取'" size="mini" type="text" @click="downLoad(scope.row)">定金收据</el-button>
             </template>
           </el-table-column>
         </el-table>

src/views/reportForms/components/projectDetail.vue

@@ -152,7 +152,7 @@
         </el-col>
         <el-divider />
         <div v-for="(roomItem, roomIndex) in item.roomList" :key="roomIndex">
-          <div :class="roomItem.projectStatusStr">{{ roomItem.roomNo }}</div>
+          <div :class="grtProjectStatusStr(roomItem.projectStatusStr)">{{ roomItem.roomNo }}</div>
         </div>
       </el-row>
 
@@ -190,6 +190,28 @@ export default {
 
     },
     methods: {
+        grtProjectStatusStr(e) {
+            if (e) {
+                if (e === '已选房') {
+                    return 'xuanfang status_box '
+                }
+                if (e === '已签约') {
+                    return 'qianyue status_box '
+                }
+                if (e === '已收款') {
+                    return 'shoukuan status_box '
+                }
+                if (e === '已入驻') {
+                    return 'ruzhu status_box '
+                }
+                if (e === '已退房') {
+                    return 'tuifang status_box '
+                }
+                if (e === 'chushi') {
+                    return 'xuanfang status_box '
+                }
+            }
+        },
         initData(data) {
             this.groupId = data.groupId
             this.discId = data.discId
@@ -256,6 +278,10 @@ export default {
     border: 2px solid black;
     background-color: #ffff80;
 }
+.status_box{
+    height: 40px;
+    line-height: 40px;
+}
 .qianyue {
     text-align: center;
     width: 150px;

src/views/shijian/shijian.vue

@@ -795,9 +795,7 @@ export default {
 	}
 }
 
-.el-dialog__body {
-	padding: 0 !important;
-}
+
 
 .dd_class_div2 {
 	width: 1900px;

src/views/signingManagement/contractManagement/contractAdd.vue

@@ -356,8 +356,8 @@
     </el-form>
     <div slot="footer" style="text-align: right">
       <el-button @click="cancel()">关 闭</el-button>
-      <el-button v-if="!isView" type="primary" @click="confirmSubmit()">暂 存</el-button>
-      <el-button v-if="!isView" type="primary" @click="confirmSubmit('signing')">签 约</el-button>
+      <el-button v-if="!isView && buttonType === 'edit'" type="primary" @click="confirmSubmit()">暂 存</el-button>
+      <el-button v-if="!isView && buttonType === 'sign'" type="primary" @click="confirmSubmit('signing')">签 约</el-button>
     </div>
 
     <!--房间查看-->
@@ -436,7 +436,8 @@ export default {
             searchTreeData: [],
             restaurants: [],
             dialogHouseVisible: false,
-            dialogHouseTitle: '房间查看'
+            dialogHouseTitle: '房间查看',
+            buttonType: ''
         }
     },
     watch: {
@@ -450,6 +451,7 @@ export default {
     methods: {
         initData(val) {
             const _this = this
+            _this.buttonType = val.buttonType
             // 查看或编辑
             if (val.id) {
                 _this.isView = val.isView

src/views/signingManagement/contractManagement/index.vue

@@ -120,11 +120,11 @@
             </template>
           </el-table-column>
           <el-table-column label="签约日期" prop="signingDate" />
-          <el-table-column header-align="center" label="操作" width="180">
+          <el-table-column header-align="center" label="操作" width="220">
             <template scope="scope">
-<!--              <el-button :disabled="scope.row.contractStatusStr !== '认购待签约'" size="mini" type="text" @click="handleEdit(scope.row)">签约</el-button>-->
-                <el-button size="mini" type="text" @click="handleEdit(scope.row)">签约</el-button>
-                <el-button size="mini" type="text" @click="handleView(scope.row)">查看</el-button>
+              <el-button :disabled="scope.row.contractStatusStr !== '认购待签约'" size="mini" type="text" @click="handleSign(scope.row)">签约</el-button>
+              <el-button size="mini" type="text" @click="handleEdit(scope.row)">编辑</el-button>
+              <el-button size="mini" type="text" @click="handleView(scope.row)">查看</el-button>
               <!--              <el-button size="mini" type="danger" @click="handleDel(scope.row)">删除</el-button>-->
             </template>
           </el-table-column>
@@ -254,9 +254,21 @@ export default {
         },
         /* 编辑*/
         handleEdit: function(val) {
+            this.dialogVisible = true
+            this.dialogTitle = '编辑'
+            val.isView = false
+            val.buttonType = 'edit'
+            // 新vue时调用的方法
+            this.$nextTick(() => {
+                this.$refs.contractAdd.initData(val)
+            })
+        },
+        /* 签约*/
+        handleSign: function(val) {
             this.dialogVisible = true
             this.dialogTitle = '签约'
             val.isView = false
+            val.buttonType = 'sign'
             // 新vue时调用的方法
             this.$nextTick(() => {
                 this.$refs.contractAdd.initData(val)

src/views/testProfile/testVue.vue

@@ -782,9 +782,7 @@ export default {
 
 }
 
-.el-dialog__body {
-	padding: 0 !important;
-}
+
 
 .dd_class_div3 {
 	width: 100%;

src/views/workflow/components/myProcess/applyAgainPayment.vue

@@ -52,16 +52,12 @@
                       filterable
                       placeholder="是否为无合同付款"
                       style="width: 100%"
-                      :popper-append-to-body="false"
-                      popper-class="statistic_base"
                     >
                       <el-option
                         v-for="item in dc_data.ANSWER_NEED"
                         :key="item.value"
                         :label="item.label"
                         :value="item.value"
-                        :popper-append-to-body="false"
-                        popper-class="statistic_base"
                       />
                     </el-select>
                   </el-form-item>

src/views/workflow/components/myProcess/applyPayment.vue

@@ -55,16 +55,12 @@
                       filterable
                       placeholder="是否为无合同付款"
                       style="width: 100%"
-                      :popper-append-to-body="false"
-                      popper-class="statistic_base"
                     >
                       <el-option
                         v-for="item in dc_data.ANSWER_NEED"
                         :key="item.value"
                         :label="item.label"
                         :value="item.value"
-                        :popper-append-to-body="false"
-                        popper-class="statistic_base"
                       />
                     </el-select>
                   </el-form-item>

src/views/workflow/components/myProcess/applyPaymentConfirm.vue

@@ -50,16 +50,12 @@
                       filterable
                       placeholder="是否为无合同付款"
                       style="width: 100%"
-                      :popper-append-to-body="false"
-                      popper-class="statistic_base"
                     >
                       <el-option
                         v-for="item in dc_data.ANSWER_NEED"
                         :key="item.value"
                         :label="item.label"
                         :value="item.value"
-                        :popper-append-to-body="false"
-                        popper-class="statistic_base"
                       />
                     </el-select>
                   </el-form-item>

src/views/workflow/components/myProcess/applyPaymentDetail.vue

@@ -52,16 +52,12 @@
                       filterable
                       placeholder="是否为无合同付款"
                       style="width: 100%"
-                      :popper-append-to-body="false"
-                      popper-class="statistic_base"
                     >
                       <el-option
                         v-for="item in dc_data.ANSWER_NEED"
                         :key="item.value"
                         :label="item.label"
                         :value="item.value"
-                        :popper-append-to-body="false"
-                        popper-class="statistic_base"
                       />
                     </el-select>
                   </el-form-item>

src/views/yinhuan/yinhuan.vue

@@ -811,9 +811,7 @@ export default {
 	}
 }
 
-.el-dialog__body {
-	padding: 0 !important;
-}
+
 
 .dd_class_div {
 	width: 1900px;