qinbai 3 лет назад
Родитель
Сommit
61ab9215f4

+ 1 - 1
src/views/importTrade/receipt/detailsPageEdit.vue

@@ -20,7 +20,7 @@
         </el-button>
         <el-button
           class="el-button--small-yh"
-          type="primary"
+          type="primary"00000
           :disabled="disabled || receiptDisable"
           @click="editCustomer"
         >{{ form.id ? '确认修改' : '确认新增' }}

+ 16 - 12
src/views/purchase/contract/detailsPage.vue

@@ -5,25 +5,33 @@
         <el-button type="danger" style="border: none;background: none;color: red" icon="el-icon-arrow-left"
                    @click="backToList">返回列表
         </el-button>
-      </div>
       <div class="upper_right_button">
         <el-button type="primary"
-                   class="el-button--small-yh "
+                   class="el-button--small-yh"
+                   size="small"
                    :disabled="true"
                    @click.stop="">请核
         </el-button>
         <el-button type="warning"
+                   size="small"
                    class="el-button--small-yh "
                    @click.stop="applyPayment()">申请货款
         </el-button>
-<!--        <el-button type="success"
-                   class="el-button&#45;&#45;small-yh "
+        <el-button type="info"
+                   size="small"
+                   @click="applicationDialog = true,applicationData = contactsData"
+        >查看申请记录
+        </el-button>
+        <el-button type="success"
+                   size="small"
+                   class="el-button--small-yh "
                    :disabled="true"
                    @click.stop="">复制新单
-        </el-button>-->
+        </el-button>
         <el-button
           class="el-button--small-yh "
           type="primary"
+          size="small"
           :disabled="disabled"
           @click="editCustomer"
           :loading="editCustomerLoading"
@@ -189,11 +197,6 @@
                          @click="beforePage(false)"
               >生成收货单
               </el-button>
-              <el-button type="info"
-                         size="small"
-                         @click="applicationDialog = true,applicationData = contactsData"
-              >查看申请记录
-              </el-button>
             </template>
           </avue-crud>
         </basic-container>
@@ -294,6 +297,7 @@
       </apply-payment>
     </el-dialog>
   </div>
+  </div>
 </template>
 
 <script>
@@ -1169,8 +1173,8 @@ export default {
 .upper_right_button{
   display: flex;
   position: fixed;
-  right: 20px;
-  top: 43px;
+  right: 12px;
+  top: 47px;
 }
 .required_fields{
   color: #F56C6C;

+ 1 - 1
src/views/workManagement/main-items/configuration/mainList.json

@@ -8,7 +8,7 @@
   "tip": false,
   "searchShow": true,
   "searchMenuPosition": "right",
-  "searchMenuSpan": 18,
+  "searchMenuSpan": 12,
   "tree": true,
   "selection": false,
   "editBtn": false,

+ 26 - 22
src/views/workManagement/main-items/detailsPage.vue

@@ -1,22 +1,27 @@
 <template>
   <div class="borderless">
-    <div class="main-head">
-      <div class="main-back">
+    <div class="customer-head">
+      <div class="customer-back">
         <el-button type="danger" style="border: none;background: none;color: red" icon="el-icon-arrow-left"
                    @click="backToList">返回列表
         </el-button>
-        <el-button type="success"
-                   class="el-button--small-yh add-customer-btn-two"
-                   :disabled="true"
-                   @click.stop="addMainProject">复制新单
-        </el-button>
-        <el-button class="el-button--small-yh add-customer-btn" type="primary"
-                   @click.stop="editMainProject"
-        >{{this.id?"确认修改" :"确认新增"}}
-        </el-button>
+        <div class="upper_right_button">
+          <el-button type="success"
+                     size="small"
+                     class="el-button--small-yh "
+                     :disabled="true"
+                     @click.stop="addMainProject">复制新单
+          </el-button>
+          <el-button class="el-button--small-yh "
+                     type="primary"
+                     @click.stop="editMainProject"
+                     size="small"
+          >{{this.id?"确认修改" :"确认新增"}}
+          </el-button>
+        </div>
       </div>
     </div>
-    <div style="margin-top: 60px">
+    <div class="customer-main">
       <containerTitle title="基础信息"></containerTitle>
       <basic-container>
         <el-form :model="form" ref="form" label-width="100px" class="demo-ruleForm">
@@ -1063,6 +1068,12 @@
     box-shadow: 0 4px 12px 0px rgba(232, 232, 235, 1);
     z-index: 999;
   }
+  .upper_right_button{
+    display: flex;
+    position: fixed;
+    right: 12px;
+    top: 47px;
+  }
   .main-back {
     cursor: pointer;
     line-height: 62px;
@@ -1074,17 +1085,10 @@
     overflow: hidden;
     max-height: 660px;
   }
-  .add-customer-btn-two {
-    position: fixed;
-    right: 150px;
-    top: 115px;
-  }
-  .add-customer-btn {
-    position: fixed;
-    right: 36px;
-    top: 115px;
-  }
   ::v-deep .el-form-item {
     margin-bottom: 0;
   }
+  ::v-deep .el-form-item__content{
+    line-height: 32px;
+  }
 </style>

+ 10 - 5
src/views/workManagement/receipt/settleAccountsDetailsPage.vue

@@ -1,11 +1,13 @@
 <template>
   <div class="borderless">
-    <div class="receipt-head">
-      <div class="receipt-back">
+    <div class="customer-head">
+      <div class="customer-back">
         <el-button type="danger" style="border: none;background: none;color: red" icon="el-icon-arrow-left"
                    @click="backToList">返回列表
         </el-button>
-        <el-button class="el-button--small-yh add-customer-btn" type="primary"
+        <el-button class="el-button--small-yh add-customer-btn"
+                   size="small"
+                   type="primary"
                    @click.stop="editMainProject"
         >{{this.id?"确认修改" :"确认新增"}}
         </el-button>
@@ -525,11 +527,14 @@
   }
   .add-customer-btn {
     position: fixed;
-    right: 36px;
-    top: 115px;
+    right: 12px;
+    top: 47px;
   }
   .landConFrom-input{
     display:flex;
     justify-content:center;
   }
+  ::v-deep .el-form-item__content{
+    line-height: 32px;
+  }
 </style>

+ 1 - 1
src/views/workManagement/task/configuration/mainList.json

@@ -7,7 +7,7 @@
   "tip": false,
   "searchShow": true,
   "searchMenuPosition": "right",
-  "searchMenuSpan": 24,
+  "searchMenuSpan": 6,
   "tree": true,
   "selection": false,
   "addBtn": false,