解决冲突

src/api/storehouse/plan/plan-in.js

@@ -0,0 +1,10 @@
+import request from '@/router/axios';
+
+
+export const submitPlan = (data) => {
+    return request({
+        url: '/api/blade-sales-part/tire/center/warehouse/plan/submitPlan',
+        method: 'POST',
+        data: data
+    })
+}

src/views/storehouse/inStockManage/inStockPlan/detailsPage.vue

@@ -42,10 +42,11 @@
                 <el-tabs v-model="activeName" type="card">
                     <el-tab-pane label="入库明细" name="sale_detail">
                         <avue-crud :option="optionContacts" v-model="formContacts" ref="formContacts"
-                            :data="form.planItemsList" :key="key" @row-save="rowSave" @row-update="rowUpdate"
-                            @row-close="rowClose" :before-close="beforeClose" @selection-change="selectionContacts"
-                            @resetColumn="resetColumnTwo('formContacts', 'optionContacts', 'optionContactsBack', 269.1)"
-                            @saveColumn="saveColumnTwo('formContacts', 'optionContacts', 'optionContactsBack', 269.1)">
+                                   :data="form.planItemsList" :key="key" @row-save="rowSave" @row-update="rowUpdate"
+                                   @row-close="rowClose" :before-close="beforeClose"
+                                   @selection-change="selectionContacts"
+                                   @resetColumn="resetColumnTwo('formContacts', 'optionContacts', 'optionContactsBack', 269.1)"
+                                   @saveColumn="saveColumnTwo('formContacts', 'optionContacts', 'optionContactsBack', 269.1)">
                             <template slot-scope="{scope,row}" slot="menuLeft">
                                 <el-button type="primary" icon="el-icon-plus" size="small" :disabled="isAddBtn"
                                     @click="rowAdd(row)">添加商品
@@ -108,7 +109,7 @@
                                     @click="hangbaocun(row, index)">保存
                                 </el-button>
                                 <el-button icon="el-icon-delete" :size="size" :disabled="disabled || isDisabled"
-                                    :type="type" @click="rowDelBox(row, index, 'planItemsList')">删除
+                                           :type="type" @click="rowDelBox(row, index, 'planItemsList')">删除
                                 </el-button>
                             </template>
                         </avue-crud>
@@ -202,6 +203,7 @@ import check from "@/components/checkL/check";
 import { getCorpType, getList } from "@/api/tirePartsMall/basicData/commodityInformation"
 import { isProcurement } from "@/api/basicData/configuration";
 import commodity from "../../configuration/commodity.json";
+import {submitPlan} from "@/api/storehouse/plan/plan-in";
 
 export default {
     name: "detailsPage",
@@ -1199,8 +1201,8 @@ export default {
                         background: 'rgba(255,255,255,0.7)'
                     });
                     this.form.storageName = this.form.$storageId ? this.form.$storageId : ''
-                    submit({
-                        bsType: "CG",
+                    submitPlan({
+                        bsType: "RP",
                         ...this.form
                     }).then(res => {
                         this.$message.success("保存成功");