浏览代码

BugFix: 009

chris 3 年之前
父节点
当前提交
9a27eb82ba
共有 2 个文件被更改,包括 29 次插入11 次删除
  1. 7 1
      src/views/modules/order/order-add-or-update.vue
  2. 22 10
      src/views/modules/product/template-chose.vue

+ 7 - 1
src/views/modules/order/order-add-or-update.vue

@@ -170,7 +170,7 @@
     <el-dialog title="图片预览" :visible.sync="previewVisible" width="50%">
       <img :src="previewPath" :alt="previewName" style="width:100%;height:100%" />
     </el-dialog>
-    <template-chose v-if="productListVisible" ref="productList" @addItem="addProductItem" />
+    <template-chose v-if="productListVisible" ref="productList" @addItems="addProductItems" />
   </div>
 </template>
 
@@ -335,6 +335,12 @@
           rate: 0
         })
       },
+      addProductItems (items) {
+        this.productDetails = []
+        items.forEach((item) => {
+          this.addProductItem(item)
+        })
+      },
       addMaterial () {
         this.materialListVisible = true
         this.$nextTick(() => {

+ 22 - 10
src/views/modules/product/template-chose.vue

@@ -12,6 +12,7 @@
         <el-form-item>
           <el-button @click="search()">查询</el-button>
           <el-button @click="visible = false" type="primary">返回</el-button>
+          <el-button type="primary" @click="addItems()">添加</el-button>
         </el-form-item>
       </el-form>
       <el-table
@@ -20,6 +21,9 @@
         v-loading="dataListLoading"
         @selection-change="selectionChangeHandle"
         style="width: 100%;">
+        <el-table-column
+          type="selection">
+        </el-table-column>
         <el-table-column
           label="序号"
           type="index"
@@ -62,16 +66,16 @@
           align="center"
           label="备注">
         </el-table-column>
-        <el-table-column
-          fixed="right"
-          header-align="center"
-          align="center"
-          width="50"
-          label="操作">
-          <template slot-scope="scope">
-            <el-button type="text" size="small" @click="exportItem(scope.row)">添加</el-button>
-          </template>
-        </el-table-column>
+<!--        <el-table-column-->
+<!--          fixed="right"-->
+<!--          header-align="center"-->
+<!--          align="center"-->
+<!--          width="50"-->
+<!--          label="操作">-->
+<!--          <template slot-scope="scope">-->
+<!--            <el-button type="text" size="small" @click="exportItem(scope.row)">添加</el-button>-->
+<!--          </template>-->
+<!--        </el-table-column>-->
       </el-table>
       <el-pagination
         @size-change="sizeChangeHandle"
@@ -150,6 +154,14 @@
       // 添加
       exportItem (item) {
         this.$emit('addItem', item)
+      },
+      addItems () {
+        if (this.dataListSelections.length === 0) {
+          this.$message.warning('请选择产品')
+          return
+        }
+        this.visible = false
+        this.$emit('addItems', this.dataListSelections)
       }
     }
   }