Merge branch 'dev' of http://git.echepei.com/caojunjie/Smart_platform_ui into dev

src/views/basicData/customerInformation/detailsPageEdit.vue

@@ -1058,8 +1058,8 @@ export default {
                 type: "success",
                 message: this.form.id ? "修改成功!" : "新增成功!"
               });
+              this.form = res.data.data
               this.disabled = false;
-              this.$emit("goBack");
             }
           });
         } else {
@@ -1079,6 +1079,7 @@ export default {
             id:this.form.id
           }).then(res=>{
             done()
+            this.$message.success('同步成功');
             this.dialogVisible = false
           })
         }else {

src/views/basicData/factoryInformation/factoryInformation/detailsPageEdit.vue

@@ -932,11 +932,8 @@ export default {
                 type: "success",
                 message: this.form.id ? "修改成功!" : "新增成功!"
               });
-              this.$router.$avueRouter.closeTag();
-              this.$router.push({
-                path: "/basicData/customerInformation/index",
-                query: {}
-              });
+              this.form = res.data.data
+              this.disabled = false;
             }
           });
         } else {

src/views/basicData/fleetInformation/detailsPageEdit.vue

@@ -962,7 +962,8 @@ export default {
                 type: "success",
                 message: this.form.id ? "修改成功!" : "新增成功!"
               });
-              this.$emit("goBack");
+              this.form = res.data.data
+              this.disabled = false;
             }
           });
         } else {

src/views/landTransportation/placeAnOrder/detailPage.vue

@@ -174,6 +174,11 @@
                  @resetColumn="resetColumnBox"
                  @saveColumn="saveColumnBox"
                  @row-del="rowDel">
+        <template slot="headerSerial" slot-scope="{column}">
+          <el-tooltip class="item" effect="dark" content="录入明细" placement="top">
+            <el-button type="primary" icon="el-icon-circle-plus-outline" circle size="mini" @click="$refs.crudBox.rowCellAdd()"></el-button>
+          </el-tooltip>
+        </template>
         <template slot="ctnTypeHeader" slot-scope="{column}">
           {{ column.label }}<span style="color:#F56C6C">*</span>
         </template>
@@ -840,9 +845,10 @@ export default {
         refreshBtn: false,
         addBtnText: '录入信息',
         index: true,
+        indexSlot: true,
         cellBtn: true,
         addBtn: false,
-        addRowBtn: true,
+        addRowBtn: false,
         showSummary: true,
         summaryText: "合计",
         sumColumnList: [
@@ -886,6 +892,7 @@ export default {
           prop: 'ctnType',
           type: 'select',
           width: 100,
+          index:1,
           dicUrl: "/api/blade-system/dict-biz/dictionary?code=boxType",
           props: {
             label: "dictValue",
@@ -897,6 +904,7 @@ export default {
           prop: 'ctnQuantity',
           controls: false,
           precision: 0,
+          index:2,
           width: 100,
           maxRows: 999,
           minRows: 1,
@@ -907,6 +915,7 @@ export default {
           prop: 'landWeight',
           controls: false,
           width: 200,
+          index:3,
           precision: 2,
           type: 'number'
         }, {
@@ -915,11 +924,13 @@ export default {
           prop: 'landAmountD',
           controls: false,
           width: 200,
+          index:4,
           precision: 2,
           type: 'number'
         }, {
           label: '备注',
           cell: true,
+          index:5,
           prop: 'remarks'
         }]
       },
@@ -1493,7 +1504,7 @@ export default {
     },
     //选择地址客户带出地址
     withAddress(row, scope) {
-      console.log(row)
+      this.tableData[scope.$index].address = ''
       if (!scope.row.key) scope.row.key = 0
       this.tableData[scope.$index].corpName = row.cname
       if (row.attn){