|
@@ -17,28 +17,13 @@
|
|
|
</span>
|
|
|
</span>
|
|
|
</template>
|
|
|
- <template slot-scope="{ row }" slot="actualPaymentStatus">
|
|
|
- <span v-for="(item, index) in actualStatusList" :key="index">
|
|
|
- <span v-if="item.dictKey == row.actualPaymentStatus" :style="{ background: item.colour }" class="bottomBox">
|
|
|
- {{ item.dictValue }}
|
|
|
- </span>
|
|
|
- </span>
|
|
|
- </template>
|
|
|
- <template slot-scope="{ row }" slot="returnsStatus">
|
|
|
- <span v-for="(item, index) in returnStatusList" :key="index">
|
|
|
- <span v-if="item.dictKey == row.returnsStatus" :style="{ background: item.colour }" class="bottomBox">
|
|
|
- {{ item.dictValue }}
|
|
|
- </span>
|
|
|
- </span>
|
|
|
- </template>
|
|
|
<template slot-scope="{type,size,row,index}" slot="menu">
|
|
|
<!-- <el-button :size="size" :type="type" @click="check(row)">查看</el-button> -->
|
|
|
<!-- 判断是否一键采购过 然后展示不同的判断按钮-->
|
|
|
<el-button v-if="row.shortcutWarehousingStatus == '1'" :size="size" :type="type"
|
|
|
:disabled="row.status != '录入' && row.item >= 1" @click="$refs.crud.rowDel(row, index)">删除</el-button>
|
|
|
-
|
|
|
<el-button v-else :size="size" :type="type"
|
|
|
- :disabled="row.status != '录入' && row.status != '待确认' && row.item >= 1 || row.numberRows >= 1"
|
|
|
+ :disabled="row.status != '录入' && row.status != '待确认' && row.item >= 1 || row.numberRows >= 1 || row.confirmWarehouse == 1 || row.whetherRedeem == 1"
|
|
|
@click="$refs.crud.rowDel(row, index)">删除</el-button>
|
|
|
<el-button v-if="row.confirmWarehouse != 1" :size="size" :type="type"
|
|
|
@click="confirm(row, index, 1)">确认入库</el-button>
|
|
@@ -54,7 +39,7 @@
|
|
|
<el-checkbox v-model="search.notComplete" true-label="1"></el-checkbox>
|
|
|
</template>
|
|
|
<template slot-scope="{type,size,row,$index}" slot="menuLeft">
|
|
|
-
|
|
|
+
|
|
|
<el-button icon="el-icon-plus" type="primary" :size="size" @click="detailsOpen = true">新建订单</el-button>
|
|
|
<el-button type="warning" icon="el-icon-download" size="small" @click="outExport">导出</el-button>
|
|
|
</template>
|
|
@@ -62,11 +47,10 @@
|
|
|
<span style="color: #409EFF;cursor: pointer" @click.stop="editOpen(row, 2)">{{ row.ordNo }}
|
|
|
</span>
|
|
|
</template>
|
|
|
- <template slot-scope="{ row, index }" slot="srcOrdNo">
|
|
|
- <span style="color: #409EFF;cursor: pointer" @click.stop="editOpen(row, 3)">{{ row.srcOrdNo }}
|
|
|
+ <template slot-scope="{ row, index }" slot="customerName">
|
|
|
+ <span style="color: #409EFF;cursor: pointer" @click.stop="editOpen(row, 2)">{{ row.customerName }}
|
|
|
</span>
|
|
|
</template>
|
|
|
-
|
|
|
</avue-crud>
|
|
|
</basic-container>
|
|
|
<detailsPage v-if="detailsOpen" :onLoad="form" :detailData="detailData" @backToList="backToList"></detailsPage>
|
|
@@ -74,7 +58,7 @@
|
|
|
</template>
|
|
|
|
|
|
<script>
|
|
|
-import { getList, remove, getGoodsInfo, confirmWarehouse, revokeWarehouse,confirmRedeem,revokeRedeem } from "@/api/tirePartsMall/salesManagement/saleOrder";
|
|
|
+import { getList, remove, getGoodsInfo, confirmWarehouse, revokeWarehouse, confirmRedeem, revokeRedeem } from "@/api/tirePartsMall/salesManagement/saleOrder";
|
|
|
import detailsPage from "./detailsPage"
|
|
|
import { getDetails } from "@/api/tirePartsMall/salesManagement/saleOrder";
|
|
|
import { getToken } from "@/util/auth";
|
|
@@ -192,19 +176,6 @@ export default {
|
|
|
disabled: false,
|
|
|
width: 100
|
|
|
},
|
|
|
- // {
|
|
|
- // label: '品牌',
|
|
|
- // prop: 'brandId',
|
|
|
- // disabled: false,
|
|
|
- // width: 100,
|
|
|
- // overHidden: true,
|
|
|
- // type: 'select',
|
|
|
- // props: {
|
|
|
- // label: 'cname',
|
|
|
- // value: 'id'
|
|
|
- // },
|
|
|
- // dicUrl: '/api/blade-sales-part/brandDesc/listAll?type=PP'
|
|
|
- // },
|
|
|
{
|
|
|
label: '品牌',
|
|
|
prop: 'brandName',
|
|
@@ -275,245 +246,202 @@ export default {
|
|
|
type: 'sum',
|
|
|
decimals: 2
|
|
|
},],
|
|
|
- column: [{
|
|
|
- label: '采购单号',
|
|
|
- prop: "ordNo",
|
|
|
- search: true,
|
|
|
- overHidden: true,
|
|
|
- },
|
|
|
- // {
|
|
|
- // label: '来源单号',
|
|
|
- // prop: "srcOrdNo",
|
|
|
- // search: true,
|
|
|
- // overHidden: true,
|
|
|
- // },
|
|
|
- // {
|
|
|
- // label: "业务来源",
|
|
|
- // prop: "businessSource",
|
|
|
- // overHidden: true,
|
|
|
- // search: true,
|
|
|
- // type: 'select',
|
|
|
- // dicUrl: "/api/blade-system/dict-biz/dictionary?code=business_Source",
|
|
|
- // props: {
|
|
|
- // label: "dictValue",
|
|
|
- // value: "dictKey"
|
|
|
- // }
|
|
|
- // },
|
|
|
- {
|
|
|
- label: '所属公司',
|
|
|
- prop: "salesCompanyName",
|
|
|
- overHidden: true,
|
|
|
- }, {
|
|
|
- label: '业务对象',
|
|
|
- prop: "customerName",
|
|
|
- type: 'select',
|
|
|
- search: true,
|
|
|
- overHidden: true,
|
|
|
- filterable: true,
|
|
|
- remote: true,
|
|
|
- props: {
|
|
|
- label: 'cname',
|
|
|
- value: 'cname',
|
|
|
- res: 'data.records'
|
|
|
+ column: [
|
|
|
+ {
|
|
|
+ label: '供应商',
|
|
|
+ prop: "customerName",
|
|
|
+ type: 'select',
|
|
|
+ search: true,
|
|
|
+ overHidden: true,
|
|
|
+ filterable: true,
|
|
|
+ remote: true,
|
|
|
+ props: {
|
|
|
+ label: 'cname',
|
|
|
+ value: 'cname',
|
|
|
+ // res: 'data.records'
|
|
|
+ },
|
|
|
+ dicUrl: '/api/blade-sales-part/corpsDesc/listAll?cname={{key}}&corpType=GYS&enableOrNot=1',
|
|
|
},
|
|
|
- dicUrl: '/api/blade-sales-part/corpsDesc/list?current=1&size=20&corpType=GYS&cname={{key}}',
|
|
|
- }, {
|
|
|
- label: '资金方',
|
|
|
- prop: "fundingPartyName",
|
|
|
- type: 'select',
|
|
|
- search: true,
|
|
|
- overHidden: true,
|
|
|
- filterable: true,
|
|
|
- remote: true,
|
|
|
- props: {
|
|
|
- label: 'cname',
|
|
|
- value: 'cname',
|
|
|
- res: 'data.records'
|
|
|
+ {
|
|
|
+ label: '资金方',
|
|
|
+ prop: "fundingPartyName",
|
|
|
+ type: 'select',
|
|
|
+ search: true,
|
|
|
+ overHidden: true,
|
|
|
+ filterable: true,
|
|
|
+ remote: true,
|
|
|
+ props: {
|
|
|
+ label: 'cname',
|
|
|
+ value: 'cname',
|
|
|
+ res: 'data.records'
|
|
|
+ },
|
|
|
+ dicUrl: '/api/blade-sales-part/corpsDesc/list?current=1&size=20&corpType=GYS&cname={{key}}',
|
|
|
},
|
|
|
- dicUrl: '/api/blade-sales-part/corpsDesc/list?current=1&size=20&corpType=GYS&cname={{key}}',
|
|
|
- },
|
|
|
- {
|
|
|
- label: '显示已完成',
|
|
|
- prop: 'notComplete',
|
|
|
- overHidden: true,
|
|
|
- hide: true,
|
|
|
- search: true,
|
|
|
- searchslot: true
|
|
|
- }, {
|
|
|
- label: '仓库',
|
|
|
- prop: "storageName",
|
|
|
- search: true,
|
|
|
- // remote:true,
|
|
|
- overHidden: true,
|
|
|
- type: 'select',
|
|
|
- props: {
|
|
|
- label: 'cname',
|
|
|
- value: 'cname'
|
|
|
+ {
|
|
|
+ label: '显示已完成',
|
|
|
+ prop: 'notComplete',
|
|
|
+ overHidden: true,
|
|
|
+ hide: true,
|
|
|
+ search: true,
|
|
|
+ searchslot: true
|
|
|
},
|
|
|
- dicUrl: '/api/blade-sales-part/storageDesc/listAll?cname={{key}}',
|
|
|
- }, {
|
|
|
- label: '行数',
|
|
|
- prop: "numberRows",
|
|
|
- overHidden: true,
|
|
|
- }, {
|
|
|
- label: '商品名称',
|
|
|
- prop: "goodsNameJoin",
|
|
|
- search: true,
|
|
|
- overHidden: true,
|
|
|
- // filterable: true,
|
|
|
- // remote:true,
|
|
|
- // type: 'select',
|
|
|
- // props: {
|
|
|
- // label: 'cname',
|
|
|
- // value: 'cname',
|
|
|
- // res: 'data.records'
|
|
|
- // },
|
|
|
- // dicUrl: "/api/blade-sales-part/goodsDesc/list?current=1&size=20&cname={{key}}"
|
|
|
- }, {
|
|
|
- label: '数量',
|
|
|
- prop: "goodsTotalNum",
|
|
|
- overHidden: true,
|
|
|
- },
|
|
|
- // {
|
|
|
- // label: '金额',
|
|
|
- // prop: "totalMoney",
|
|
|
- // overHidden: true,
|
|
|
- // },
|
|
|
- {
|
|
|
- label: '已付金额',
|
|
|
- prop: "paymentAmountTl",
|
|
|
- disabled: true
|
|
|
- },
|
|
|
- {
|
|
|
- label: '融资金额',
|
|
|
- prop: "fundingAmount",
|
|
|
- overHidden: true,
|
|
|
- },
|
|
|
- {
|
|
|
- label: '保证金',
|
|
|
- prop: "bondAmount",
|
|
|
- overHidden: true,
|
|
|
- },
|
|
|
- {
|
|
|
- label: '利息',
|
|
|
- prop: "interest",
|
|
|
- overHidden: true,
|
|
|
- },
|
|
|
- {
|
|
|
- label: '状态',
|
|
|
- prop: "status",
|
|
|
- search: true,
|
|
|
- overHidden: true,
|
|
|
- type: 'select',
|
|
|
- dicUrl: "/api/blade-system/dict-biz/dictionary?code=procurement_Status",
|
|
|
- props: {
|
|
|
- label: "dictValue",
|
|
|
- value: "dictKey"
|
|
|
- }
|
|
|
- },
|
|
|
- {
|
|
|
- label: '结算状态',
|
|
|
- prop: "actualPaymentStatus",
|
|
|
- searchProp: 'actualPaymentType',
|
|
|
- search: true,
|
|
|
- overHidden: true,
|
|
|
- type: 'select',
|
|
|
- dicData: [
|
|
|
- {
|
|
|
- label: "待付款",
|
|
|
- value: 1,
|
|
|
+ {
|
|
|
+ label: '业务日期',
|
|
|
+ prop: "businesDate",
|
|
|
+ overHidden: true,
|
|
|
+ searchProp: "businesDateList",
|
|
|
+ type: "date",
|
|
|
+ search: true,
|
|
|
+ width: 100,
|
|
|
+ unlinkPanels: true,
|
|
|
+ searchRange: true,
|
|
|
+ searchDefaultTime: ["00:00:00", "23:59:59"],
|
|
|
+ format: "yyyy-MM-dd",
|
|
|
+ valueFormat: "yyyy-MM-dd HH:mm:ss"
|
|
|
+ },
|
|
|
+ {
|
|
|
+ label: '仓库',
|
|
|
+ prop: "storageName",
|
|
|
+ search: true,
|
|
|
+ // remote:true,
|
|
|
+ overHidden: true,
|
|
|
+ type: 'select',
|
|
|
+ props: {
|
|
|
+ label: 'cname',
|
|
|
+ value: 'cname'
|
|
|
},
|
|
|
- {
|
|
|
- label: "已付款",
|
|
|
- value: 2,
|
|
|
+ dicUrl: '/api/blade-sales-part/storageDesc/listAll?cname={{key}}',
|
|
|
+ }, {
|
|
|
+ label: '总金额',
|
|
|
+ prop: "totalMoney",
|
|
|
+ overHidden: true,
|
|
|
+ }, {
|
|
|
+ label: '配资比例',
|
|
|
+ prop: "proportion",
|
|
|
+ overHidden: true,
|
|
|
+ // filterable: true,
|
|
|
+ // remote:true,
|
|
|
+ // type: 'select',
|
|
|
+ // props: {
|
|
|
+ // label: 'cname',
|
|
|
+ // value: 'cname',
|
|
|
+ // res: 'data.records'
|
|
|
+ // },
|
|
|
+ // dicUrl: "/api/blade-sales-part/goodsDesc/list?current=1&size=20&cname={{key}}"
|
|
|
+ }, {
|
|
|
+ label: '融资金额',
|
|
|
+ prop: "fundingAmount",
|
|
|
+ overHidden: true,
|
|
|
+ },
|
|
|
+ {
|
|
|
+ label: '保证金',
|
|
|
+ prop: "bondAmount",
|
|
|
+ overHidden: true,
|
|
|
+ },
|
|
|
+ {
|
|
|
+ label: '利息',
|
|
|
+ prop: "interest",
|
|
|
+ overHidden: true,
|
|
|
+ },
|
|
|
+ {
|
|
|
+ label: '实际金额',
|
|
|
+ prop: "goodsTotalShipAmount",
|
|
|
+ overHidden: true,
|
|
|
+ },
|
|
|
+ {
|
|
|
+ label: '已卖数量',
|
|
|
+ prop: "outGoodsTotalShipNum",
|
|
|
+ overHidden: true,
|
|
|
+ },
|
|
|
+ {
|
|
|
+ label: '已卖金额',
|
|
|
+ prop: "outGoodsTotalShipAmount",
|
|
|
+ overHidden: true,
|
|
|
+ },
|
|
|
+ {
|
|
|
+ label: '应付类别',
|
|
|
+ prop: "receivableType",
|
|
|
+ type: "select",
|
|
|
+ disabled: false,
|
|
|
+ dicUrl: "/api/blade-system/dict-biz/dictionary?code=receivableType",
|
|
|
+ props: {
|
|
|
+ label: "dictValue",
|
|
|
+ value: "dictValue"
|
|
|
},
|
|
|
- {
|
|
|
- label: "尾款",
|
|
|
- value: 3,
|
|
|
+ overHidden: true,
|
|
|
+ },
|
|
|
+ {
|
|
|
+ label: '状态',
|
|
|
+ prop: "status",
|
|
|
+ search: true,
|
|
|
+ overHidden: true,
|
|
|
+ type: 'select',
|
|
|
+ dicUrl: "/api/blade-system/dict-biz/dictionary?code=procurement_Status",
|
|
|
+ props: {
|
|
|
+ label: "dictValue",
|
|
|
+ value: "dictKey"
|
|
|
}
|
|
|
- ],
|
|
|
- // dicUrl: "/api/blade-system/dict-biz/dictionary?code=settlement_Status",
|
|
|
- // props: {
|
|
|
- // label: "dictValue",
|
|
|
- // value: "dictKey"
|
|
|
- // }
|
|
|
- },
|
|
|
- // {
|
|
|
- // label: '应结日期',
|
|
|
- // prop: "dueDate",
|
|
|
- // overHidden: true,
|
|
|
- // },
|
|
|
- {
|
|
|
- label: '退货状态',
|
|
|
- prop: "returnsStatus",
|
|
|
- overHidden: true,
|
|
|
- },
|
|
|
- {
|
|
|
- label: "制单人",
|
|
|
- prop: "createUserName",
|
|
|
- searchProp: "createUser",
|
|
|
- overHidden: true,
|
|
|
- width: 100,
|
|
|
- filterable: true,
|
|
|
- remote: true,
|
|
|
- type: "select",
|
|
|
- dicUrl: "/api/blade-user/page?size=20¤t=1&account={{key}}",
|
|
|
- props: {
|
|
|
- label: "account",
|
|
|
- value: "id",
|
|
|
- res: 'data.records'
|
|
|
- }
|
|
|
- }, {
|
|
|
- label: "制单日期",
|
|
|
- prop: "createTime",
|
|
|
- searchProp: "createTimeList",
|
|
|
- type: "date",
|
|
|
- overHidden: true,
|
|
|
- width: 100,
|
|
|
- searchRange: true,
|
|
|
- searchDefaultTime: ["00:00:00", "23:59:59"],
|
|
|
- format: "yyyy-MM-dd",
|
|
|
- valueFormat: "yyyy-MM-dd HH:mm:ss"
|
|
|
- }, {
|
|
|
- label: '业务日期',
|
|
|
- prop: "businesDate",
|
|
|
- overHidden: true,
|
|
|
- searchProp: "businesDateList",
|
|
|
- type: "date",
|
|
|
- search: true,
|
|
|
- width: 100,
|
|
|
- unlinkPanels: true,
|
|
|
- searchRange: true,
|
|
|
- searchDefaultTime: ["00:00:00", "23:59:59"],
|
|
|
- format: "yyyy-MM-dd",
|
|
|
- valueFormat: "yyyy-MM-dd HH:mm:ss"
|
|
|
- }, {
|
|
|
- label: "更新人",
|
|
|
- prop: "updateUserName",
|
|
|
- searchProp: "updateUser",
|
|
|
- overHidden: true,
|
|
|
- width: 100,
|
|
|
- filterable: true,
|
|
|
- remote: true,
|
|
|
- type: "select",
|
|
|
- dicUrl: "/api/blade-user/page?size=20¤t=1&account={{key}}",
|
|
|
- props: {
|
|
|
- label: "account",
|
|
|
- value: "id",
|
|
|
- res: 'data.records'
|
|
|
- }
|
|
|
- }, {
|
|
|
- label: "更新日期",
|
|
|
- prop: "updateTime",
|
|
|
- searchProp: "updateTimeList",
|
|
|
- type: "date",
|
|
|
- overHidden: true,
|
|
|
- width: 100,
|
|
|
- searchRange: true,
|
|
|
- searchDefaultTime: ["00:00:00", "23:59:59"],
|
|
|
- format: "yyyy-MM-dd",
|
|
|
- valueFormat: "yyyy-MM-dd HH:mm:ss"
|
|
|
- }]
|
|
|
+ },
|
|
|
+ {
|
|
|
+ label: '单据编号',
|
|
|
+ prop: "ordNo",
|
|
|
+ search: true,
|
|
|
+ overHidden: true,
|
|
|
+ },
|
|
|
+ {
|
|
|
+ label: "制单人",
|
|
|
+ prop: "createUserName",
|
|
|
+ searchProp: "createUser",
|
|
|
+ overHidden: true,
|
|
|
+ width: 100,
|
|
|
+ filterable: true,
|
|
|
+ remote: true,
|
|
|
+ type: "select",
|
|
|
+ dicUrl: "/api/blade-user/page?size=20¤t=1&account={{key}}",
|
|
|
+ props: {
|
|
|
+ label: "account",
|
|
|
+ value: "id",
|
|
|
+ res: 'data.records'
|
|
|
+ }
|
|
|
+ }, {
|
|
|
+ label: "制单日期",
|
|
|
+ prop: "createTime",
|
|
|
+ searchProp: "createTimeList",
|
|
|
+ type: "date",
|
|
|
+ overHidden: true,
|
|
|
+ width: 100,
|
|
|
+ searchRange: true,
|
|
|
+ searchDefaultTime: ["00:00:00", "23:59:59"],
|
|
|
+ format: "yyyy-MM-dd",
|
|
|
+ valueFormat: "yyyy-MM-dd HH:mm:ss"
|
|
|
+ },
|
|
|
+ {
|
|
|
+ label: "更新人",
|
|
|
+ prop: "updateUserName",
|
|
|
+ searchProp: "updateUser",
|
|
|
+ overHidden: true,
|
|
|
+ width: 100,
|
|
|
+ filterable: true,
|
|
|
+ remote: true,
|
|
|
+ type: "select",
|
|
|
+ dicUrl: "/api/blade-user/page?size=20¤t=1&account={{key}}",
|
|
|
+ props: {
|
|
|
+ label: "account",
|
|
|
+ value: "id",
|
|
|
+ res: 'data.records'
|
|
|
+ }
|
|
|
+ }, {
|
|
|
+ label: "更新日期",
|
|
|
+ prop: "updateTime",
|
|
|
+ searchProp: "updateTimeList",
|
|
|
+ type: "date",
|
|
|
+ overHidden: true,
|
|
|
+ width: 100,
|
|
|
+ searchRange: true,
|
|
|
+ searchDefaultTime: ["00:00:00", "23:59:59"],
|
|
|
+ format: "yyyy-MM-dd",
|
|
|
+ valueFormat: "yyyy-MM-dd HH:mm:ss"
|
|
|
+ }]
|
|
|
}
|
|
|
}
|
|
|
},
|