lilei 1 سال پیش
والد
کامیت
33bf7a5e12

+ 2 - 2
src/views/salesManagement/salesQueryNew/comps/detailProductList.vue

@@ -153,7 +153,7 @@
             )
           }
           let arr= [
-                { title: '序号', field: 'no',key: "a", width: 50, align: 'center', fixed: 'left',operationColumn: false, renderBodyCell: ({ row, column, rowIndex }, h) => { return noFormat(row,row[column.field],h)} },
+                { 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] || '--'}},
                 { title: '原厂编码', field: 'productOrigCode',key: "d", width: 150, align: 'center',operationColumn: false,ellipsis: { showTitle: true },renderBodyCell: ({ row, column, rowIndex }, h) => { return row[column.field] || '--'} },
@@ -209,7 +209,7 @@
             if(column.field=='no'){
               return {
                         rowspan: 1,
-                        colspan: 17,
+                        colspan: 13,
                     };
             }else{
               return {

+ 1 - 1
src/views/salesManagement/salesQueryNew/list.vue

@@ -250,7 +250,7 @@
               size="small"
               type="link"
               class="button-warning"
-              v-if="record.billStatus=='FINISH'"
+              v-if="record.billStatus=='FINISH' && record.totalPromoGiftsAmount"
               @click="handleExpense(record)"
             >转费用报销单</a-button>
           </div>