chencc 1 год назад
Родитель
Сommit
aefafb549e

+ 9 - 3
src/views/material/BOMmanage/components/detailedList.vue

@@ -2,7 +2,7 @@
   <div class="ele-body">
 
     <BOMSearch @search="reload" :statusOpt="statusOpt" />
-    <ele-pro-table ref="table" :key="tableKey" :columns="columns" :header-cell-style="headerCellStyle" :datasource="datasource" class="dict-table"
+    <ele-pro-table ref="table" :key="tableKey" :columns="columns" :pagination="pagination" :header-cell-style="headerCellStyle" :datasource="datasource" class="dict-table"
       tool-class="ele-toolbar-actions">
       <template v-slot:toolbar>
         <div class="toolbar_box">
@@ -143,6 +143,9 @@ export default {
 
   data() {
     return {
+      pagination:{
+        tableTotal:0
+      },
       // 表格列配置
       columns: [
         {
@@ -290,7 +293,6 @@ export default {
         0: '草稿',
         1: '已发布'
       },
-
       dictList: [
         {
           label: '加工',
@@ -473,7 +475,7 @@ export default {
         this.list = [...list];
         this.listTow = JSON.parse(JSON.stringify(this.list));
 
-        console.log(this.listTow, 'listTowlistTowlistTowlistTow');
+       
         this.$refs.table.setData(this.list)
         this.updateFn()
         this.tableKey = Date.now();
@@ -666,7 +668,11 @@ export default {
           })
 
           this.list = [...data, ...this.$refs.table.getData()];
+  
+          this.$refs.table._data.tableTotal = this.list.length;
+
 
+  
           this.$refs.table.setData(this.list)
         })
 

+ 4 - 5
src/views/material/product/components/index-data.vue

@@ -8,6 +8,7 @@
       :need-page="true"
       :selection.sync="selection"
       :current.sync="rowCurrent"
+      
       highlight-current-row
       height="calc(100vh - 412px)"
       full-height="calc(100vh - 116px)"
@@ -278,7 +279,9 @@ export default {
 
       errorData: [],
       exportErrorDioalogVisible: false,
-
+      pagination:{
+        total: 0 
+      },
       bomShow: false,
 
       pageShow: false,
@@ -495,9 +498,6 @@ export default {
         rootPathIdParent: row.categoryLevelPathIdParent,
         isProduct: row.isProduct == 1
       };
-
-      console.log(rowData);
-
       this.$refs.bomDrawer.open(rowData);
     },
     //采购
@@ -544,7 +544,6 @@ export default {
         categoryLevelId: this.currentId
       });
       let a= await labs;
-      console.log(a,'ssssssssssssssssss');
 
       return labs;
     },

+ 9 - 1
src/views/material/product/detail.vue

@@ -645,12 +645,15 @@ export default {
     },
 
     changePackagingSpecification(val) {
-      console.log('changePackagingSpecification--------默认包装组', val);
       this.packagingSpecificationList = val;
     },
     async _getDetails() {
+
       const data = await getDetails(this.$route.query.id);
+
+
       const info = deepClone(data);
+      info.category.produceType = info.category.produceType[0];
 
       this.form = {
         ...info.category
@@ -823,8 +826,11 @@ export default {
     submit() {
 
       this.$refs.manageForm.validate(async (valid) => {
+
+
         let productionValid = await this.$refs.productionRefs.getFormValid();
         let warehouseValid = await this.$refs.warehouseRefs.getFormValid();
+        
 
         if (!valid || !productionValid || !warehouseValid) {
           return false;
@@ -949,6 +955,8 @@ export default {
         }
         console.log('保存', data);
 
+        data.category.produceType = [data.category.produceType];
+
         addMaterial(data)
           .then((msg) => {
             this.loading = false;

+ 1 - 1
src/views/material/product/oneProduct.vue

@@ -75,7 +75,7 @@
             </div>
 
             <IndexSearch  ref="searchRef"  @search="reload" />
-
+            
             <!-- //产品 -->
             <IndexData
               ref="listData"