修改bug

src/api/basicData/shippingInquiry.js

@@ -17,7 +17,7 @@ export function detail(id) {
     method: 'get'
   })
 }
-//修改和新增
+//新增
 export function submit(data) {
   return request({
     url: '/api/trade-purchase/shipping-enquiry/submit',
@@ -25,6 +25,14 @@ export function submit(data) {
     data: data
   })
 }
+//修改
+export function commit(data) {
+  return request({
+    url: '/api/trade-purchase/shipping-enquiry/commit',
+    method: 'post',
+    data: data
+  })
+}
 //明细表删除
 // export function delItem(data) {
 //   return request({

src/views/exportTrade/shippingInquiry/detailsPage.vue

@@ -12,11 +12,19 @@
         </el-button>
       </div>
       <el-button
-        class="el-button--small-yh add-customer-btn"
+        class="fix-customer-btn"
         type="primary"
-        :disabled="disabled"
-        @click="editCustomer"
-        >{{ form.id ? "确认修改" : "确认提交" }}
+        :disabled="disabled && detailData.status == 1"
+        @click="editCustomer('submit')"
+        v-if="form.id"
+        >确认修改
+      </el-button>
+      <el-button
+        class="add-customer-btn"
+        type="primary"
+        :disabled="disabled && detailData.status == 1"
+        @click="editCustomer('fix')"
+        >提 交
       </el-button>
     </div>
     <div style="margin-top: 60px;margin-bottom:35px">
@@ -189,14 +197,11 @@ import {
   getDeptLazyTree,
   getGoods,
   getPorts,
-  delItem
+  delItem,
+  commit
 } from "@/api/basicData/shippingInquiry";
 import reportDialog from "@/components/report-dialog/main";
-import {
-  isvalidatemobile,
-  validatename,
-  micrometerFormat
-} from "@/util/validate";
+import { micrometerFormat } from "@/util/validate";
 import { contrastObj, contrastList } from "@/util/contrastData";
 import _ from "lodash";
 export default {
@@ -453,9 +458,13 @@ export default {
     getDetail(id) {
       detail(id).then(res => {
         this.form = res.data.data;
-        this.data = res.data.data.itemsVOList;
-        this.orderFeesList = res.data.data.orderFeesList;
-        this.freightData = res.data.data.orderFreightList;
+        this.data = res.data.data.itemsVOList ? res.data.data.itemsVOList : [];
+        this.orderFeesList = res.data.data.orderFeesList
+          ? res.data.data.orderFeesList
+          : [];
+        this.freightData = res.data.data.orderFreightList
+          ? res.data.data.orderFreightList
+          : [];
         this.configuration.dicData = this.form.corpsName;
       });
     },
@@ -463,7 +472,7 @@ export default {
       this.freightData.push({ $cellEdit: true });
     },
     //修改提交触发
-    editCustomer() {
+    editCustomer(status) {
       this.$refs["form"].validate((valid, done) => {
         done();
         if (valid) {
@@ -479,18 +488,46 @@ export default {
               return this.$message.error(`请正确输入第${i + 1}行的数量`);
             }
           }
-          submit({
-            id: this.form.id,
-            orderFeesList: orderFeesList,
-            orderFreightList: this.freightData
-          }).then(res => {
-            this.$message.success(this.form.id ? "修改成功" : "提交成功");
-            this.form = res.data.data;
-            this.data = res.data.data.itemsVOList;
-            this.orderFeesList = res.data.data.orderFeesList;
-            this.freightData = res.data.data.orderFreightList;
-            this.configuration.dicData = this.form.corpsName;
-          });
+          if (status == "submit") {
+            submit({
+              id: this.form.id,
+              orderFeesList: orderFeesList,
+              orderFreightList: this.freightData
+            }).then(res => {
+              this.$message.success("修改成功");
+              this.form = res.data.data;
+              this.data = res.data.data.itemsVOList
+                ? res.data.data.itemsVOList
+                : [];
+              this.orderFeesList = res.data.data.orderFeesList
+                ? res.data.data.orderFeesList
+                : [];
+              this.freightData = res.data.data.orderFreightList
+                ? res.data.data.orderFreightList
+                : [];
+              this.configuration.dicData = this.form.corpsName;
+            });
+          }
+          if (status == "fix") {
+            commit({
+              id: this.form.id,
+              orderFeesList: orderFeesList,
+              orderFreightList: this.freightData
+            }).then(res => {
+              this.$message.success("提交成功");
+              this.form = res.data.data;
+              this.data = res.data.data.itemsVOList
+                ? res.data.data.itemsVOList
+                : [];
+              this.orderFeesList = res.data.data.orderFeesList
+                ? res.data.data.orderFeesList
+                : [];
+              this.freightData = res.data.data.orderFreightList
+                ? res.data.data.orderFreightList
+                : [];
+              this.configuration.dicData = this.form.corpsName;
+            });
+          }
         } else {
           return false;
         }
@@ -584,6 +621,11 @@ export default {
   right: 140px;
   top: 115px;
 }
+.fix-customer-btn {
+  position: fixed;
+  right: 120px;
+  top: 115px;
+}
 .add-customer-btn {
   position: fixed;
   right: 36px;