前端代码合并提交

src/views/selfCar/selfCarTrade.vue

@@ -148,7 +148,8 @@ export default {
       formCondition: {
         status: ``,
         cardId: ``,
-        tradeId: ``
+        tradeId: ``,
+        companyName: ''
       },
       formUserList: {
         'file': ``
@@ -178,6 +179,13 @@ export default {
     },
     async update() {
       var loading = null
+      const formData = new FormData()
+      formData.append(`selfCarTradesStr`, JSON.stringify(this.multipleSelection))
+      formData.append('companyName', this.formCondition.companyName);
+      if(this.formCondition.companyName == ''){
+         this.$message(`请输入公司名称`)
+         return
+      }
       if (this.multipleSelection.length == 0) {
         loading = this.$loading({
           lock: true,
@@ -186,17 +194,23 @@ export default {
           background: `rgba(0, 0, 0, 0.7)`
         })
       };
-      const formData = new FormData()
-      formData.append(`selfCarTradesStr`, JSON.stringify(this.multipleSelection))
-      const response = await this.$http.post(`selfCar/updateTrades`, formData)
+       const response = await this.$http.post(`selfCar/updateTrades`, formData)
       if (this.multipleSelection.length == 0) {
         loading.close()
       };
-      this.loadData()
-      this.$message({
+      var {data: { code, msg, data }} = response
+      if (code== 0) {
+        this.$message({
         type: `success`,
         message: `更新成功`
       })
+      } else {
+       this.$message({
+                type: `error`,
+                message: `` + msg
+              })
+      }
+      this.loadData()
     },
     // 列表展示
     async loadData() {