lilei 1 年之前
父節點
當前提交
ce85374e56

+ 12 - 11
src/views/salesManagement/waitDispatchNew/detailProductList.vue

@@ -26,7 +26,6 @@
                 row-key-field-name="id"
                 :cell-style-option="cellStyleOption"
                 :cell-span-option="cellSpanOption"
-                :column-width-resize-option="columnWidthResizeOption"
                 :checkbox-option="checkboxOption"
               />
           <div v-show="showEmpty" class="empty-data"><a-empty description="暂无产品" :image="simpleImage"/></div>
@@ -174,19 +173,21 @@
         }
 
         let arr= [
-              { title: "", field: "", key: "acheck", type: "checkbox", align: "center" },
-              { title: '序号', field: 'no',key: "a", width: 50, align: 'center', operationColumn: false },
-              { title: '产品编码', field: 'productCode',key: "b", width: 100, align: 'center',operationColumn: false,renderBodyCell: ({ row, column, rowIndex }, h) => { return codeFormat(row,row[column.field],h)} },
-              { title: '产品名称', field: 'productName',key: "c", width: 200, align: 'center',operationColumn: false , ellipsis: { showTitle: true },renderBodyCell: ({ row, column, rowIndex }, h) => { return row[column.field] || '--'}},
-              { title: '出库仓库', field: 'warehouseName',key: "e", width: 100, align: 'center',operationColumn: false,renderBodyCell: ({ row, column, rowIndex }, h) => { return row[column.field] || '--'}},
-              { title: '待下推数量', field: 'surplusQty', width: 80,key: "o", align: 'center',operationColumn: false, renderBodyCell: ({ row, column, rowIndex }, h) => { return numsFormat(row[column.field])} },
-              { title: '本次下推数', field: 'qty', width: 80,key: "r", align: 'center',operationColumn: false, renderBodyCell: ({ row, column, rowIndex }, h) => { return inputFormat(row,row[column.field],h)} },
-              { title: '单位', field: 'productOrigUnit',key: "i", width: 80, align: 'center',operationColumn: false, renderBodyCell: ({ row, column, rowIndex }, h) => { return row[column.field] || '--'}},
-              { title: '操作', field: 'action', width: 80,key: "s", align: 'center',fixed: 'right',operationColumn: false, renderBodyCell: ({ row, column, rowIndex }, h) => { return actionFormat(row,row[column.field],h)} }
+              { title: "", field: "", key: "acheck", width: 60, type: "checkbox", align: "center" },
+              { title: '序号', field: 'no',key: "a", width: 60, align: 'center', operationColumn: false },
+              { title: '产品编码', field: 'productCode',key: "b", align: 'center',operationColumn: false,renderBodyCell: ({ row, column, rowIndex }, h) => { return codeFormat(row,row[column.field],h)} },
+              { title: '出库仓库', field: 'warehouseName',key: "e",width: 150, align: 'center',operationColumn: false,renderBodyCell: ({ row, column, rowIndex }, h) => { return row[column.field] || '--'}},
+              { title: '待下推数量', field: 'surplusQty', key: "o",width: 150, align: 'center',operationColumn: false, renderBodyCell: ({ row, column, rowIndex }, h) => { return numsFormat(row[column.field])} },
+              { title: '本次下推数', field: 'qty', key: "r",width: 150, align: 'center',operationColumn: false, renderBodyCell: ({ row, column, rowIndex }, h) => { return inputFormat(row,row[column.field],h)} },
+              { title: '单位', field: 'productOrigUnit',width: 100,key: "i", align: 'center',operationColumn: false, renderBodyCell: ({ row, column, rowIndex }, h) => { return row[column.field] || '--'}},
+              { title: '操作', field: 'action', width: 100, key: "s", align: 'center',fixed: 'right',operationColumn: false, renderBodyCell: ({ row, column, rowIndex }, h) => { return actionFormat(row,row[column.field],h)} }
           ]
         
         if(this.detailData && this.detailData.promoFlag==1){
-          arr.splice(2,0,{ title: '活动规则', field: 'prompName',key: "m", width: 100, align: 'center',operationColumn: false },)
+          arr.splice(2,0,{ title: '活动规则', field: 'prompName',key: "m", align: 'center',operationColumn: false },)
+          arr.splice(3,0,{ title: '产品名称', field: 'productName',key: "c", align: 'center',operationColumn: false , ellipsis: { showTitle: true },renderBodyCell: ({ row, column, rowIndex }, h) => { return row[column.field] || '--'}})
+        }else{
+          arr.splice(2,0,{ title: '产品名称', field: 'productName',key: "c", align: 'center',operationColumn: false , ellipsis: { showTitle: true },renderBodyCell: ({ row, column, rowIndex }, h) => { return row[column.field] || '--'}})
         }
 
         return arr

+ 1 - 1
src/views/salesManagement/waitDispatchNew/queryPart.vue

@@ -305,7 +305,7 @@ export default {
       }
        
       let arr= [
-            { title: "", field: "", key: "acheck", type: "checkbox", align: "center" },
+            { title: "", field: "", key: "acheck", width: 50, type: "checkbox", align: "center" },
             { title: '序号', field: 'no',key: "a", width: 50, align: 'center', operationColumn: false,renderBodyCell: ({ row, column, rowIndex }, h) => { return noFormat(row,row[column.field],h)} },
             { title: '产品编码', field: 'productCode',key: "b", width: 150, align: 'center',operationColumn: false,renderBodyCell: ({ row, column, rowIndex }, h) => { return codeFormat(row,row[column.field],h)} },
             { title: '产品名称', field: 'productName',key: "c", width: 250, align: 'center',operationColumn: false , ellipsis: { showTitle: true },renderBodyCell: ({ row, column, rowIndex }, h) => { return row[column.field] || '--'}},