修改bug

src/components/crop-dialog/main.vue

@@ -2,6 +2,7 @@
   <div>
     <el-dialog
       title="客户信息"
+      class="el-dialogDeep"
       :visible.sync="portinfoVisible"
       width="60%"
       append-to-body

src/components/fee-info/main.vue

@@ -123,6 +123,7 @@
       width="60%"
       :close-on-click-modal="false"
       @closed="feeClose"
+      class="el-dialogDeep"
       v-dialog-drag
     >
       <el-row style="height: 0;">

src/components/flow-dialog/main.vue

@@ -5,6 +5,7 @@
     width="60%"
     :before-close="onClose"
     append-to-body
+    class="el-dialogDeep"
     v-dialog-drag
   >
     <slot name='content'></slot>

src/components/part-dialog/main.vue

@@ -6,6 +6,7 @@
       width="60%"
       append-to-body
       @closed="closed"
+      class="el-dialogDeep"
       v-dialog-drag
     >
       <span>

src/components/report-dialog/main.vue

@@ -5,6 +5,7 @@
     width="60%"
     :before-close="onClose"
     append-to-body
+    class="el-dialogDeep"
     v-dialog-drag
   >
     <avue-crud

src/config/website.js

@@ -45,5 +45,5 @@ export default {
   // 流程设计器地址
   flowDesignUrl: 'http://192.168.1.177:9999',
   // 报表设计器地址(cloud端口为8108,boot端口为80)
-  reportUrl: 'http://192.168.1.177:8108/ureport',
+  reportUrl: 'http://trade.tubaosoft.com:10020/ureport',
 }

src/styles/variables.scss

@@ -51,4 +51,9 @@ p{
 .customer-main{
   margin-top: 55px;
   margin-bottom:35px
-}
+}
+.el-dialogDeep{
+  .el-dialog__body {
+    padding: 0px 20px !important;
+  }
+} 

src/views/basicData/customerInformation/detailsPageEdit.vue

@@ -11,19 +11,20 @@
           >返回列表
         </el-button>
       </div>
-
-      <el-button
-        class="add-customer-btn"
-        type="primary"
-        :disabled="disabled"
-        @click="editCustomer"
-        >{{ form.id ? "确认修改" : "确认新增" }}
-      </el-button>
-      <el-button class="flow-btn" type="primary" @click="openFlow"
-        >审 核
-      </el-button>
+      <div class="add-customer-btn">
+        <el-button type="primary" @click="openFlow" size="small"
+          >审 核
+        </el-button>
+        <el-button
+          type="primary"
+          :disabled="disabled"
+          @click="editCustomer"
+          size="small"
+          >{{ form.id ? "确认修改" : "确认新增" }}
+        </el-button>
+      </div>
     </div>
-    <div style="margin-top: 60px">
+    <div class="customer-main">
       <el-form
         :model="form"
         ref="form"
@@ -31,7 +32,7 @@
         class="demo-ruleForm"
       >
         <containerTitle title="基础资料"></containerTitle>
-        <basic-container style="margin-bottom: 10px">
+        <basic-container>
           <el-row>
             <el-col
               v-for="(item, index) in basicData.column"
@@ -61,7 +62,7 @@
                   multiple
                   style="width: 100%;"
                   size="small"
-                  :props="{ label: 'name',value:'name' }"
+                  :props="{ label: 'name', value: 'name' }"
                   v-model="form[item.prop]"
                   placeholder=" "
                   type="tree"
@@ -79,7 +80,7 @@
           </el-row>
         </basic-container>
         <containerTitle title="联系方式"></containerTitle>
-        <basic-container style="margin-bottom: 10px">
+        <basic-container>
           <el-row>
             <el-col
               v-for="(item, index) in contactInformation.column"
@@ -102,7 +103,7 @@
           </el-row>
         </basic-container>
         <containerTitle title="财务资料"></containerTitle>
-        <basic-container style="margin-bottom: 10px">
+        <basic-container>
           <el-row>
             <el-col
               v-for="(item, index) in financialInformation.column"
@@ -135,7 +136,7 @@
           </el-row>
         </basic-container>
         <containerTitle title="客户联系人"></containerTitle>
-        <basic-container style="margin-bottom: 10px">
+        <basic-container>
           <avue-crud
             :option="customerContact"
             v-model="contactsForm"
@@ -157,7 +158,7 @@
           ></avue-crud>
         </basic-container> -->
         <containerTitle title="客户开户行"></containerTitle>
-        <basic-container style="margin-bottom: 40px">
+        <basic-container>
           <avue-crud
             :option="bankOfDeposit"
             v-model="bankOfDepositForm"
@@ -169,13 +170,8 @@
         </basic-container>
       </el-form>
     </div>
-    <flow-dialog
-      :switchDialog="switchDialog"
-      @onClose="onClose()"
-    >
-    <template slot="content">
-
-    </template>
+    <flow-dialog :switchDialog="switchDialog" @onClose="onClose()">
+      <template slot="content"> </template>
     </flow-dialog>
   </div>
 </template>
@@ -201,7 +197,7 @@ export default {
   name: "detailsPage",
   data() {
     return {
-      switchDialog:false,
+      switchDialog: false,
       form: {},
       disabled: false,
       contactsForm: {},
@@ -211,7 +207,7 @@ export default {
       advantageProjectData: [],
       bankOfDepositData: [],
       dic: [],
-      dicArea:[],
+      dicArea: [],
       customerContact: customerContact,
       advantageProject: advantageProject,
       bankOfDeposit: bankOfDeposit,
@@ -407,6 +403,10 @@ export default {
                 trigger: "blur"
               }
             ]
+          },
+          {
+            label: "FOB系数",
+            prop: "coefficient"
           }
         ]
       },
@@ -481,7 +481,7 @@ export default {
           {
             label: "代理区域",
             prop: "belongtoarea",
-            span:24,
+            span: 24,
             mock: {
               type: "county"
             }
@@ -497,9 +497,9 @@ export default {
     corpstypeTree().then(res => {
       this.dic = res.data.data;
     });
-    areaTypeTree().then(res =>{
+    areaTypeTree().then(res => {
       this.dicArea = res.data.data;
-    })
+    });
     if (this.$route.query.id) {
       let id = this.$route.query.id.replace(/\"/g, "");
       // let id = parseInt(this.$route.query.id)
@@ -513,9 +513,9 @@ export default {
         delete this.form.corpsBankList;
         delete this.form.corpsItems;
       });
-    }else{
+    } else {
       //新增时根据左侧选中树结构给客户类别赋值
-      this.$set(this.form,"corpsTypeId", this.$route.query.treeDeptId)
+      this.$set(this.form, "corpsTypeId", this.$route.query.treeDeptId);
     }
   },
   watch: {
@@ -647,7 +647,7 @@ export default {
             this.form.corpsTypeId = this.form.corpsTypeId.join(",");
           }
           this.disabled = true;
-          if(this.form.belongtoarea){
+          if (this.form.belongtoarea) {
             this.form.belongtoarea = this.form.belongtoarea.toString();
           }
           typeSave(this.form).then(res => {
@@ -683,7 +683,7 @@ export default {
       });
     },
     openFlow() {
-      this.switchDialog =! this.switchDialog;
+      this.switchDialog = !this.switchDialog;
     },
     onClose(val) {
       this.switchDialog = val;
@@ -693,43 +693,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;
-  /* display: flex;
-  justify-content: left; */
-}
-
-.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;
-}
-.flow-btn {
-  position: fixed;
-  right: 140px;
-  top: 115px;
-}
 ::v-deep .el-form-item {
   margin-bottom: 0;
 }

src/views/exportTrade/customerInquiry/detailsPage.vue

@@ -11,7 +11,9 @@
         </el-button>
       </div>
       <div class="add-customer-btn" v-if="showBut">
-        <el-button type="info" @click="saveSell" size="small">生成销售单</el-button>
+        <el-button type="info" @click="saveSell" size="small"
+          >生成销售单</el-button
+        >
         <el-button type="success" disabled size="small">
           复制新单
         </el-button>
@@ -1132,11 +1134,11 @@ export default {
           code: e.code,
           cname: e.cname,
           priceCategory: e.goodsTypeName,
-          purchaseAmount:e.price,
-          itemProp:e.goodNature,
-          corpId:e.corpId,
-          corpName:e.corpName,
-          itemDescription:null,
+          purchaseAmount: e.price,
+          itemProp: e.goodNature,
+          corpId: e.corpId,
+          corpName: e.corpName,
+          itemDescription: null,
           partsList: [],
           partsPrice: 0,
           itemType: null,
@@ -1332,12 +1334,12 @@ export default {
 
 <style lang="scss" scoped>
 ::v-deep .el-form-item {
-  margin-bottom: 8px;
+  margin-bottom: 8px !important;
 }
 ::v-deep .el-form-item__error {
-  display: none;
+  display: none !important;
 }
 ::v-deep .select-component {
-  display: flex;
+  display: flex !important;
 }
 </style>

src/views/exportTrade/customerInquiry/priceLibrary.vue

@@ -2,6 +2,7 @@
   <div>
     <el-dialog
       title="出口价格库"
+      class="el-dialogDeep"
       :visible.sync="visible"
       width="60%"
       append-to-body

src/views/exportTrade/invoice/detailsPage.vue

@@ -910,12 +910,12 @@ export default {
 
 <style lang="scss" scoped>
 ::v-deep .el-form-item {
-  margin-bottom: 8px;
+  margin-bottom: 8px !important;
 }
 ::v-deep .el-form-item__error {
-  display: none;
+  display: none !important;
 }
 ::v-deep .select-component {
-  display: flex;
+  display: flex !important;
 }
 </style>

src/views/exportTrade/purchaseContract/detailsPage.vue

@@ -1000,12 +1000,12 @@ export default {
 
 <style lang="scss" scoped>
 ::v-deep .el-form-item {
-  margin-bottom: 8px;
+  margin-bottom: 8px !important;
 }
 ::v-deep .el-form-item__error {
-  display: none;
+  display: none !important;
 }
 ::v-deep .select-component {
-  display: flex;
+  display: flex !important;
 }
 </style>

src/views/exportTrade/purchaseInquiry/detailsPage.vue

@@ -778,12 +778,12 @@ export default {
 
 <style lang="scss" scoped>
 ::v-deep .el-form-item {
-  margin-bottom: 8px;
+  margin-bottom: 8px !important;
 }
 ::v-deep .el-form-item__error {
-  display: none;
+  display: none !important;
 }
 ::v-deep .select-component {
-  display: flex;
+  display: flex !important;
 }
 </style>

src/views/exportTrade/receipt/detailsPage.vue

@@ -919,12 +919,12 @@ export default {
 
 <style lang="scss" scoped>
 ::v-deep .el-form-item {
-  margin-bottom: 8px;
+  margin-bottom: 8px !important;
 }
 ::v-deep .el-form-item__error {
-  display: none;
+  display: none !important;
 }
 ::v-deep .select-component {
-  display: flex;
+  display: flex !important;
 }
 </style>

src/views/exportTrade/salesContract/detailsPage.vue

@@ -1384,12 +1384,12 @@ export default {
 
 <style lang="scss" scoped>
 ::v-deep .el-form-item {
-  margin-bottom: 8px;
+  margin-bottom: 8px !important;
 }
 ::v-deep .el-form-item__error {
-  display: none;
+  display: none !important;
 }
 ::v-deep .select-component {
-  display: flex;
+  display: flex !important;
 }
 </style>

src/views/exportTrade/shippingInquiry/detailsPage.vue

@@ -651,12 +651,12 @@ export default {
 
 <style lang="scss" scoped>
 ::v-deep .el-form-item {
-  margin-bottom: 8px;
+  margin-bottom: 8px !important;
 }
 ::v-deep .el-form-item__error {
-  display: none;
+  display: none !important;
 }
 ::v-deep .select-component {
-  display: flex;
+  display: flex !important;
 }
 </style>