Merge branch 'master' of http://git.echepei.com/zhujiawei/Warehouse_management_ui

src/views/basicdata/corps/index.vue

@@ -690,9 +690,14 @@
         const fId = row.fId || this.ids
         getCorps(fId).then(response => {
           this.form = response.data["corp"];
+          var contactList1=response.data["customerContact"];
+          if(contactList1!=null){
+            this.contactList=contactList1;
+          }else {
+            this.query();
+          }
           this.open = true;
           this.title = "修改客户详情";
-          this.contactList=response.data["customerContact"];
         });
       },
       /** 提交按钮 */
@@ -700,11 +705,6 @@
         this.$refs["form"].validate(valid => {
           if (valid) {
             if (this.form.fId != null) {
-              /*updateCorps(this.form).then(response => {
-                this.msgSuccess("修改成功");
-                this.open = false;
-                this.getList();
-              });*/
               let formDate= new FormData()
               formDate.append('corps',JSON.stringify(this.form));
               formDate.append('customerContacts',JSON.stringify(this.contactList));

src/views/finance/charge/index.vue

@@ -440,6 +440,8 @@ export default {
       showSearch: true,
       // 总条数
       total: 0,
+      //提单号暂存
+      fMblno:'',
       // 财务数据主表格数据
       chargeList: [],
       // 弹出层标题
@@ -533,10 +535,14 @@ export default {
         console.log('未选择')//写入提示
       } else {
         console.log(this.selection[0].fMblno)
-
         for (let item in this.selection){
           console.log(this.selection[item])
           console.log(this.selection[item].fMblno)
+          if(item > 1){
+            this.fMblno = this.selection[item].fMblno + "..."
+          }else if(item == 0){
+            this.fMblno = this.selection[item].fMblno
+          }
         }
         this.increase_s = this.selection
         this.innerVisible = false
@@ -689,6 +695,7 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
+      console.log(this.queryParameter)
       this.$refs['ruless'].validate(valid => {
         console.log(valid)
         if (valid) {