Merge branch 'master' of http://git.cc-lotus.info/Consumables/admin-cms-two

src/views/menu/indepot/index.vue

@@ -13,7 +13,7 @@
     </el-row>
     <e-dialog :dialog="dialog" @toClose="toClose">
       <template slot="info">
-        <detail-1 v-if="dialog.type == '1'" :form="form" :stock_typeList="stock_typeList" :typeList="typeList" @toSave="onSubmit"></detail-1>
+        <detail-1 v-if="dialog.type == '1'" :form="form" :stock_typeList="stock_typeList" :typeList="typeList" @toSave="onSubmit" @addSave="addSave"></detail-1>
         <info-1 v-else-if="dialog.type == '2'" :form="form"></info-1>
       </template>
     </e-dialog>
@@ -101,6 +101,10 @@ export default {
       this.dialog = { title: '详细信息', show: false, type: '1' };
       this.search();
     },
+    // 保存
+    addSave({ data }) {
+      this.form.order.push(data);
+    },
   },
   computed: {
     ...mapState(['user']),

src/views/menu/indepot/parts/detail-1.vue

@@ -9,6 +9,12 @@
                 <el-button type="primary" size="mini" @click="toAddOne()">添加商品(库存有)</el-button>
                 <el-button type="primary" size="mini" @click="toAddTwo()">添加商品(库存无)</el-button>
               </el-col>
+              <el-col :span="24" class="table">
+                <el-table :data="form.order" style="width: 100%" border stripe size="mini">
+                  <el-table-column prop="name" label="商品名称" align="center" show-overflow-tooltip> </el-table-column>
+                  <el-table-column prop="num" label="商品数量" align="center" show-overflow-tooltip> </el-table-column>
+                </el-table>
+              </el-col>
             </template>
           </template>
         </data-form>
@@ -24,7 +30,7 @@
             <el-button type="primary" size="small">搜索</el-button>
           </el-col>
           <el-col>
-            <data-form :fields="fieldsOne" :rules="rulesOne" @save="addSave"> </data-form>
+            <data-form :fields="fieldsOne" :data="twoform" :rules="rulesOne" @save="addSave"> </data-form>
           </el-col>
         </el-col>
         <el-col v-if="dialog.type == '2'">
@@ -126,13 +132,13 @@ export default {
       this.dialog = { title: '添加商品', show: true, type: '2', widths: '30%' };
     },
     addSave({ data }) {
-      console.log(data);
-      // this.toClose();
+      this.$emit('addSave', { data: data });
+      this.toClose();
     },
     // 上传图片
     uplSuc({ type, data }) {
       let list = this.form[type];
-      this.$set(this.form, `${type}`, [...list, { name: data.name, url: data.uri }]);
+      this.$set(this.form, `${type}`, [...order, { name: data.name, url: data.uri }]);
     },
     // 删除图片
     uplDel({ type, data, list }) {

src/views/menu/outdepot/index.vue

@@ -13,7 +13,7 @@
     </el-row>
     <e-dialog :dialog="dialog" @toClose="toClose">
       <template slot="info">
-        <detail-1 v-if="dialog.type == '1'" :form="form" @onSubmit="onSubmit"></detail-1>
+        <detail-1 v-if="dialog.type == '1'" :form="form" @onSubmit="onSubmit" @addSave="addSave"></detail-1>
         <info-1 v-if="dialog.type == '2'" :form="form"></info-1>
       </template>
     </e-dialog>
@@ -88,6 +88,10 @@ export default {
       this.dialog = { title: '详细信息', show: false, type: '1' };
       this.search();
     },
+    // 保存
+    addSave({ data }) {
+      this.form.order.push(data);
+    },
   },
   computed: {
     ...mapState(['user']),

src/views/menu/outdepot/parts/detail-1.vue

@@ -8,6 +8,12 @@
               <el-col :span="24">
                 <el-button type="primary" size="mini" @click="toAddOne()">添加商品</el-button>
               </el-col>
+              <el-col :span="24" class="table">
+                <el-table :data="form.order" style="width: 100%" border stripe size="mini">
+                  <el-table-column prop="name" label="商品名称" align="center" show-overflow-tooltip> </el-table-column>
+                  <el-table-column prop="num" label="商品数量" align="center" show-overflow-tooltip> </el-table-column>
+                </el-table>
+              </el-col>
             </template>
           </template>
         </data-form>
@@ -23,7 +29,7 @@
             <el-button type="primary" size="small">搜索</el-button>
           </el-col>
           <el-col>
-            <data-form :fields="fieldsOne" :rules="rulesOne" @save="addSave"> </data-form>
+            <data-form :fields="fieldsOne" :data="twoform" :rules="rulesOne" @save="addSave"> </data-form>
           </el-col>
         </el-col>
       </template>
@@ -65,6 +71,7 @@ export default {
       // 弹框
       dialog: { title: '信息管理', show: false, type: '1' },
       input: '',
+      twoform: {},
     };
   },
   created() {},
@@ -77,7 +84,10 @@ export default {
     toAddOne() {
       this.dialog = { title: '添加商品', show: true, type: '1', widths: '30%' };
     },
-    addSave() {},
+    addSave({ data }) {
+      this.$emit('addSave', { data: data });
+      this.toClose();
+    },
     // 关闭弹框
     toClose() {
       this.dialog = { show: false };