瀏覽代碼

bug 修复

lilei 3 年之前
父節點
當前提交
414bcfbbe1

+ 8 - 2
src/views/financialManagement/inventoryCheckAudit/list.vue

@@ -45,6 +45,10 @@
         <template slot="totalLossQty" slot-scope="text, record">
           <span>{{ (record.totalLossQty || record.totalLossQty==0) ? Math.abs(record.totalLossQty) : '--' }}</span>
         </template>
+        <!-- 审核 -->
+        <template slot="audit" slot-scope="text, record">
+          <stateIcon :title="record.stateDictValue" :state="record.state == 'FINISH'?'1':'2'"></stateIcon>
+        </template>
         <!-- 操作 -->
         <template slot="action" slot-scope="text, record">
           <a-button
@@ -74,11 +78,12 @@
 import { commonMixin } from '@/utils/mixin'
 import { STable, VSelect } from '@/components'
 import rangeDate from '@/views/common/rangeDate.vue'
+import stateIcon from '@/views/common/stateIcon'
 import inventoryCheckingDetailModal from '@/views/inventoryManagement/inventoryChecking/detailModal.vue'
 import { checkWarehouseAuditList, checkWarehouseFinanceAudit, checkWarehouseReInventory } from '@/api/checkWarehouse'
 export default {
   name: 'InventoryCheckingList',
-  components: { STable, VSelect, rangeDate, inventoryCheckingDetailModal },
+  components: { STable, VSelect, rangeDate, inventoryCheckingDetailModal, stateIcon },
   mixins: [commonMixin],
   data () {
     return {
@@ -102,7 +107,8 @@ export default {
         { title: '盘亏数量', scopedSlots: { customRender: 'totalLossQty' }, width: '7%', align: 'center' },
         { title: '盘点完成时间', dataIndex: 'checkTime', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '财务审核时间', dataIndex: 'financeAuditTime', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '财务审核状态', dataIndex: 'stateDictValue', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
+        // { title: '财务审核状态', dataIndex: 'stateDictValue', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '审核', scopedSlots: { customRender: 'audit' }, width: '3%', align: 'center' },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '10%', align: 'center' }
       ],
       // 加载数据方法 必须为 Promise 对象

+ 9 - 2
src/views/financialManagement/warehousingAudit/list.vue

@@ -70,6 +70,11 @@
           <span v-if="record.receivingBillNo" :class="$hasPermissions('M_warehousingAudit_detail')?'active':'common'" @click="handleDetail(record)">{{ record.receivingBillNo }}</span>
           <span v-else>--</span>
         </template>
+        <!-- 审核 -->
+        <template slot="audit" slot-scope="text, record">
+          <stateIcon :title="record.auditStateDictValue" v-if="record.auditState!='PUT_WAREHOUSE_AUDIT_REJECT'" :state="record.auditState == 'FINISH'?'1':'2'"></stateIcon>
+          <stateIcon :title="record.auditStateDictValue" v-else :state="0"></stateIcon>
+        </template>
         <!-- 操作 -->
         <template slot="action" slot-scope="text, record">
           <a-button
@@ -99,10 +104,11 @@ import moment from 'moment'
 import getDate from '@/libs/getDate'
 import { STable, VSelect } from '@/components'
 import rangeDate from '@/views/common/rangeDate.vue'
+import stateIcon from '@/views/common/stateIcon'
 import { receivingAuditList, receivingStockInAudit, receivingCount } from '@/api/receiving'
 export default {
   name: 'WarehousingAuditList',
-  components: { STable, VSelect, rangeDate },
+  components: { STable, VSelect, rangeDate, stateIcon },
   mixins: [commonMixin],
   data () {
     return {
@@ -132,7 +138,8 @@ export default {
         { title: '入库总成本', dataIndex: 'totalPutAmount', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '签收入库时间', dataIndex: 'stockPutTime', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '财务入库审核时间', dataIndex: 'auditTime', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '财务审核状态', dataIndex: 'auditStateDictValue', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '审核', scopedSlots: { customRender: 'audit' }, width: '3%', align: 'center' },
+        // { title: '财务审核状态', dataIndex: 'auditStateDictValue', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '10%', align: 'center' }
       ],
       // 加载数据方法 必须为 Promise 对象

+ 25 - 21
src/views/inventoryManagement/inventoryChecking/selfDisk.vue

@@ -105,23 +105,15 @@
           </template>
           <!-- 操作 -->
           <template slot="action" slot-scope="text, record">
-            <a-button size="small" type="primary" class="button-primary" @click="handleAdd(record)" id="inventoryCheckSelfDiskList-add-btn">添加</a-button>
+            <a-button size="small" type="link" class="button-primary" @click="handleAdd(record)" id="inventoryCheckSelfDiskList-add-btn">添加</a-button>
           </template>
         </s-table>
       </a-card>
       <a-card size="small" :bordered="false" class="inventoryCheckSelfDiskList-cont">
-        <!-- 总计 -->
-        <a-alert type="info" style="margin-bottom:10px">
-          <div slot="message">
-            总款数: <strong>{{ productTotal&&(productTotal.totalCategory || productTotal.totalCategory==0) ? productTotal.totalCategory : '--' }}</strong> ,
-            总数量: <strong>{{ productTotal&&(productTotal.stockQty || productTotal.stockQty==0) ? productTotal.stockQty : '--' }}</strong> ,
-            总成本: <strong>{{ productTotal&&(productTotal.checkCost || productTotal.checkCost==0) ? '¥'+productTotal.checkCost : '--' }}</strong>
-          </div>
-        </a-alert>
         <!-- 筛选条件 -->
         <div class="table-page-search-wrapper">
           <a-row>
-            <a-col :md="20" :sm="24">
+            <a-col :md="24" :sm="24">
               <a-form layout="inline" @keyup.enter.native="$refs.chooseTable.refresh(true)">
                 <a-row :gutter="15">
                   <a-col :md="6" :sm="24">
@@ -164,18 +156,30 @@
                 </a-row>
               </a-form>
             </a-col>
-            <a-col :md="4" :sm="24" style="text-align: right;">
-              <a-button size="small" type="primary" class="button-error" @click.stop="handleDel('', 'batch')" id="chainTransferOutEdit-del-all-btn">批量删除</a-button>
-              <a-button
-                size="small"
-                type="primary"
-                class="button-error"
-                style="margin-left: 5px"
-                @click.stop="handleDel('', 'all')"
-                id="chainTransferOutEdit-del-all-btn">整单删除</a-button>
-            </a-col>
           </a-row>
         </div>
+        <a-row>
+          <a-col :md="20" :sm="16">
+            <a-button size="small" type="primary" class="button-error" @click.stop="handleDel('', 'batch')" id="chainTransferOutEdit-del-all-btn">批量删除</a-button>
+            <!-- 总计 -->
+            <a-alert type="info" style="margin-bottom:10px;display: inline-block;">
+              <div slot="message">
+                总款数: <strong>{{ productTotal&&(productTotal.totalCategory || productTotal.totalCategory==0) ? productTotal.totalCategory : '--' }}</strong> ,
+                总数量: <strong>{{ productTotal&&(productTotal.stockQty || productTotal.stockQty==0) ? productTotal.stockQty : '--' }}</strong> ,
+                总成本: <strong>{{ productTotal&&(productTotal.checkCost || productTotal.checkCost==0) ? '¥'+productTotal.checkCost : '--' }}</strong>
+              </div>
+            </a-alert>
+          </a-col>
+          <a-col :md="4" :sm="8" style="text-align: right;">
+            <a-button
+              size="small"
+              type="primary"
+              class="button-error"
+              style="margin-left: 5px"
+              @click.stop="handleDel('', 'all')"
+              id="chainTransferOutEdit-del-all-btn">整单删除</a-button>
+          </a-col>
+        </a-row>
         <!-- 列表 -->
         <s-table
           class="sTable"
@@ -196,7 +200,7 @@
           </template>
           <!-- 操作 -->
           <template slot="action" slot-scope="text, record">
-            <a-button size="small" type="primary" class="button-error" @click="handleDel(record)" id="inventoryCheckSelfDiskList-del-btn">删除</a-button>
+            <a-button size="small" type="link" class="button-error" @click="handleDel(record)" id="inventoryCheckSelfDiskList-del-btn">删除</a-button>
           </template>
         </s-table>
       </a-card>

+ 11 - 4
src/views/outboundOrderManagement/outboundOrder/list.vue

@@ -68,6 +68,10 @@
         :scroll="{ y: tableHeight }"
         :defaultLoadData="false"
         bordered>
+        <!-- 状态 -->
+        <template slot="state" slot-scope="text, record">
+          <stateIcon :title="record.stateDictValue" :state="record.state == 'FINISH'?'1':'2'"></stateIcon>
+        </template>
         <!-- 操作 -->
         <template slot="action" slot-scope="text, record">
           <a-button
@@ -95,7 +99,7 @@
       :footer="null"
       :maskClosable="false"
       :bodyStyle="{padding:'12px'}"
-      title="详情"
+      :title="detailTitle"
       v-model="openModal"
       v-if="openModal"
       @cancle="cancleModal"
@@ -126,11 +130,12 @@ import storeTransferOutDetailModal from '@/views/allocationManagement/storeTrans
 import chainTransferOutDetailModal from '@/views/allocationManagement/chainTransferOut/detail.vue'
 import warehouseAllocationDetailModal from '@/views/allocationManagement/warehouseAllocation/detail.vue'
 import replenishmentDetailModal from '@/views/numsGoodsShelves/replenishmentManagement/replenishmentDetail.vue'
+import stateIcon from '@/views/common/stateIcon'
 import { stockOutList, stockOutOut, stockOutBatchOut } from '@/api/stockOut'
 import getDate from '@/libs/getDate.js'
 export default {
   name: 'OutboundOrderList',
-  components: { STable, VSelect, rangeDate, pushOrderDetailModal, salesDetailModal, urgentDetailModal, storeTransferOutDetailModal, chainTransferOutDetailModal, warehouseAllocationDetailModal, replenishmentDetailModal },
+  components: { STable, VSelect, rangeDate, pushOrderDetailModal, salesDetailModal, urgentDetailModal, storeTransferOutDetailModal, chainTransferOutDetailModal, warehouseAllocationDetailModal, replenishmentDetailModal, stateIcon },
   mixins: [commonMixin],
   data () {
     return {
@@ -159,8 +164,9 @@ export default {
         { title: '总售价', dataIndex: 'productTotalPrice', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '审核时间', dataIndex: 'auditTime', width: '11%', align: 'center', customRender: function (text) { return text || '--' }, sorter: true },
         { title: '出库时间', dataIndex: 'outTime', width: '11%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '出库状态', dataIndex: 'stateDictValue', width: '8%', align: 'center', customRender: function (text) { return text || '--' }, sorter: true },
-        { title: '操作', scopedSlots: { customRender: 'action' }, width: '10%', align: 'center' }
+        { title: '出库', scopedSlots: { customRender: 'state' }, width: '3%', align: 'center' },
+        // { title: '出库状态', dataIndex: 'stateDictValue', width: '8%', align: 'center', customRender: function (text) { return text || '--' }, sorter: true },
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: '8%', align: 'center' }
       ],
       loading: false,
       // 加载数据方法 必须为 Promise 对象
@@ -241,6 +247,7 @@ export default {
     //  详情
     handleDetail (row) {
       this.outBizType = row.outBizType
+      this.detailTitle = row.outBizTypeDictValue + '详情'
       //  根据出库类型跳转对应页面
       if (row.outBizType == 'PURCHASE_RETURN') { // 采购退货
         this.orderSn = row.outBizSn

+ 8 - 2
src/views/purchasingManagement/purchaseReturn/list.vue

@@ -72,6 +72,10 @@
           <span style="color: #ed1c24;cursor: pointer;" v-if="$hasPermissions('B_purchaseReturnDetail')" @click="handleDetail(record)">{{ record.purchaseReturnNo }}</span>
           <span v-else>{{ record.purchaseReturnNo }}</span>
         </template>
+        <!-- 收款 -->
+        <template slot="financial" slot-scope="text, record">
+          <stateIcon :title="record.settleStateDictValue" :state="record.settleState == 'FINISH'?'1':'2'"></stateIcon>
+        </template>
         <!-- 操作 -->
         <template slot="action" slot-scope="text, record">
           <a-button
@@ -115,10 +119,11 @@ import { STable, VSelect } from '@/components'
 import rangeDate from '@/views/common/rangeDate.vue'
 import { purchaseTargetList } from '@/api/purchase'
 import getDate from '@/libs/getDate.js'
+import stateIcon from '@/views/common/stateIcon'
 import { purchaseReturnList, purchaseReturnSave, purchaseReturnDel, purchaseReturnOutStockBill, purchaseReturnFinishBill } from '@/api/purchaseReturn'
 export default {
   name: 'PurchaseReturnList',
-  components: { STable, VSelect, rangeDate },
+  components: { STable, VSelect, rangeDate, stateIcon },
   mixins: [commonMixin],
   data () {
     return {
@@ -146,7 +151,8 @@ export default {
         { title: '客服审核时间', dataIndex: 'auditTime', width: '14%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '扣减库存', dataIndex: 'hasStockBill', width: '6%', align: 'center', customRender: function (text) { return ['否', '是'][text] } },
         { title: '业务状态', dataIndex: 'stateDictValue', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '财务状态', dataIndex: 'settleStateDictValue', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '收款', scopedSlots: { customRender: 'financial' }, width: '3%', align: 'center' },
+        // { title: '财务状态', dataIndex: 'settleStateDictValue', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '13%', align: 'center' }
       ],
       // 加载数据方法 必须为 Promise 对象