Merge branch 'purchaseDev' into 'dev'

Purchase dev

See merge request new-business/drp-web!497

src/components/popover-select/index.vue

@@ -351,7 +351,7 @@ export default {
       >
         <el-form-item prop="search">
           <el-input
-            :size="size"
+            size="mini"
             v-model="model.search"
             @change="useQuery"
             @keydown.enter="useQuery"
@@ -359,7 +359,8 @@ export default {
           </el-input>
         </el-form-item>
         <el-form-item>
-          <el-button icon="el-icon-refresh" @click="useReset"></el-button>
+          <el-button @click="useQuery" size="mini" >搜 索</el-button>
+          <el-button icon="el-icon-refresh" @click="useReset" size="mini"></el-button>
         </el-form-item>
         <el-table
           ref="multipleTable"

src/components/super-table/index.vue

@@ -299,7 +299,7 @@ export default {
               return '';
             }
           }, 0);
-          sums[index];
+          sums[index] = sums[index].toFixed(2) // 保留2位小数，解决小数合计列;
           }
 				});
 				return sums;

src/views/material/changeApply/columns.js

@@ -47,16 +47,60 @@ export default function useColumns() {
         },
       },
     },
+    // {
+    //   item:{
+    //     key: "manufacturerIdName",
+    //     title: "生产厂家/代理人",  
+    //   },
+    //   attr:{
+    //     clearable:true,
+    //     is: "el-popover-select-v2",
+    //     valueKey: "name",
+    //     referName: "MANUFACTURER_PARAM",
+    //     dataMapping: {
+    //       manufacturerId: "id",
+    //     },
+    //   },
+    // },
+    // {
+    //   item:{
+    //     key: "approverName",
+    //     title: "申请人",
+    //   },
+    //   attr: {
+    //     clearable:true,
+    //     is: "el-popover-select-v2",
+    //     referName: "CONTACTS_PARAM",
+    //     valueKey: "name",
+    //     dataMapping: {
+    //       approver: "code",
+    //     },
+    //   },
+    // },
+    // {
+    //   item:{
+    //     key: "applicationTime",
+    //     title: "申请日期",
+    //    // span:12,
+    //   },
+    //   attr: {
+    //     clearable:true,
+    //     is: "el-date-picker",
+    //     type:"daterange",
+    //     rangeSeparator:"-",
+    //     startPlaceholder:"开始日期",
+    //     endPlaceholder:"结束日期",
+    //     valueFormat:"yyyy-MM-dd",
+    //   },
+    // },
     {
-      item: { key: "materialName", title: "物料名称" },
+      item: {
+        key: "code",
+        title: "单据编码",
+      },
       attr: {
-        is: "el-popover-select-v2",
-        referName: "MATERIAL_PARAM",
-        valueKey: "name",
-        clearable:true,
-        dataMapping: { 
-          materialCode: "code",
-        },
+        clearable: true,
+        is: "el-input",
       },
     },
     {
@@ -67,28 +111,44 @@ export default function useColumns() {
         clearable: true,
       },
     },
-    {
-      item: {
-        key: "code",
-        title: "单据编码",
-      },
-      attr: {
-        clearable: true,
-        is: "el-input",
-      },
-    },
+    // {
+    //   item: {
+    //     key: "classifys",
+    //     title: "物料分类",
+    //   },
+    //   attr: {
+    //     is: "el-popover-multiple-tree-select",
+    //     referName: "MATERIALCLASSIFY_PARAM",
+    //     valueKey: "id",
+    //     clearable:true,
+    //   },
+    // },
     // {
     //   item:{
-    //     key: "puPersonnelIdName",
-    //     title: "采购员",
+    //     key: "updateTime",
+    //     title: "修改日期",
+    //    // span:12,
     //   },
     //   attr: {
     //     clearable:true,
+    //     is: "el-date-picker",
+    //     type:"daterange",
+    //     rangeSeparator:"-",
+    //     startPlaceholder:"开始日期",
+    //     endPlaceholder:"结束日期",
+    //     valueFormat:"yyyy-MM-dd",
+    //   },
+    // },
+
+    // {
+    //   item: { key: "materialName", title: "物料名称" },
+    //   attr: {
     //     is: "el-popover-select-v2",
-    //     referName: "CONTACTS_PARAM",
+    //     referName: "MATERIAL_PARAM",
     //     valueKey: "name",
-    //     dataMapping: {
-    //       puPersonnelId: "code",
+    //     clearable:true,
+    //     dataMapping: { 
+    //       materialCode: "code",
     //     },
     //   },
     // },

src/views/purchase/purchase-order/add/column.js

@@ -475,6 +475,7 @@ const PurchaseTabColumns =[
         // precision:2,
         require: true,
         disabled:true,
+        width: 180,
        },
       { 
         key: "money", 

src/views/purchase/purchase-order/add/index.vue

@@ -612,15 +612,14 @@ export default {
           let { code, data } = await orderApi.getPrice({ ...this.params,action: 'insert' });
   
           if (code == 200) {
-  
-            this.params = data;
-  
+            // console.log(data,'data*----------******');
+            
+            this.params = {...data};
+            // console.log(this.params,'this.params----------------------');
           }
   
         } catch (error) {} 
       
-
-    
     },
 
     async handelImport(fileList){
@@ -631,16 +630,22 @@ export default {
 
         formData.append('file',fileList[0].raw);
 
-        this.$modal.loading("正在上传文件，请稍候...");
-
+        
         let tabList = {
           puOrderItemList: [...this.params.puOrderItemList],
           puOrderExecuteList: [...this.params.puOrderExecuteList],
         }
 
-        console.log(tabList,'tabList-------------------------');
+        const blob = new Blob([JSON.stringify(tabList)], {
+            type: 'application/json'
+        })
 
-        let {code,data} = await orderApi.orderImport(formData,tabList);
+        formData.append('tabList',blob);
+        
+        
+        this.$modal.loading("正在上传文件，请稍候...");
+
+        let {code,data} = await orderApi.orderImport(formData);
 
         if(code == 200) {
           // this.tabLoading = true;
@@ -714,12 +719,12 @@ export default {
     //   let role =  roles.find(item => item === "syfz-purchaseorder") || "procurementManager";
     //   return role;
     // },
-    getSummaries(param){
-        const { columns, data } = param;
-				const sums = [];
-        let { tabColumns, tabName } = this;
+    getSummaries({ columns, data }){
+      // const  = param;
+      const sums = [];
+      let { tabColumns, tabName } = this;
 
-				columns.forEach((column, index) => {
+      columns.forEach((column, index) => {
 
 				if (index === 0) {
 				   sums[index] = '合计';
@@ -728,7 +733,13 @@ export default {
 
 				const values = data.map(item => Number(item[column.property]));
        
-        let sumColumn = tabColumns.find(tab => tab.key === tabName).tableColumns.filter(({key,isSummary}) => isSummary && key === column.property);
+        let sumColumn = tabColumns.find(tab => tab.key === tabName).tableColumns.filter(({key,isSummary}) => {
+
+          if(isSummary && key === column.property){
+
+            return {key,isSummary}
+          }
+        });
         
         if (sumColumn.length) {
           sums[index] = values.reduce((prev, curr) => {
@@ -739,14 +750,10 @@ export default {
               return '';
             }
           }, 0);
-          sums[index];
+          sums[index] = sums[index] && sums[index].toFixed(2); // 保留2位小数，解决小数合计列
           }
-				});
-				return sums;
-
-        // return 0
-
-      
+			});
+			return sums;
     }
 
   },
@@ -754,6 +761,12 @@ export default {
     console.log("ADD CREATED", this.params);
   },
   mounted() {},
+  updated() {
+    this.$nextTick(()=>{
+     this.$refs.puOrderExecuteList && this.$refs.puOrderExecuteList[0].doLayout();
+     this.$refs.puOrderItemList && this.$refs.puOrderItemList[0].doLayout();
+    })
+  },
   destroyed() {},
 };
 </script>
@@ -956,34 +969,38 @@ export default {
             <template slot-scope="{ headerCellFixedStyle, cellFixedStyle }">
 
               <el-table 
-              :row-key="column.key === 'puOrderItemList' ? 'rowNo' :'rowno'" 
-              :data="tableData" 
-              style="width: 100%"
-              border
-              :headerCellStyle="headerCellFixedStyle"
-              :cellStyle="cellFixedStyle"
-              max-height="500px"
-              show-summary
-              :summary-method="getSummaries"
-            >
-              <template slot="empty">
-                <el-empty description="暂无数据"></el-empty>
-              </template>
-
-              
+                border
+                :ref="column.key"
+                :row-key="column.key === 'puOrderItemList' ? 'rowNo' :'rowno'" 
+                :data="tableData" 
+                style="width: 100%"
+                :headerCellStyle="headerCellFixedStyle"
+                :cellStyle="cellFixedStyle"
+                :height="tabHeight"
+              >
+                <!-- 
+                  :height="tabHeight"
+                   max-height="500px"
+                show-summary
+                :summary-method="getSummaries"
+                -->
+                <template slot="empty">
+                  <el-empty description="暂无数据"></el-empty>
+                </template>
 
                 <el-table-column
                   v-for="(cColumn, cIndex) in column.tableColumns"
                   :key="cIndex"
                   :label="cColumn.title"
                   :width="cColumn.width || 80"
+                  :prop="cColumn.key"
                 >
-                <template slot="header" slot-scope="scope">
-                  <span v-if="cColumn.require" style="color: #ff4949">*</span>
-                  <span>
-                    {{ cColumn.title }}
-                  </span>
-                </template>
+                  <template slot="header" slot-scope="scope">
+                    <span v-if="cColumn.require" style="color: #ff4949">*</span>
+                    <span>
+                      {{ cColumn.title }}
+                    </span>
+                  </template>
   
                   <template slot-scope="scope">
                     <el-form-item 
@@ -1018,7 +1035,6 @@ export default {
                         :data-mapping="cColumn.dataMapping"
                         :query-params="cColumn.queryParams"
                         @change="handleTabReferChange"
-                        size="mini"
                       >
                       </dr-popover-select>
   
@@ -1113,6 +1129,7 @@ export default {
             ref="batchImport"
             @import="handelImport"
             @temDownload="handleTemDownload"
+            :fileSize="2"
           ></BatchImport>
         </el-row>
       </el-card>
@@ -1120,3 +1137,4 @@ export default {
   </el-drawer>
 </template>
 
+

src/views/purchase/purchase-order/edit/index.vue

@@ -651,6 +651,17 @@ export default {
 
         formData.append('file',fileList[0].raw);
 
+        let tabList = {
+          puOrderItemList: [...this.params.puOrderItemList],
+          puOrderExecuteList: [...this.params.puOrderExecuteList],
+        }
+
+        const blob = new Blob([JSON.stringify(tabList)], {
+            type: 'application/json'
+        })
+
+        formData.append('tabList',blob);
+
         this.$modal.loading("正在上传文件，请稍候...");
 
         let {code,data} = await orderApi.orderImport(formData);
@@ -745,7 +756,7 @@ export default {
               return '';
             }
           }, 0);
-          sums[index];
+          sums[index] = sums[index].toFixed(2); // 保留2位小数，解决小数合计列
           }
 				});
 				return sums;
@@ -758,6 +769,12 @@ export default {
   },
   created() {},
   mounted() { },
+  updated() {
+    this.$nextTick(()=>{
+     this.$refs.puOrderExecuteList && this.$refs.puOrderExecuteList[0].doLayout();
+     this.$refs.puOrderItemList && this.$refs.puOrderItemList[0].doLayout();
+    })
+  },
   destroyed() { },
 };
 </script>
@@ -927,14 +944,16 @@ export default {
               <!-- row-key绑定列唯一值，height一定要设置否则会滚动条滚动位置不对且数据滚动全部加载完后会出现白板-->
                 <el-table 
                   border
+                  :ref="column.key"
                   :data="tableData" 
                   style="width: 100%"
                   :headerCellStyle="headerCellFixedStyle"
                   :cellStyle="cellFixedStyle"
-                  max-height="500px"
-                  show-summary
-                  :summary-method="getSummaries"
+                  :height="tabHeight"
                 >
+                <!-- max-height="500px"
+                  show-summary
+                  :summary-method="getSummaries" -->
                   <el-table-column label="序号">
                     <template slot-scope="scope">
                       {{ scope.$index + 1 }}
@@ -1064,6 +1083,7 @@ export default {
             ref="batchImport"
             @import="handelImport"
             @temDownload="handleTemDownload"
+            :fileSize="2"
           ></BatchImport>
         </el-row>
       </el-card>

src/views/purchase/purchase-order/index.vue

@@ -701,7 +701,7 @@ export default {
 
         <el-button-group style="margin-left: 10px" :key="checkedList.length + 1">
           <el-button type="primary" size="mini" @click="handleAllReturn" :disabled="judgeIsAllReturn()">整单退回</el-button>
-          <el-button type="primary" size="mini" @click="handleAllClose" :disabled="judgeIsAllClose()">整单关闭</el-button>
+          <!-- <el-button type="primary" size="mini" @click="handleAllClose" :disabled="judgeIsAllClose()">整单关闭</el-button> -->
         </el-button-group>
 
         <el-button-group style="margin:0 10px">

src/views/purchase/purchase-order/see/index.vue

@@ -184,7 +184,7 @@ export default {
               return '';
             }
           }, 0);
-          sums[index];
+          sums[index] = sums[index].toFixed(2); // 保留2位小数，解决小数合计列
           }
 				});
 				return sums;