解决冲突

src/api/basicData/configuration.js

@@ -283,4 +283,16 @@ export function repealPurchase(data) {
         data: data
       })
     }
-    
+
+/**
+ * 利息计算
+ * @param data 订单主表数据
+ * @returns {AxiosPromise} 成功与否
+ */
+export function calculateInterestAmount(data) {
+    return request({
+        url: '/api/blade-purchase-sales/order/calculateInterestAmount',
+        method: 'post',
+        data: data
+    })
+}

src/views/allocationContract/configuration/customerContact.json

@@ -18,7 +18,7 @@
   "tree": true,
   "border": true,
   "index": true,
-  "selection": true,
+  "selection": false,
   "menuWidth": 130,
   "dialogClickModal": false,
   "showSummary": true,
@@ -281,6 +281,15 @@
         }
       ]
     },
+      {
+          "label": "利息单价",
+          "prop": "interestAmount",
+          "index": 13,
+          "width": 100,
+          "cell": false,
+          "slot": false,
+          "overHidden": true
+      },
     {
       "label": "金额",
       "prop": "amount",

src/views/allocationContract/index.vue

@@ -79,21 +79,7 @@
           <span v-if="scope.row.specialCheckStatus == 3">审批通过</span>
         </template>
         <template slot="menuLeft" slot-scope="{ size }">
-          <el-button type="success" :size="size" style="font-size: 12px;" @click="copyOrder" :disabled="single">复制单据</el-button>
           <el-button type="info" :size="size" style="font-size: 12px;" v-if="saberUserInfo.role_name.indexOf('业务员') == -1" icon="el-icon-printer" @click="exportExcel">导 出</el-button>
-          <el-button type="info" size="small" style="font-size: 12px;" icon="el-icon-download" @click="exportHandle">库 存</el-button>
-        </template>
-        <template slot-scope="scope" slot="menu">
-          <el-button type="text" size="small" v-debounce @click="saveSell(scope.row)"
-            :disabled="scope.row.status < 3 || scope.row.createPurchase == 1" v-if="isProcurements">生成采购</el-button>
-          <el-button type="text" size="small" v-debounce @click="customerReceipt(scope.row)" :disabled="
-            !scope.row.status ||
-            scope.row.status < 3 ||
-            scope.row.createFreight == 1
-          ">客户收货</el-button>
-          <el-button type="text" icon="el-icon-delete" size="small" @click.stop="rowDel(scope.row, scope.index)"
-            :disabled="scope.row.status > 0">删除
-          </el-button>
         </template>
       </avue-crud>
     </basic-container>
@@ -121,16 +107,13 @@ import {
   deleteDetails,
   saveSell,
   detail,
-  generateShipment,
   genClient,
   warehouseList,
   isProcurement
 } from "@/api/basicData/configuration";
 import detailPage from "./detailsPageEdit";
-import search from "@/page/index/search";
 import { defaultDate } from "@/util/date";
 import { getToken } from "@/util/auth";
-import os from "os";
 import { gainUser } from "@/api/basicData/customerInquiry";
 import { getCurrentDate } from "@/util/date";
 import {location} from "@/api/gaude";

src/views/businessManagement/salesOrder/detailsPageEdit.vue

@@ -344,7 +344,7 @@
               </el-button>
               <el-button v-if="isDisabled" type="primary" icon="el-icon-plus" size="small" @click="DLSelection"
                 :disabled="detailData.seeDisabled || !form.corpId || browse">
-                代理订单
+                  下游订单
               </el-button>
             </template>
           </avue-crud>