Ver Fonte

fix: 修改bug

shiyanyu há 4 semanas atrás
pai
commit
a7c57c9e94

+ 27 - 13
src/components/layouts/index.vue

@@ -29,7 +29,10 @@
             </div>
           </div>
         </div>
-        <div class="app-main main-padding horizontal-container" :class="{backImg: hasBackImg}">
+        <div
+          class="app-main main-padding horizontal-container"
+          :class="{ backImg: hasBackImg }"
+        >
           <ht-app-main />
         </div>
       </div>
@@ -85,8 +88,8 @@
         style: 'settings/style',
       }),
       hasBackImg() {
-        const currentTemplate =  this.$store.state.user.nowTemplate
-        if(currentTemplate.indexOf('templateB') > -1){
+        const currentTemplate = this.$store.state.user.nowTemplate
+        if (currentTemplate.indexOf('templateB') > -1) {
           return true
         } else {
           return false
@@ -177,10 +180,10 @@
     width: 100%;
     overflow: hidden;
   }
-  .backImg:has(.app-main-container.index-container){
-    background: url("~@/assets/indexTwo/m-bg.png") no-repeat;
+  .backImg:has(.app-main-container.index-container) {
+    background: url('~@/assets/indexTwo/m-bg.png') no-repeat;
     background-size: cover;
-    .app-main-container{
+    .app-main-container {
       background: transparent !important;
     }
   }
@@ -328,18 +331,29 @@
     }
     .horizontal-container {
       display: flex;
-      width: 92% !important;
+      width: 100% !important;
       height: calc(100% - #{$base-content-margin});
+      padding: 0 20px;
       padding-bottom: #{$base-content-margin};
-      margin: auto;
-      &:has(#l_new_home){
+      margin: 0;
+      box-sizing: border-box;
+      overflow-x: hidden;
+
+      ::v-deep {
+        .app-main-container {
+          width: 100% !important;
+          box-sizing: border-box;
+        }
+      }
+      &:has(#l_new_home) {
         width: 100% !important;
-        .app-main-container{
-          width: 92%;
-          padding: 0 4%;
+        .app-main-container {
+          width: 100%;
+          padding: 0 20px;
+          box-sizing: border-box;
         }
       }
-      &:has(#o-container){
+      &:has(#o-container) {
         width: 100% !important;
       }
     }

+ 12 - 0
src/styles/element-style-custom.scss

@@ -220,6 +220,18 @@ $--font-path: '~element-ui/lib/theme-chalk/fonts';
   text-align: center;
 }
 
+// Global dialog body horizontal padding
+.el-dialog__body {
+  padding-left: 20px;
+  padding-right: 20px;
+}
+
+// Global main content horizontal padding (affects table pages)
+.el-main {
+  padding-left: 20px !important;
+  padding-right: 20px !important;
+}
+
 // htTable顶部按钮样式
 .ht-table {
   .el-radio {

+ 1 - 1
src/views/costAudit/auditInfo/auditManage/mainDetails.vue

@@ -27,7 +27,7 @@
             v-if="currentNode === 'yjfk'"
             class="item"
             effect="dark"
-            content="点击此按钮整体阶段将退回到实体审核,重新复核"
+            content="点击此按钮任务环节将退回到实体审核"
             placement="top-start"
           >
             <el-button

+ 4 - 4
src/views/costAudit/baseInfo/financeSheetManage/infoMaintain.vue

@@ -700,7 +700,7 @@
                     </el-select>
                     <el-select
                       v-if="scope.row.isDict === 'true'"
-                      v-model="scope.row.dictid"
+                      v-model="scope.row.dictCode"
                       placeholder="请选择字典"
                       class="dict-select"
                       size="small"
@@ -711,7 +711,7 @@
                         v-for="(item, index) in dictTypeList"
                         :key="index"
                         :label="item.name"
-                        :value="String(item.id)"
+                        :value="String(item.typeKey)"
                       ></el-option>
                     </el-select>
                   </div>
@@ -1153,7 +1153,7 @@
                     </el-select>
                     <el-select
                       v-if="scope.row.isDict === 'true'"
-                      v-model="scope.row.dictid"
+                      v-model="scope.row.dictCode"
                       placeholder="请选择字典"
                       class="dict-select"
                       size="small"
@@ -1164,7 +1164,7 @@
                         v-for="(item, index) in dictTypeList"
                         :key="index"
                         :label="item.name"
-                        :value="String(item.id)"
+                        :value="String(item.typeKey)"
                       ></el-option>
                     </el-select>
                   </div>