QuKatie 3 anni fa
parent
commit
d885c1e6e5

+ 28 - 28
src/components/titleComponent/main.vue

@@ -1,43 +1,43 @@
 <template>
   <div class="container">
     <div class="redcolumn"></div>
-    <div class="container-title">{{title}}</div>
+    <div class="container-title">{{ title }}</div>
   </div>
 </template>
 
 <script>
 export default {
-  name: 'containerTitle',
+  name: "containerTitle",
   props: {
-    title:""
+    title: ""
   }
-}
+};
 </script>
 
 <style lang="scss" scoped>
-  .container {
-    display: flex;
-    justify-content: left;
-    margin-left: 10px;
-    background-color: inherit;
-    height: 22px;
-    // padding-bottom: 12px;
-    vertical-align: middle;
-    .redcolumn{
-      width: 4px;
-      height: 14px;
-      background-color: #D6000F ;
-      margin: 4px 4px 0 0;
-    }
-    .container-title{
-      font-size:16px;
-      line-height: 22px;
-      font-family: PingFangSC-Semibold, PingFang SC;
-      font-weight: 600;
-      color: #323233;
-    }
+.container {
+  display: flex;
+  justify-content: left;
+  margin-left: 10px;
+  background-color: inherit;
+  height: 18px;
+  // padding-bottom: 12px;
+  vertical-align: middle;
+  .redcolumn {
+    width: 4px;
+    height: 13px;
+    background-color: #d6000f;
+    margin: 2px 4px 0 0;
+  }
+  .container-title {
+    font-size: 14px;
+    line-height: 18px;
+    font-family: PingFangSC-Semibold, PingFang SC;
+    font-weight: 600;
+    color: #323233;
   }
-  // .container:first-child {
-  //   padding-top: 16px;
-  // }
+}
+// .container:first-child {
+//   padding-top: 16px;
+// }
 </style>

+ 2 - 2
src/styles/variables.scss

@@ -1,7 +1,7 @@
 //main
 $mainBg: #409eff;
 .avue-form__menu--center {
-  text-align: right;
+  text-align: right !important;
 }
 .el-col {
   margin-bottom: 0px !important;
@@ -45,7 +45,7 @@ p{
 }
 .add-customer-btn {
   position: fixed;
-  right: 20px;
+  right: 10px;
   top: 46.5px;
 }
 .customer-main{

+ 0 - 1
src/views/exportTrade/customerInquiry/detailsPage.vue

@@ -1331,7 +1331,6 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-
 ::v-deep .el-form-item {
   margin-bottom: 8px;
 }

+ 2 - 2
src/views/exportTrade/customerInquiry/index.vue

@@ -266,7 +266,7 @@ export default {
           this.dataList = res.data.data.records ? res.data.data.records : [];
           this.page.total = res.data.data.total;
           if (this.page.total) {
-            this.option.height = window.innerHeight - 450;
+            this.option.height = window.innerHeight - 390;
           }
         })
         .finally(() => {
@@ -348,6 +348,6 @@ export default {
   display: flex;
 }
 .page-crad ::v-deep .basic-container__card {
-  height: 86.5vh;
+  height: 94.2vh;
 }
 </style>

+ 6 - 32
src/views/exportTrade/invoice/detailsPage.vue

@@ -16,15 +16,17 @@
           type="info"
           @click.stop="editCustomer('save')"
           v-if="form.deliveryStatus == '录入'"
+          size="small"
           >确认发货</el-button
         >
         <el-button
           type="info"
           @click.stop="editCustomer('repeal')"
           v-if="form.deliveryStatus != '录入'"
+          size="small"
           >撤销发货</el-button
         >
-        <el-button type="success" disabled>
+        <el-button type="success" disabled size="small">
           复制新单
         </el-button>
         <el-button
@@ -33,13 +35,14 @@
           @click="editCustomer('submit')"
           :loading="subLoading"
           v-if="detailData.status != 1"
+          size="small"
           >{{ form.id ? "确认修改" : "确认新增" }}
         </el-button>
       </div>
     </div>
-    <div style="margin-top: 60px;margin-bottom:35px">
+    <div class="customer-main">
       <containerTitle title="基础信息"></containerTitle>
-      <basic-container style="margin-bottom: 10px">
+      <basic-container>
         <avue-form ref="form" v-model="form" :option="option">
           <template slot="corpId">
             <select-component
@@ -906,35 +909,6 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.customer-head {
-  position: fixed;
-  top: 105px;
-  width: 100%;
-  margin-left: -10px;
-  height: 62px;
-  background: #ffffff;
-  box-shadow: 0 4px 12px 0px rgba(232, 232, 235, 1);
-  z-index: 999;
-}
-
-.customer-back {
-  cursor: pointer;
-  line-height: 62px;
-  font-size: 16px;
-  color: #323233;
-  font-weight: 400;
-}
-
-.back-icon {
-  line-height: 64px;
-  font-size: 20px;
-  margin-right: 8px;
-}
-.add-customer-btn {
-  position: fixed;
-  right: 36px;
-  top: 115px;
-}
 ::v-deep .el-form-item {
   margin-bottom: 8px;
 }

+ 4 - 37
src/views/exportTrade/purchaseContract/detailsPage.vue

@@ -10,8 +10,8 @@
           >返回列表
         </el-button>
       </div>
-      <div class="add-customer-btn" v-if="showBut">
-        <el-button type="success" disabled>
+      <div class="add-customer-btn" v-if="showBut" size="small">
+        <el-button type="success" disabled size="small">
           复制新单
         </el-button>
         <el-button
@@ -20,11 +20,12 @@
           @click="editCustomer"
           :loading="subLoading"
           v-if="detailData.status != 1"
+          size="small"
           >{{ form.id ? "确认修改" : "确认新增" }}
         </el-button>
       </div>
     </div>
-    <div style="margin-top: 60px;margin-bottom:35px">
+    <div class="customer-main">
       <containerTitle title="基础信息"></containerTitle>
       <basic-container>
         <avue-form ref="form" v-model="form" :option="option">
@@ -998,40 +999,6 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.customer-head {
-  position: fixed;
-  top: 105px;
-  width: 100%;
-  margin-left: -10px;
-  height: 62px;
-  background: #ffffff;
-  box-shadow: 0 4px 12px 0px rgba(232, 232, 235, 1);
-  z-index: 999;
-}
-
-.customer-back {
-  cursor: pointer;
-  line-height: 62px;
-  font-size: 16px;
-  color: #323233;
-  font-weight: 400;
-}
-
-.back-icon {
-  line-height: 64px;
-  font-size: 20px;
-  margin-right: 8px;
-}
-.copy-customer-btn {
-  position: fixed;
-  right: 140px;
-  top: 115px;
-}
-.add-customer-btn {
-  position: fixed;
-  right: 36px;
-  top: 115px;
-}
 ::v-deep .el-form-item {
   margin-bottom: 8px;
 }

+ 4 - 41
src/views/exportTrade/purchaseInquiry/detailsPage.vue

@@ -17,6 +17,7 @@
           :disabled="detailData.status == 1"
           v-if="detailData.status != 1"
           @click="editCustomer('submit')"
+          size="small"
           >提交
         </el-button>
         <el-button
@@ -25,13 +26,14 @@
           @click="editCustomer('save')"
           :loading="subLoading"
           v-if="detailData.status != 1"
+          size="small"
           >{{ form.id ? "确认修改" : "确认新增" }}
         </el-button>
       </div>
     </div>
-    <div style="margin-top: 60px;margin-bottom:35px">
+    <div class="customer-main">
       <containerTitle title="基础信息"></containerTitle>
-      <basic-container style="margin-bottom: 10px">
+      <basic-container>
         <avue-form ref="form" v-model="form" :option="option">
           <template slot="corpId">
             <select-component
@@ -775,45 +777,6 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.customer-head {
-  position: fixed;
-  top: 105px;
-  width: 100%;
-  margin-left: -10px;
-  height: 62px;
-  background: #ffffff;
-  box-shadow: 0 4px 12px 0px rgba(232, 232, 235, 1);
-  z-index: 999;
-}
-
-.customer-back {
-  cursor: pointer;
-  line-height: 62px;
-  font-size: 16px;
-  color: #323233;
-  font-weight: 400;
-}
-
-.back-icon {
-  line-height: 64px;
-  font-size: 20px;
-  margin-right: 8px;
-}
-.copy-customer-btn {
-  position: fixed;
-  right: 140px;
-  top: 115px;
-}
-.submit-customer-btn {
-  position: fixed;
-  right: 140px;
-  top: 115px;
-}
-.add-customer-btn {
-  position: fixed;
-  right: 36px;
-  top: 115px;
-}
 ::v-deep .el-form-item {
   margin-bottom: 8px;
 }

+ 6 - 42
src/views/exportTrade/receipt/detailsPage.vue

@@ -16,15 +16,17 @@
           type="info"
           @click.stop="editCustomer('save')"
           v-if="form.deliveryStatus == '录入'"
+          size="small"
           >确认收货</el-button
         >
         <el-button
           type="info"
           @click.stop="editCustomer('repeal')"
           v-if="form.deliveryStatus == '已收货'"
+          size="small"
           >撤销收货</el-button
         >
-        <el-button type="success" disabled>
+        <el-button type="success" disabled size="small">
           复制新单
         </el-button>
         <el-button
@@ -33,13 +35,14 @@
           @click="editCustomer('submit')"
           :loading="subLoading"
           v-if="detailData.status != 1"
+          size="small"
           >{{ form.id ? "确认修改" : "确认新增" }}
         </el-button>
       </div>
     </div>
-    <div style="margin-top: 60px;margin-bottom:35px">
+    <div class="customer-main">
       <containerTitle title="基础信息"></containerTitle>
-      <basic-container style="margin-bottom: 10px">
+      <basic-container>
         <avue-form ref="form" v-model="form" :option="option">
           <template slot="corpId">
             <select-component
@@ -915,45 +918,6 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.customer-head {
-  position: fixed;
-  top: 105px;
-  width: 100%;
-  margin-left: -10px;
-  height: 62px;
-  background: #ffffff;
-  box-shadow: 0 4px 12px 0px rgba(232, 232, 235, 1);
-  z-index: 999;
-}
-
-.customer-back {
-  cursor: pointer;
-  line-height: 62px;
-  font-size: 16px;
-  color: #323233;
-  font-weight: 400;
-}
-
-.back-icon {
-  line-height: 64px;
-  font-size: 20px;
-  margin-right: 8px;
-}
-.receipt-customer-btn {
-  position: fixed;
-  right: 244px;
-  top: 115px;
-}
-.copy-customer-btn {
-  position: fixed;
-  right: 140px;
-  top: 115px;
-}
-.add-customer-btn {
-  position: fixed;
-  right: 36px;
-  top: 115px;
-}
 ::v-deep .el-form-item {
   margin-bottom: 8px;
 }

+ 4 - 42
src/views/exportTrade/salesContract/detailsPage.vue

@@ -11,8 +11,8 @@
         </el-button>
       </div>
       <div class="add-customer-btn" v-if="showBut">
-        <el-button type="info" @click="saveSell">生成采购单</el-button>
-        <el-button type="success" disabled>
+        <el-button type="info" @click="saveSell" size="small">生成采购单</el-button>
+        <el-button type="success" disabled size="small">
           复制新单
         </el-button>
         <el-button
@@ -21,11 +21,12 @@
           @click="editCustomer"
           :loading="subLoading"
           v-if="detailData.status != 1"
+          size="small"
           >{{ form.id ? "确认修改" : "确认新增" }}
         </el-button>
       </div>
     </div>
-    <div style="margin-top: 60px;margin-bottom:35px">
+    <div class="customer-main">
       <containerTitle title="基础信息"></containerTitle>
       <basic-container>
         <avue-form ref="form" v-model="form" :option="option">
@@ -1382,45 +1383,6 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.customer-head {
-  position: fixed;
-  top: 105px;
-  width: 100%;
-  margin-left: -10px;
-  height: 62px;
-  background: #ffffff;
-  box-shadow: 0 4px 12px 0px rgba(232, 232, 235, 1);
-  z-index: 999;
-}
-
-.customer-back {
-  cursor: pointer;
-  line-height: 62px;
-  font-size: 16px;
-  color: #323233;
-  font-weight: 400;
-}
-
-.back-icon {
-  line-height: 64px;
-  font-size: 20px;
-  margin-right: 8px;
-}
-.sell-customer-btn {
-  position: fixed;
-  right: 244px;
-  top: 115px;
-}
-.copy-customer-btn {
-  position: fixed;
-  right: 140px;
-  top: 115px;
-}
-.add-customer-btn {
-  position: fixed;
-  right: 36px;
-  top: 115px;
-}
 ::v-deep .el-form-item {
   margin-bottom: 8px;
 }

+ 4 - 42
src/views/exportTrade/shippingInquiry/detailsPage.vue

@@ -2,7 +2,6 @@
   <div class="borderless" v-loading="pageLoading">
     <div class="customer-head">
       <div class="customer-back">
-        <!--        <i class="back-icon el-icon-arrow-left"></i><i style="font-style:normal">返回管理列表</i>-->
         <el-button
           type="danger"
           style="border: none;background: none;color: red"
@@ -18,6 +17,7 @@
           @click="editCustomer('submit')"
           v-if="form.id && detailData.status != 1"
           :loading="subLoading"
+          size="small"
           >确认修改
         </el-button>
         <el-button
@@ -25,13 +25,14 @@
           :disabled="disabled && detailData.status == 1"
           v-if="detailData.status != 1"
           @click="editCustomer('fix')"
+          size="small"
           >提 交
         </el-button>
       </div>
     </div>
-    <div style="margin-top: 60px;margin-bottom:35px">
+    <div class="customer-main">
       <containerTitle title="基础信息"></containerTitle>
-      <basic-container style="margin-bottom: 10px">
+      <basic-container>
         <avue-form ref="form" v-model="form" :option="option" />
       </basic-container>
       <containerTitle title="商品信息"></containerTitle>
@@ -649,45 +650,6 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.customer-head {
-  position: fixed;
-  top: 105px;
-  width: 100%;
-  margin-left: -10px;
-  height: 62px;
-  background: #ffffff;
-  box-shadow: 0 4px 12px 0px rgba(232, 232, 235, 1);
-  z-index: 999;
-}
-
-.customer-back {
-  cursor: pointer;
-  line-height: 62px;
-  font-size: 16px;
-  color: #323233;
-  font-weight: 400;
-}
-
-.back-icon {
-  line-height: 64px;
-  font-size: 20px;
-  margin-right: 8px;
-}
-.copy-customer-btn {
-  position: fixed;
-  right: 140px;
-  top: 115px;
-}
-.fix-customer-btn {
-  position: fixed;
-  right: 120px;
-  top: 115px;
-}
-.add-customer-btn {
-  position: fixed;
-  right: 36px;
-  top: 115px;
-}
 ::v-deep .el-form-item {
   margin-bottom: 8px;
 }