ysy пре 1 година
родитељ
комит
dad21aad02

+ 33 - 21
src/views/productionPlan/components/disassemblePlanPop.vue

@@ -48,26 +48,26 @@
         </el-descriptions>
         <headerTitle title="BOM信息" class="mt20"> </headerTitle>
 
-        <div>
-          <ele-pro-table
-            ref="table"
-            :needPage="false"
-            :columns="columns"
-            :datasource="bomList"
-            tool-class="ele-toolbar-actions"
-          >
-            <template v-slot:toolbar>
-              <div class="toolbar_box">
-                <div
-                  ><span>基本数量</span>
-                  <el-input placeholder="请输入" v-model.number="baseCount">
-                  </el-input>
-                  <DictSelection dictName="计量单位" v-model="unit"
-                /></div>
-              </div>
-            </template>
-          </ele-pro-table>
-        </div>
+        <ele-pro-table
+          ref="table"
+          :needPage="false"
+          :columns="columns"
+          :datasource="bomList"
+          :selection.sync="selection"
+          @update:selection="handleSelectionChange"
+          tool-class="ele-toolbar-actions"
+        >
+          <template v-slot:toolbar>
+            <div class="toolbar_box">
+              <div
+                ><span>基本数量</span>
+                <el-input placeholder="请输入" v-model.number="baseCount">
+                </el-input>
+                <DictSelection dictName="计量单位" v-model="unit"
+              /></div>
+            </div>
+          </template>
+        </ele-pro-table>
       </el-form>
     </div>
     <div slot="footer">
@@ -92,9 +92,18 @@
         bomList: [],
         baseCount: '',
         unit: '',
+
+        selection: [],
+
         rules: {},
 
         columns: [
+          {
+            columnKey: 'selection',
+            type: 'selection',
+            width: 45,
+            align: 'center'
+          },
           {
             prop: 'code',
             label: 'BOM编码',
@@ -176,6 +185,10 @@
         });
       },
 
+      handleSelectionChange() {
+        console.log(this.selection);
+      },
+
       cancel() {
         this.formData = {};
         this.visible = false;
@@ -198,7 +211,6 @@
     margin-bottom: 0 !important;
   }
 
-
   .toolbar_box {
     float: right;
     margin-right: 10px;

+ 7 - 0
src/views/productionPlan/index.vue

@@ -467,6 +467,13 @@
             showOverflowTooltip: true
           },
 
+          {
+            prop: 'factoryName',
+            label: '所属工厂',
+            align: 'center',
+         
+          },
+
           {
             prop: 'moCount',
             label: '模数',