lilei 4 år sedan
förälder
incheckning
e8b85394cf

+ 9 - 5
src/views/allocationManagement/storeTransferOut/list.vue

@@ -77,7 +77,7 @@
       :rowKey="(record) => record.id"
       :columns="columns"
       :data="loadData"
-      :scroll="{ x: 1500 }"
+      :scroll="{ x: 1500, y: tableHeight }"
       bordered>
       <!-- 店内调出单号 -->
       <template slot="storeCallOutNo" slot-scope="text, record">
@@ -87,28 +87,28 @@
       <template slot="action" slot-scope="text, record">
         <a-button
           size="small"
-          type="primary"
+          type="link"
           v-if="record.state == 'WAIT_AUDIT'"
           class="button-success"
           @click="handleExamine(record)"
           id="storeTransferOutList-examine-btn">审核</a-button>
         <a-button
           size="small"
-          type="primary"
+          type="link"
           v-if="record.state == 'WAIT_SUBMIT' || record.state == 'WAIT_AUDIT'"
           class="button-info"
           @click="handleEdit(record)"
           id="storeTransferOutList-edit-btn">编辑</a-button>
         <a-button
           size="small"
-          type="primary"
+          type="link"
           v-if="record.state == 'WAIT_OUT_WAREHOUSE'"
           class="button-warning"
           @click="handleOut(record)"
           id="storeTransferOutList-out-btn">出库</a-button>
         <a-button
           size="small"
-          type="primary"
+          type="link"
           v-if="record.state == 'WAIT_SUBMIT' || record.state == 'WAIT_AUDIT'"
           class="button-error"
           @click="handleDel(record)"
@@ -131,6 +131,7 @@ export default {
   data () {
     return {
       advanced: false, // 高级搜索 展开/关闭
+      tableHeight: 0,
       createDate: [], //  创建时间
       queryParam: { //  查询条件
         putPersonName: undefined, //  调往对象
@@ -157,6 +158,9 @@ export default {
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         this.disabled = true
+        if (this.tableHeight == 0) {
+          this.tableHeight = window.innerHeight - 220
+        }
         // 创建时间
         if (this.createDate && this.createDate.length > 0) {
           this.queryParam.beginDate = moment(this.createDate[0]).format(this.dateFormat)

+ 8 - 4
src/views/allocationManagement/warehouseAllocation/list.vue

@@ -65,7 +65,7 @@
       :rowKey="record => record.id"
       :columns="columns"
       :data="loadData"
-      :scroll="{ x: 1480 }"
+      :scroll="{ x: 1480, y: tableHeight }"
       bordered>
       <!-- 单号 -->
       <template slot="allocationWarehouseNo" slot-scope="text, record">
@@ -76,7 +76,7 @@
         <a-button
           v-if="record.stateDictValue == '待审核'"
           size="small"
-          type="primary"
+          type="link"
           class="button-warning"
           @click="handleExamine(record)"
           id="warehouseAllocationList-examine-btn">
@@ -85,7 +85,7 @@
         <a-button
           v-if="record.stateDictValue != '已完结'"
           size="small"
-          type="primary"
+          type="link"
           class="button-info"
           @click="handleEdit(record)"
           id="warehouseAllocationList-edit-btn">
@@ -94,7 +94,7 @@
         <a-button
           v-if="record.stateDictValue != '已完结'"
           size="small"
-          type="primary"
+          type="link"
           class="button-error"
           @click="handleDel(record)"
           id="warehouseAllocationList-del-btn">
@@ -118,6 +118,7 @@ export default {
   data () {
     return {
       advanced: false, // 高级搜索 展开/关闭
+      tableHeight: 0,
       createDate: undefined, //  创建时间
       warehouseList: [], // 仓库列表
       queryParam: { //  查询条件
@@ -143,6 +144,9 @@ export default {
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         this.disabled = true
+        if (this.tableHeight == 0) {
+          this.tableHeight = window.innerHeight - 220
+        }
         // 创建时间
         if (this.createDate && this.createDate.length > 0) {
           this.queryParam.beginDate = moment(this.createDate[0]).format(this.dateFormat)

+ 2 - 2
src/views/basicData/bulkPartsTypeManagement/list.vue

@@ -19,14 +19,14 @@
         <a-button
           v-if="$hasPermissions('B_basicData_bulkPartsType_edit')"
           size="small"
-          type="primary"
+          type="link"
           class="button-info"
           @click="handleEdit(record)"
           id="bulkPartsTypeList-edit-btn">编辑</a-button>
         <a-button
           v-if="$hasPermissions('B_basicData_bulkPartsType_del')"
           size="small"
-          type="primary"
+          type="link"
           class="button-error"
           @click="handleDel(record)"
           id="bulkPartsTypeList-del-btn"

+ 2 - 2
src/views/basicData/customerTypeManagement/list.vue

@@ -35,14 +35,14 @@
         <a-button
           size="small"
           v-if="$hasPermissions('B_basicData_customerType_edit')"
-          type="primary"
+          type="link"
           class="button-info"
           @click="handleEdit(record)"
           id="customerTypeList-edit-btn">编辑</a-button>
         <a-button
           size="small"
           v-if="$hasPermissions('B_basicData_customerType_del')"
-          type="primary"
+          type="link"
           class="button-error"
           @click="handleDel(record)"
           id="customerTypeList-del-btn">删除</a-button>

+ 3 - 3
src/views/basicData/expenseType/list.vue

@@ -20,7 +20,7 @@
       <template slot="action" slot-scope="text, record">
         <a-button
           v-if="record.typeLevel<3 && $hasPermissions('B_basicData_expenseType_add')"
-          type="primary"
+          type="link"
           class="button-success"
           size="small"
           icon="plus"
@@ -28,7 +28,7 @@
           @click="handleAdd(record)">新增子级</a-button>
         <a-button
           v-if="record.pid != 0 && $hasPermissions('B_basicData_expenseType_edit')"
-          type="primary"
+          type="link"
           class="button-info"
           size="small"
           icon="edit"
@@ -36,7 +36,7 @@
           @click="handleEdit(record)">编辑</a-button>
         <a-button
           v-if="record.pid != 0 && $hasPermissions('B_basicData_expenseType_del')"
-          type="primary"
+          type="link"
           class="button-error"
           size="small"
           icon="delete"

+ 2 - 2
src/views/basicData/storeTransferOutTypeManagement/list.vue

@@ -24,14 +24,14 @@
         <a-button
           v-if="$hasPermissions('B_basicData_storeTransferOutType_edit')"
           size="small"
-          type="primary"
+          type="link"
           class="button-info"
           @click="handleEdit(record)"
           id="storeTransferOutTypeList-edit-btn">编辑</a-button>
         <a-button
           v-if="$hasPermissions('B_basicData_storeTransferOutType_del')"
           size="small"
-          type="primary"
+          type="link"
           class="button-error"
           @click="handleDel(record)"
           id="storeTransferOutTypeList-del-btn">删除</a-button>

+ 11 - 6
src/views/bulkManagement/bulkWarehousingOrder/list.vue

@@ -102,29 +102,34 @@
       <template slot="sparePartsPurchaseNo" slot-scope="text, record">
         <span style="color: #ed1c24;cursor: pointer;" @click="handleDetail(record)">{{ record.sparePartsPurchaseNo }}</span>
       </template>
+      <!-- 财务状态 -->
+      <template slot="settleState" slot-scope="text, record">
+        <a-badge :color="text=='FINISH'?'#87d068':'gold'" :text="record.settleStateDictValue" />
+      </template>
       <!-- 操作 -->
       <template slot="action" slot-scope="text, record">
         <a-button
           size="small"
-          type="primary"
+          type="link"
           v-if="record.state != 'FINISH'"
           @click="handleEdit(record)"
           class="button-info"
           id="bulkWarehousingOrderList-edit-btn">编辑</a-button>
         <a-button
           size="small"
-          type="primary"
-          v-if="record.state == 'WAIT_PUT_WAREHOUSE'"
+          type="link"
+          v-else-if="record.state == 'WAIT_PUT_WAREHOUSE'"
           @click="handleWarehouse(record)"
           class="button-warning"
           id="bulkWarehousingOrderList-warehouse-btn">入库</a-button>
         <a-button
           size="small"
-          type="primary"
-          v-if="record.state != 'FINISH'"
+          type="link"
+          v-else-if="record.state != 'FINISH'"
           @click="handleDel(record)"
           class="button-error"
           id="bulkWarehousingOrderList-del-btn">删除</a-button>
+        <span v-else>--</span>
       </template>
     </s-table>
     <!-- 选择基本信息弹框 -->
@@ -167,7 +172,7 @@ export default {
         { title: '总数量', dataIndex: 'productTotalQty', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '总金额', dataIndex: 'productTotalCost', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '业务状态', dataIndex: 'stateDictValue', width: 110, align: 'center' },
-        { title: '财务状态', dataIndex: 'settleStateDictValue', width: 110, align: 'center' },
+        { title: '财务状态', dataIndex: 'settleState', scopedSlots: { customRender: 'settleState' }, width: 110, align: 'center' },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: 200, align: 'center', fixed: 'right' }
       ],
       // 加载数据方法 必须为 Promise 对象

+ 3 - 3
src/views/customerManagement/customerInfo/list.vue

@@ -113,21 +113,21 @@
         <a-button
           size="small"
           v-if="$hasPermissions('B_customer_customerInfo_edit')"
-          type="primary"
+          type="link"
           class="button-info"
           @click="handleEdit(record)"
           id="customerManagementList-edit-btn">编辑</a-button>
         <a-button
           size="small"
           v-if="$hasPermissions('B_customer_customerInfo_detail')"
-          type="primary"
+          type="link"
           class="button-success"
           @click="handleDetail(record)"
           id="customerManagementList-detail-btn">详情</a-button>
         <a-button
           size="small"
           v-if="$hasPermissions('B_customer_customerInfo_del') && record.satelliteFlag!=1"
-          type="primary"
+          type="link"
           class="button-error"
           @click="handleDel(record)"
           id="customerManagementList-del-btn">删除</a-button>

+ 3 - 3
src/views/financialManagement/expenseManagement/list.vue

@@ -90,21 +90,21 @@
       <template slot="action" slot-scope="text, record">
         <a-button
           size="small"
-          type="primary"
+          type="link"
           v-if="record.state != 'AUDIT_PASS'"
           class="button-primary"
           @click="handleEdit(record)"
           id="expenseManagement-edit-btn">编辑</a-button>
         <a-button
           size="small"
-          type="primary"
+          type="link"
           v-if="record.state != 'AUDIT_PASS'"
           class="button-error"
           @click="handleDel(record)"
           id="expenseManagement-del-btn">删除</a-button>
         <a-button
           size="small"
-          type="primary"
+          type="link"
           v-if="record.state == 'AUDIT_PASS'"
           class="button-success"
           @click="handleDetail(record)"

+ 2 - 2
src/views/financialManagement/financialCollection/list.vue

@@ -88,14 +88,14 @@
       <template slot="action" slot-scope="text, record">
         <a-button
           size="small"
-          type="primary"
+          type="link"
           class="button-info"
           v-if="record.settleState == 'FINISH'"
           @click="handleVoucher(record)"
           id="financialCollectionList-voucher-btn">凭证</a-button>
         <a-button
           size="small"
-          type="primary"
+          type="link"
           :loading="loading"
           class="button-warning"
           v-else

+ 2 - 2
src/views/financialManagement/financialPayment/list.vue

@@ -87,14 +87,14 @@
       <template slot="action" slot-scope="text, record">
         <a-button
           size="small"
-          type="primary"
+          type="link"
           class="button-info"
           v-if="record.settleState == 'FINISH'"
           @click="handleVoucher(record)"
           id="finacialPay-voucher-btn">凭证</a-button>
         <a-button
           size="small"
-          type="primary"
+          type="link"
           class="button-warning"
           :loading="loading"
           v-else

+ 2 - 2
src/views/inventoryManagement/inventoryQuery/list.vue

@@ -90,8 +90,8 @@
       </template>
       <!-- 操作 -->
       <template slot="action" slot-scope="text, record">
-        <a-button size="small" type="primary" class="button-success" @click="goDetail(record)" id="inventoryQueryList-detail-btn">库存详情</a-button>
-        <a-button size="small" type="primary" class="button-warning" @click="goWarehouseDetail(record)" id="inventoryQueryList-warehouseDetail-btn">出入库明细</a-button>
+        <a-button size="small" type="link" class="button-success" @click="goDetail(record)" id="inventoryQueryList-detail-btn">库存详情</a-button>
+        <a-button size="small" type="link" class="button-warning" @click="goWarehouseDetail(record)" id="inventoryQueryList-warehouseDetail-btn">出入库明细</a-button>
       </template>
     </s-table>
     <!-- 库存详情 -->

+ 3 - 3
src/views/inventoryManagement/warehouse/list.vue

@@ -36,21 +36,21 @@
         <a-button
           size="small"
           v-if="$hasPermissions('M_inventory_warehouse_storingLocation')"
-          type="primary"
+          type="link"
           class="button-warning"
           @click="goStoringLocation(record)"
           id="warehouseList-storingLocation-btn">仓位管理</a-button>
         <a-button
           size="small"
           v-if="$hasPermissions('B_inventory_warehouse_edit') && record.sysFlag==0"
-          type="primary"
+          type="link"
           class="button-info"
           @click="handleEdit(record)"
           id="warehouseList-edit-btn">编辑</a-button>
         <a-button
           size="small"
           v-if="$hasPermissions('B_inventory_warehouse_del') && record.sysFlag==0"
-          type="primary"
+          type="link"
           class="button-error"
           @click="handleDel(record)"
           id="warehouseList-del-btn">删除</a-button>

+ 1 - 1
src/views/productManagement/productBrand/list.vue

@@ -52,7 +52,7 @@
         <a-button
           size="small"
           v-if="$hasPermissions('B_product_dealerProductBrand_edit')&&record.sysFlag == 0"
-          type="primary"
+          type="link"
           class="button-info"
           @click="handleEdit(record)"
           id="productBrandList-edit-btn">编辑</a-button>

+ 3 - 3
src/views/productManagement/productCategory/list.vue

@@ -20,7 +20,7 @@
       <template slot="action" slot-scope="text, record">
         <a-button
           v-if="record.productTypeLevel<3 && $hasPermissions('B_product_dealerProductType_add')&&record.sysFlag == 0"
-          type="primary"
+          type="link"
           class="button-success"
           size="small"
           icon="plus"
@@ -28,7 +28,7 @@
           @click="handleAdd(record)">新增子级</a-button>
         <a-button
           v-if="record.pid != 0 && $hasPermissions('B_product_dealerProductType_edit')&&record.sysFlag == 0"
-          type="primary"
+          type="link"
           class="button-info"
           size="small"
           icon="edit"
@@ -36,7 +36,7 @@
           @click="handleEdit(record)">编辑</a-button>
         <a-button
           v-if="record.pid != 0 && $hasPermissions('B_product_dealerProductType_del')&&record.sysFlag == 0"
-          type="primary"
+          type="link"
           class="button-error"
           size="small"
           icon="delete"

+ 2 - 2
src/views/productManagement/productInfo/list.vue

@@ -107,14 +107,14 @@
         <a-button
           size="small"
           v-if="$hasPermissions('B_product_dealerProduct_edit')"
-          type="primary"
+          type="link"
           class="button-info"
           @click="handleEdit(record)"
           id="productInfoList-edit-btn">编辑</a-button>
         <a-button
           v-if="$hasPermissions('B_product_dealerProduct_detail')"
           size="small"
-          type="primary"
+          type="link"
           class="button-success"
           @click="handleDetail(record)"
           id="productInfoList-detail-btn">详情</a-button>

+ 1 - 2
src/views/productManagement/productInfoJg/list.vue

@@ -88,8 +88,7 @@
       </template>
       <!-- 状态 -->
       <template slot="onlineFalgDictValue" slot-scope="text, record">
-        <span v-if="record.onlineFalgDictValue == '下架'" style="color: #999;">{{ record.onlineFalgDictValue }} </span>
-        <span v-else style="color: #00aa00;">{{ record.onlineFalgDictValue }}</span>
+        <a-badge :color="record.onlineFalgDictValue == '下架'?'#ccc':'green'" :text="record.onlineFalgDictValue" />
       </template>
     </s-table>
   </a-card>

+ 5 - 1
src/views/salesManagement/giftRecord/list.vue

@@ -66,7 +66,7 @@
       :rowKey="(record) => record.id"
       :columns="columns"
       :data="loadData"
-      :scroll="{ x: 1380 }"
+      :scroll="{ x: 1380, y: tableHeight }"
       bordered>
     </s-table>
   </a-card>
@@ -81,6 +81,7 @@ export default {
   components: { STable, VSelect },
   data () {
     return {
+      tableHeight: 0,
       advanced: false, // 高级搜索 展开/关闭
       queryParam: { //  查询条件
         productCode: '', //  产品编码
@@ -106,6 +107,9 @@ export default {
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         this.disabled = true
+        if (this.tableHeight == 0) {
+          this.tableHeight = window.innerHeight - 220
+        }
         // 创建时间
         if (this.time && this.time.length > 0) {
           this.queryParam.beginDate = moment(this.time[0]).format(this.dateFormat)

+ 2 - 2
src/views/salesManagement/outboundOrder/list.vue

@@ -98,14 +98,14 @@
       <template slot="action" slot-scope="text, record">
         <a-button
           size="small"
-          type="primary"
+          type="link"
           v-if="record.state=='WAIT'"
           class="button-warning"
           @click="handleOutbound(record)"
           id="outboundOrderList-out-btn">出库</a-button>
         <a-button
           size="small"
-          type="primary"
+          type="link"
           class="button-success"
           @click="handleDetail(record)"
           id="outboundOrderList-detail-btn">详情</a-button>

+ 9 - 5
src/views/salesManagement/salesQuery/list.vue

@@ -106,7 +106,7 @@
       :rowKey="(record) => record.id"
       :columns="columns"
       :data="loadData"
-      :scroll="{ x: 2050, y:300 }"
+      :scroll="{ x: 2050, y:tableHeight }"
       bordered>
       <!-- 销售单号 -->
       <template slot="salesBillNo" slot-scope="text, record">
@@ -124,28 +124,28 @@
       <template slot="action" slot-scope="text, record">
         <a-button
           size="small"
-          type="primary"
+          type="link"
           class="button-warning"
           v-if="record.billStatus == 'WAIT_AUDIT'"
           @click="handleEexamine(record)"
           id="salesManagementList-eexamine-btn">审核</a-button>
         <a-button
           size="small"
-          type="primary"
+          type="link"
           v-if="record.billStatus == 'WAIT_OUT_STOCK'"
           class="button-primary"
           @click="handleSend(record)"
           id="salesManagementList-send-btn">出库</a-button>
         <a-button
           size="small"
-          type="primary"
+          type="link"
           class="button-info"
           v-if="record.billStatus !== 'CANCEL' && record.billStatus !== 'FINISH' && record.billStatus != 'WAIT_OUT_STOCK'"
           @click="handleEdit(record)"
           id="salesManagementList-edit-btn">编辑</a-button>
         <a-button
           size="small"
-          type="primary"
+          type="link"
           class="button-error"
           v-if="record.billStatus !== 'FINISH' && record.financialStatus !== 'FINISH'"
           @click="handleDel(record)"
@@ -169,6 +169,7 @@ export default {
   components: { STable, VSelect, chooseCustomModal },
   data () {
     return {
+      tableHeight: 0,
       advanced: false, // 高级搜索 展开/关闭
       disabled: false, //  查询、重置按钮是否可操作
       dateFormat: 'YYYY-MM-DD',
@@ -213,6 +214,9 @@ export default {
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         this.disabled = true
+        if (this.tableHeight == 0) {
+          this.tableHeight = window.innerHeight - 320
+        }
         // 创建时间
         if (this.time && this.time.length > 0) {
           this.queryParam.beginDate = moment(this.time[0]).format(this.dateFormat)

+ 5 - 1
src/views/salesManagement/urgentItemsOffset/list.vue

@@ -72,7 +72,7 @@
       :rowKey="(record) => record.id"
       :columns="columns"
       :data="loadData"
-      :scroll="{ x: 1280, y: 300 }"
+      :scroll="{ x: 1280, y: tableHeight }"
       bordered>
       <!-- 单号 -->
       <template slot="urgentBillNo" slot-scope="text, record">
@@ -91,6 +91,7 @@ export default {
   components: { STable, VSelect },
   data () {
     return {
+      tableHeight: 0,
       advanced: false, // 高级搜索 展开/关闭
       queryParam: { //  查询条件
         buyerName: undefined, //  客户名称
@@ -116,6 +117,9 @@ export default {
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         this.disabled = true
+        if (this.tableHeight == 0) {
+          this.tableHeight = window.innerHeight - 220
+        }
         // 创建时间
         if (this.time && this.time.length > 0) {
           this.queryParam.beginDate = moment(this.time[0]).format(this.dateFormat)

+ 2 - 2
src/views/supplierManagement/supplierInfo/list.vue

@@ -46,14 +46,14 @@
         <a-button
           v-if="$hasPermissions('B_supplier_supplierInfo_edit')"
           size="small"
-          type="primary"
+          type="link"
           class="button-info"
           @click="handleEdit(record)"
           id="supplierInfoList-edit-btn">编辑</a-button>
       </template>
       <!-- 状态 -->
       <template slot="status" slot-scope="text, record">
-        <span :style="{color:(record.enabledFlag==1?'#00aa00':'#999')}">{{ record.enabledFlagDictValue }}</span>
+        <a-badge :color="record.enabledFlag == 1?'green':'#ccc'" :text="record.enabledFlagDictValue" />
       </template>
     </s-table>
     <!-- 供应商 -->