修改bug

src/components/fee-info/main.vue

@@ -343,13 +343,15 @@ export default {
       this.$refs.feeCrud.refreshTable();
     },
     orderFeesList(newVla, oldVal) {
-      this.allData = newVla;
-      this.data_one = newVla.filter(item => item.feesType === 1); //应收
-      this.data_two = newVla.filter(item => item.feesType === 2); //应付
-      if (this.selectTab === 1) {
-        this.feeData = this.data_one;
-      } else {
-        this.feeData = this.data_two;
+      if (newVla !== oldVal) {
+        this.allData = newVla;
+        this.data_one = newVla.filter(item => item.feesType === 1); //应收
+        this.data_two = newVla.filter(item => item.feesType === 2); //应付
+        if (this.selectTab === 1) {
+          this.feeData = this.data_one;
+        } else {
+          this.feeData = this.data_two;
+        }
       }
     },
     activeName(newVla, oldVal) {
@@ -375,6 +377,13 @@ export default {
     }
   },
   methods: {
+    async imporData(row) {
+      await this.tabs2()
+      this.$refs.feeCrud.rowCellAdd(row)
+    },
+    async tabs2() {
+      this.activeName = 'second'
+    },
     invoiceShow(row) {
       getfeesDetails({ id: row.id }).then(res => {
         this.invoiceData = res.data.data

src/views/basicData/client/detailsPage.vue

@@ -40,14 +40,14 @@
       <el-dialog :title="addressTitle" v-dialogDrag :visible.sync="addressVisible" class="avue-dialog avue-dialog--top"
         width="50%" append-to-body>
         <span>
-          <div class="">
-            <span>
-              客户地址
-            </span>
-            <span>
-              仓库地址
-            </span>
-          </div>
+          <el-tabs v-model="activeName">
+            <el-tab-pane label="客户地址" name="first">
+              <avue-form class="trading-form" v-model="form2" :option="option2"></avue-form>
+            </el-tab-pane>
+            <el-tab-pane label="物流地址" name="second">
+              <avue-form class="trading-form" v-model="form3" :option="option3"></avue-form>
+            </el-tab-pane>
+          </el-tabs>
         </span>
         <div class="avue-dialog__footer">
           <el-button @click="type1=false">取 消</el-button>
@@ -72,6 +72,11 @@ export default {
       addressTitle: null,
       addressVisible: false,
       form: {},
+      form2: {
+      },
+      form3: {
+
+      },
       dataList: [],
       option: {
         menuBtn: false,
@@ -130,6 +135,106 @@ export default {
           }
         ]
       },
+      option2: {
+        menuBtn: false,
+        labelWidth: 90,
+        column: [
+          {
+            label: "简称",
+            prop: "a",
+            type: "select",
+            span: 8,
+          },
+          {
+            label: "地址",
+            prop: "b",
+            type: "select",
+            span: 16,
+          },
+          {
+            label: "详细地址",
+            prop: "c",
+            span: 24,
+          },
+          {
+            label: "邮编",
+            prop: "d",
+            span: 24,
+          },
+          {
+            label: "备注",
+            prop: "e",
+            type: 'textarea',
+            minRows: 3,
+            span: 24,
+          },
+          {
+            label: "地址智能识别",
+            prop: "ad",
+            placeholder:"例：上海市徐汇区枫林街道斜土路100号",
+            type: "textarea",
+            minRows: 3,
+            span: 24,
+          }
+        ]
+      },
+      option3: {
+        menuBtn: false,
+        labelWidth: 80,
+        column: [
+          {
+            label: "客户名称",
+            prop: "a",
+            type: "select",
+            rules: [
+              {
+                required: true,
+                message: "",
+                trigger: "blur"
+              }
+            ],
+            span: 8,
+          },
+          {
+            label: "客户分类",
+            prop: "b",
+            type: "select",
+            span: 8,
+          },
+          {
+            label: "期初欠款",
+            prop: "c",
+            span: 8,
+          },
+          {
+            label: "电话",
+            prop: "d",
+            span: 8,
+          },
+          {
+            label: "备用电话",
+            prop: "e",
+            span: 8,
+          },
+          {
+            label: "传真",
+            prop: "f",
+            span: 8,
+          },
+          {
+            label: "邮箱",
+            prop: "g",
+            span: 8,
+          },
+          {
+            label: "备注",
+            prop: "remarks",
+            type: "textarea",
+            minRows: 3,
+            span: 24,
+          }
+        ]
+      },
       optionList: {},
     };
   },
@@ -284,6 +389,10 @@ export default {
   margin-bottom: 8px !important;
 }
 
+::v-deep .el-dialog__body {
+  padding: 0px 20px 15px 20px;
+}
+
 ::v-deep .el-form-item__error {
   display: none !important;
 }
@@ -308,4 +417,16 @@ export default {
 ::v-deep .avue-crud .el-table .el-form-item__label {
   left: -1px;
 }
+
+.addressTabs {
+  display: flex;
+  justify-content: center;
+
+  span {
+    width: 100px;
+    font-size: 18px;
+    font-weight: 600;
+    text-align: center;
+  }
+}
 </style>

src/views/exportTrade/customerInquiry/components/goodsInfo.vue

@@ -811,10 +811,11 @@ export default {
                             this.form.exchangeRate
                         );
                     })
+                
                     res.data.data.fees.forEach(e => {
-                        this.orderFeesList.push({ feesType: 2, ...e, corpId: this.form.corpId, corpName: this.form.corpsName, amount: multiply(e.price, e.quantity) })
+                        // this.orderFeesList.push({ feesType: 2, ...e, corpId: this.form.corpId, corpName: this.form.corpsName, amount: multiply(e.price, e.quantity) })
+                        this.$emit('formGoodstoFees',{ feesType: 2, ...e, corpId: this.form.corpId, corpName: this.form.corpsName, amount: multiply(e.price, e.quantity) })
                     })
-
                 });
             })
         },

src/views/exportTrade/customerInquiry/detailsPage.vue

@@ -127,7 +127,7 @@
         </avue-form>
       </trade-card>
       <goods-info ref="goodsInfo" :form="form" :data="data" :orderFeesList.sync="orderFeesList"
-        :detailData="detailData"></goods-info>
+        :detailData="detailData" @formGoodstoFees="formGoodstoFees"></goods-info>
       <!-- <trade-card title="商品信息">
         <avue-crud ref="crud" :data="data" :option="tableOption" @row-del="rowDel" :summary-method="summaryMethod"
           @saveColumn="saveColumn" @resetColumn="resetColumn" :cell-style="cellStyle" @row-dblclick="handleRowDBLClick">
@@ -925,6 +925,9 @@ export default {
     cellStyle() {
       return "padding:0;height:40px;";
     },
+    formGoodstoFees(row){
+      this.$refs.feeInfo.imporData(row)
+    },
     khEdit(staus) {
       if (staus == 'KH') {
         if (this.form.corpId) {

src/views/exportTrade/salesContract/components/goodsInfo.vue

@@ -792,7 +792,8 @@ export default {
             );
           })
           res.data.data.fees.forEach(e => {
-            this.orderFeesList.push({ feesType: 2, ...e, corpId: this.form.corpId, corpName: this.form.corpsName, amount: multiply(e.price, e.quantity) })
+            // this.orderFeesList.push({ feesType: 2, ...e, corpId: this.form.corpId, corpName: this.form.corpsName, amount: multiply(e.price, e.quantity) })
+            this.$emit('formGoodstoFees',{ feesType: 2, ...e, corpId: this.form.corpId, corpName: this.form.corpsName, amount: multiply(e.price, e.quantity) })
           })
         });
       })

src/views/exportTrade/salesContract/detailsPage.vue

@@ -155,7 +155,7 @@
         </avue-form>
       </trade-card>
       <goods-info ref="goodsInfo" :form="form" :data="data" :detailData="detailData"
-        :orderFeesList.sync="orderFeesList"></goods-info>
+        :orderFeesList.sync="orderFeesList" @formGoodstoFees="formGoodstoFees"></goods-info>
       <!--  <trade-card title="商品信息">
         <avue-crud ref="crud" :data="data" :option="tableOption" @row-del="rowDel"
           @selection-change="goodsSelectionChange" @saveColumn="saveColumn" @resetColumn="resetColumn"
@@ -1034,6 +1034,9 @@ export default {
     cellStyle() {
       return "padding:0;height:40px;";
     },
+    formGoodstoFees(row){
+      this.$refs.feeInfo.imporData(row)
+    },
     khEdit(staus) {
       if (status == 'kh') {
         if (this.form.corpId) {

src/views/maintenance/portSurcharge/detailsPage.vue

@@ -230,7 +230,7 @@ export default {
         type: "warning"
       }).then(() => {
         if (row.id) {
-          itemDel({ ids: row.id }).then(res => {
+          itemDel(row.id).then(res => {
             this.$message({
               type: "success",
               message: "删除成功!"
@@ -265,7 +265,7 @@ export default {
         type: "warning"
       }).then(() => {
         if (row.id) {
-          itemDel({ ids: row.id }).then(res => {
+          itemDel(row.id).then(res => {
             this.$message({
               type: "success",
               message: "删除成功!"