|
@@ -16,74 +16,74 @@
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
<a-col :span="6" v-if="advanced">
|
|
|
- <a-form-item label="收款方式">
|
|
|
- <v-select
|
|
|
- code="SETTLE_STYLE"
|
|
|
- id="salesManagementList-settleStyleSn"
|
|
|
- v-model="queryParam.settleStyleSn"
|
|
|
- allowClear
|
|
|
- placeholder="请选择收款方式"
|
|
|
- ></v-select>
|
|
|
- </a-form-item>
|
|
|
- </a-col>
|
|
|
- <a-col :span="6" v-if="advanced">
|
|
|
- <a-form-item label="业务状态">
|
|
|
- <v-select
|
|
|
- v-model="queryParam.billStatus"
|
|
|
- ref="billStatus"
|
|
|
- id="salesManagementList-billStatus"
|
|
|
- code="SALES_BILL_STATUS"
|
|
|
- placeholder="请选择业务状态"
|
|
|
- allowClear></v-select>
|
|
|
- </a-form-item>
|
|
|
- </a-col>
|
|
|
+ <a-form-item label="收款方式">
|
|
|
+ <v-select
|
|
|
+ code="SETTLE_STYLE"
|
|
|
+ id="salesManagementList-settleStyleSn"
|
|
|
+ v-model="queryParam.settleStyleSn"
|
|
|
+ allowClear
|
|
|
+ placeholder="请选择收款方式"
|
|
|
+ ></v-select>
|
|
|
+ </a-form-item>
|
|
|
+ </a-col>
|
|
|
+ <a-col :span="6" v-if="advanced">
|
|
|
+ <a-form-item label="业务状态">
|
|
|
+ <v-select
|
|
|
+ v-model="queryParam.billStatus"
|
|
|
+ ref="billStatus"
|
|
|
+ id="salesManagementList-billStatus"
|
|
|
+ code="SALES_BILL_STATUS"
|
|
|
+ placeholder="请选择业务状态"
|
|
|
+ allowClear></v-select>
|
|
|
+ </a-form-item>
|
|
|
+ </a-col>
|
|
|
<a-col :span="6">
|
|
|
<a-form-item label="审核时间">
|
|
|
<rangeDate ref="auditRangeDate" v-model="auditTime" @change="auditDateChange" />
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
- <a-col :span="6">
|
|
|
+ <a-col :span="6">
|
|
|
<a-form-item label="销售单号">
|
|
|
<a-input id="salesManagementList-salesBillNo" v-model.trim="queryParam.salesBillNo" allowClear placeholder="请输入销售单号"/>
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
<a-col :span="6" v-if="advanced">
|
|
|
- <a-form-item label="单据来源">
|
|
|
- <v-select
|
|
|
- v-model="queryParam.sourceType"
|
|
|
- ref="sourceType"
|
|
|
- id="salesManagementList-sourceType"
|
|
|
- code="SALES_SOURCE"
|
|
|
- placeholder="请选择单据来源"
|
|
|
- allowClear></v-select>
|
|
|
- </a-form-item>
|
|
|
- </a-col>
|
|
|
- <a-col :span="6" v-if="advanced">
|
|
|
- <a-form-item label="财务状态">
|
|
|
- <v-select
|
|
|
- v-model="queryParam.financialStatus"
|
|
|
- ref="financialStatus"
|
|
|
- id="salesManagementList-financialStatus"
|
|
|
- code="FINANCIAL_RECEIVE_STATUS"
|
|
|
- placeholder="请选择财务状态"
|
|
|
- allowClear></v-select>
|
|
|
- </a-form-item>
|
|
|
- </a-col>
|
|
|
- <a-col :span="6" v-if="advanced">
|
|
|
- <a-form-item label="出库时间">
|
|
|
- <rangeDate ref="outWareRangeDate" v-model="outWareTime" @change="outWareDateChange" />
|
|
|
- </a-form-item>
|
|
|
- </a-col>
|
|
|
- <a-col :span="6" v-if="advanced">
|
|
|
+ <a-form-item label="单据来源">
|
|
|
+ <v-select
|
|
|
+ v-model="queryParam.sourceType"
|
|
|
+ ref="sourceType"
|
|
|
+ id="salesManagementList-sourceType"
|
|
|
+ code="SALES_SOURCE"
|
|
|
+ placeholder="请选择单据来源"
|
|
|
+ allowClear></v-select>
|
|
|
+ </a-form-item>
|
|
|
+ </a-col>
|
|
|
+ <a-col :span="6" v-if="advanced">
|
|
|
+ <a-form-item label="财务状态">
|
|
|
+ <v-select
|
|
|
+ v-model="queryParam.financialStatus"
|
|
|
+ ref="financialStatus"
|
|
|
+ id="salesManagementList-financialStatus"
|
|
|
+ code="FINANCIAL_RECEIVE_STATUS"
|
|
|
+ placeholder="请选择财务状态"
|
|
|
+ allowClear></v-select>
|
|
|
+ </a-form-item>
|
|
|
+ </a-col>
|
|
|
+ <a-col :span="6" v-if="advanced">
|
|
|
+ <a-form-item label="出库时间">
|
|
|
+ <rangeDate ref="outWareRangeDate" v-model="outWareTime" @change="outWareDateChange" />
|
|
|
+ </a-form-item>
|
|
|
+ </a-col>
|
|
|
+ <a-col :span="6" v-if="advanced">
|
|
|
<a-form-item label="采购单号">
|
|
|
<a-input id="salesManagementList-purchaseBillNo" v-model.trim="queryParam.purchaseBillNo" allowClear placeholder="请输入采购单号"/>
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
- <a-col :span="6" v-if="advanced">
|
|
|
- <a-form-model-item label="铺货出库">
|
|
|
- <v-select code="FLAG" id="salesManagementList-distributionFlag" v-model="queryParam.distributionFlag" allowClear placeholder="请选择是否铺货出库"></v-select>
|
|
|
- </a-form-model-item>
|
|
|
- </a-col>
|
|
|
+ <a-col :span="6" v-if="advanced">
|
|
|
+ <a-form-model-item label="铺货出库">
|
|
|
+ <v-select code="FLAG" id="salesManagementList-distributionFlag" v-model="queryParam.distributionFlag" allowClear placeholder="请选择是否铺货出库"></v-select>
|
|
|
+ </a-form-model-item>
|
|
|
+ </a-col>
|
|
|
<a-col :span="24" style="display:flex;align-items: center;">
|
|
|
<div style="text-align:left;width:50%;">
|
|
|
<a-checkbox v-model="isByCustQuery" id="sales-byCustQuery">按客户查询</a-checkbox>
|
|
@@ -136,7 +136,7 @@
|
|
|
<a-checkbox v-model="showDiscount" id="salesQuery-edit-discount">折后总售价</a-checkbox>
|
|
|
</a-menu-item>
|
|
|
</a-menu>
|
|
|
- </a-dropdown>
|
|
|
+ </a-dropdown>
|
|
|
</div>
|
|
|
</div>
|
|
|
|
|
@@ -213,7 +213,7 @@
|
|
|
size="small"
|
|
|
type="link"
|
|
|
class="button-primary"
|
|
|
- v-if="(record.sourceType == 'PURCHASE' && (record.billStatus == 'WAIT_AUDIT' || record.billStatus == 'SUPERIOR_CHANGE')) && $hasPermissions('B_salesEdit')"
|
|
|
+ v-if="((record.sourceType == 'CHILD_PURCHASE'||record.sourceType == 'DEALER_PURCHASE') && (record.billStatus == 'WAIT_AUDIT' || record.billStatus == 'SUPERIOR_CHANGE')) && $hasPermissions('B_salesEdit')"
|
|
|
@click="handleEdit(record)"
|
|
|
>
|
|
|
改单
|
|
@@ -222,12 +222,14 @@
|
|
|
size="small"
|
|
|
type="link"
|
|
|
class="button-error"
|
|
|
- v-if="(record.sourceType == 'PURCHASE' && (record.billStatus == 'WAIT_AUDIT' || record.billStatus == 'SUPERIOR_CHANGE')) && $hasPermissions('B_salesDel')"
|
|
|
+ v-if="((record.sourceType == 'CHILD_PURCHASE'||record.sourceType == 'DEALER_PURCHASE') && (record.billStatus == 'WAIT_AUDIT' || record.billStatus == 'SUPERIOR_CHANGE')) && $hasPermissions('B_salesDel')"
|
|
|
@click="handleDel(record, 'cancel')"
|
|
|
>
|
|
|
取消
|
|
|
</a-button>
|
|
|
- <span v-if="!(record.billStatus == 'WAIT_AUDIT' && $hasPermissions('B_salesAudit')) && !(record.billStatus == 'WAIT_OUT_WAREHOUSE' && $hasPermissions('B_salesStockOut')) && !(((record.sourceType == 'SATELLITE' || record.sourceType == 'SALES' || record.sourceType == 'TEMPORARY_DISPATCHING') && (record.billStatus == 'WAIT_AUDIT' || record.billStatus == 'WAIT_SUBMIT' || record.billStatus == 'AUDIT_REJECT')) && $hasPermissions('B_salesEdit')) && !(((record.sourceType == 'SATELLITE' || record.sourceType == 'SALES' || record.sourceType == 'TEMPORARY_DISPATCHING') && record.billStatus != 'FINISH') && $hasPermissions('B_salesDel')) && !((record.sourceType == 'PURCHASE' && (record.billStatus == 'WAIT_AUDIT' || record.billStatus == 'SUPERIOR_CHANGE')) && $hasPermissions('B_salesEdit')) && !((record.sourceType == 'PURCHASE' && (record.billStatus == 'WAIT_AUDIT' || record.billStatus == 'SUPERIOR_CHANGE')) && $hasPermissions('B_salesDel'))">--</span>
|
|
|
+ <span v-if="!(record.billStatus == 'WAIT_AUDIT' && $hasPermissions('B_salesAudit')) && !(record.billStatus == 'WAIT_OUT_WAREHOUSE' && $hasPermissions('B_salesStockOut')) && !(((record.sourceType == 'SATELLITE' || record.sourceType == 'SALES' || record.sourceType == 'TEMPORARY_DISPATCHING') && (record.billStatus == 'WAIT_AUDIT' || record.billStatus == 'WAIT_SUBMIT' || record.billStatus == 'AUDIT_REJECT')) && $hasPermissions('B_salesEdit')) && !(((record.sourceType == 'SATELLITE' || record.sourceType == 'SALES' || record.sourceType == 'TEMPORARY_DISPATCHING') && record.billStatus != 'FINISH') && $hasPermissions('B_salesDel'))">
|
|
|
+ <span v-if="!(((record.sourceType == 'CHILD_PURCHASE'||record.sourceType == 'DEALER_PURCHASE') && (record.billStatus == 'WAIT_AUDIT' || record.billStatus == 'SUPERIOR_CHANGE')) &&$hasPermissions('B_salesEdit')) && !(((record.sourceType == 'CHILD_PURCHASE'||record.sourceType == 'DEALER_PURCHASE') && (record.billStatus == 'WAIT_AUDIT' || record.billStatus == 'SUPERIOR_CHANGE')) && $hasPermissions('B_salesDel'))">--</span>
|
|
|
+ </span>
|
|
|
</template>
|
|
|
</s-table>
|
|
|
</a-spin>
|
|
@@ -329,8 +331,8 @@ export default {
|
|
|
distributionFlag: '0'
|
|
|
}
|
|
|
},
|
|
|
- computed:{
|
|
|
- columns(){
|
|
|
+ computed: {
|
|
|
+ columns () {
|
|
|
const _this = this
|
|
|
const arr = [
|
|
|
{ title: '序号', dataIndex: 'no', align: 'center', width: '4%' },
|
|
@@ -353,7 +355,7 @@ export default {
|
|
|
// { title: '财务状态', dataIndex: 'financialStatusDictValue', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
{ title: '操作', scopedSlots: { customRender: 'action' }, width: '8%', align: 'center' }
|
|
|
]
|
|
|
-
|
|
|
+
|
|
|
// 显示折扣
|
|
|
if (this.showDiscount) {
|
|
|
arr.splice(7, 0, { title: '折扣金额', dataIndex: 'discountAmount', align: 'right', width: '5%', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
|