lilei 2 年之前
父节点
当前提交
07f6efd2aa

+ 4 - 1
src/components/index.less

@@ -18,6 +18,7 @@
     overflow: hidden;
 }
 
+
 /* 扩展ant design pro按钮组件颜色 */
 .ant-btn-primary.button-primary,.ant-btn-primary.button-info,.ant-btn-primary.button-warning,.ant-btn-primary.button-geekblue,.ant-btn-primary.button-purple {
   background-color: #39f;
@@ -34,7 +35,9 @@
     border-color: #3d80bf;
   }
 }
- 
+.ant-btn-primary.button-primary[disabled],.ant-btn-primary.button-info[disabled],.ant-btn-primary.button-warning[disabled],.ant-btn-primary.button-geekblue[disabled],.ant-btn-primary.button-purple[disabled]{
+   color: rgba(255, 255, 255, 0.5);
+ }
 .ant-btn-primary.button-success {
   background-color: #11b116;
   border-color: #00af54;

+ 1 - 1
src/views/allocationManagement/matchSendOutOrder/list.vue

@@ -110,7 +110,7 @@ import dealerSubareaScopeList from '@/views/common/dealerSubareaScopeList.vue'
 import { allocateBillList, allocateBillCheck } from '@/api/allocateBill'
 import AllocateType from '@/views/common/allocateType.js'
 export default {
-  name: 'TransferOutList',
+  name: 'MatchSendOutOrderAllocationList',
   mixins: [commonMixin],
   components: { STable, VSelect, rangeDate, AllocateType, dealerSubareaScopeList },
   data () {

+ 6 - 6
src/views/allocationManagement/transfersPrint/list.vue

@@ -134,7 +134,7 @@ import { allocateBillList, allocateBillDetailPrint } from '@/api/allocateBill'
 import AllocateType from '@/views/common/allocateType.js'
 import { printFun } from '@/libs/JGPrint.js'
 export default {
-  name: 'TransferOutList',
+  name: 'TransfersPrintList',
   mixins: [commonMixin],
   components: { STable, VSelect, rangeDate, AllocateType, dealerSubareaScopeList, printModal, recordModal },
   data () {
@@ -189,17 +189,17 @@ export default {
   computed: {
     columns () {
       const arr = [
-        { title: '序号', dataIndex: 'no', width: '3.5%', align: 'center' },
+        { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
         { title: '创建时间', dataIndex: 'createDate', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '调拨单号', scopedSlots: { customRender: 'allocateNo' }, align: 'center', width: '13.5%' },
-        { title: '调往对象', dataIndex: 'targetName', width: '8%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '调拨单号', scopedSlots: { customRender: 'allocateNo' }, align: 'center', width: '10%' },
+        { title: '调往对象', dataIndex: 'targetName', width: '10%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '发货编号', dataIndex: 'sendNo', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '收货客户名称', dataIndex: 'receiverName', width: '8%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '收货客户名称', dataIndex: 'receiverName', width: '10%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '总数量', dataIndex: 'totalQty', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '调拨类型', dataIndex: 'allocateTypeName', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '业务状态', dataIndex: 'stateDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '打印状态', dataIndex: 'printStateDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '打印次数', dataIndex: 'printCount', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '打印次数', dataIndex: 'printCount', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '8%', align: 'center' }
       ]
       return arr

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

@@ -144,7 +144,7 @@ import dealerSubareaScopeList from '@/views/common/dealerSubareaScopeList.vue'
 import Area from '@/views/common/area.js'
 import { dispatchlList, dispatchCheck } from '@/api/dispatch'
 export default {
-  name: 'PushOrderManagementList',
+  name: 'MatchSendOutOrderList',
   mixins: [commonMixin],
   components: { STable, VSelect, dealerSubareaScopeList, rangeDate, subarea, Area },
   data () {

+ 1 - 2
src/views/salesManagement/receiptPrint/list.vue

@@ -166,7 +166,6 @@
 
 <script>
 import { commonMixin } from '@/utils/mixin'
-import moment from 'moment'
 import rangeDate from '@/views/common/rangeDate.vue'
 import { STable, VSelect } from '@/components'
 import subarea from '@/views/common/subarea.js'
@@ -177,7 +176,7 @@ import recordModal from './recordModal.vue'
 import printModel from './printModel.vue'
 import { settleReceiptList } from '@/api/settleReceipt'
 export default {
-  name: 'PushOrderManagementList',
+  name: 'ReceiptPrintList',
   mixins: [commonMixin],
   components: { STable, VSelect, dealerSubareaScopeList, rangeDate, subarea, commonModal, recordModal, Area, printModel },
   data () {

+ 0 - 1
src/views/salesManagement/salesCollection/list.vue

@@ -201,7 +201,6 @@
 
 <script>
 import { commonMixin } from '@/utils/mixin'
-import moment from 'moment'
 import { STable, VSelect } from '@/components'
 import rangeDate from '@/views/common/rangeDate.vue'
 import subarea from '@/views/common/subarea.js'

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

@@ -119,7 +119,7 @@ import detailModal from './detailModal.vue'
 import sendGoodModal from '../outboundOrder/sendGoodModal.vue'
 import { sendBillQueryPageList } from '@/api/sendBill'
 export default {
-  name: 'SendOutOrder',
+  name: 'SendOutOrderList',
   mixins: [commonMixin],
   components: { STable, VSelect, rangeDate, detailModal, sendGoodModal },
   data () {

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

@@ -169,7 +169,7 @@ import recordModal from './recordModal.vue'
 import { dispatchlList, dispatchDetailPrint } from '@/api/dispatch'
 import { printFun } from '@/libs/JGPrint.js'
 export default {
-  name: 'PushOrderManagementList',
+  name: 'StockPrintList',
   mixins: [commonMixin],
   components: { STable, VSelect, dealerSubareaScopeList, rangeDate, subarea, sendTypeModal, recordModal, Area },
   data () {