Merge branch 'dev' into pre-production

src/router/views/index.js

@@ -548,25 +548,25 @@ export default [
       },
     ],
   },
-  {
-    path: '/distribution/turndelivery/deliveryDiscuss',
-    component: Layout,
-    redirect: '/distribution/turndelivery/deliveryDiscuss',
-    children: [
-      {
-        path: '/distribution/turndelivery/deliveryDiscuss',
-        name: '配送编辑',
-        meta: {
-          i18n: 'dict',
-        },
-        props: route => ({
-          name: route.query.name,
-          id: route.query.id
-        }),
-        component: () => import('@/views/turndelivery/deliverylist/deliveryDiscuss.vue'),
-      },
-    ],
-  },
+  // {
+  //   path: '/distribution/turndelivery/deliveryDiscuss',
+  //   component: Layout,
+  //   redirect: '/distribution/turndelivery/deliveryDiscuss',
+  //   children: [
+  //     {
+  //       path: '/distribution/turndelivery/deliveryDiscuss',
+  //       name: '配送编辑',
+  //       meta: {
+  //         i18n: 'dict',
+  //       },
+  //       props: route => ({
+  //         name: route.query.name,
+  //         id: route.query.id
+  //       }),
+  //       component: () => import('@/views/turndelivery/deliverylist/deliveryDiscuss.vue'),
+  //     },
+  //   ],
+  // },
   {
     path: '/basicdata/brand/basicdataTripartiteMall',
     component: Layout,

src/views/basicdata/brand/basicdataTripartiteMall.vue

@@ -79,9 +79,9 @@
                  append-to-body>
         <el-form :disabled="view" ref="form" :model="form" label-width="80px">
           <!-- 表单字段 -->
-          <el-form-item label="客户ID" prop="client">
-            <el-input v-model="form.client" placeholder="请输入客户ID"/>
-          </el-form-item>
+          <!-- <el-form-item label="客户ID" prop="clientId">
+            <el-input v-model="form.clientId" placeholder="请输入客户ID"/>
+          </el-form-item> -->
           <el-form-item label="三方商城" prop="tripartiteMall">
             <el-input v-model="form.tripartiteMall" placeholder="请输入三方商城"/>
           </el-form-item>
@@ -191,6 +191,7 @@ export default {
     handleAdd () {
       this.title = '新增'
       this.form = {}
+     this.form.clientId= this.$route.query.id
       this.box = true
     },
     handleEdit (row) {