作者 lixiang

bug修正

... ... @@ -148,7 +148,7 @@ export default {
{
title: '付款金额(元)',
align: 'center',
dataIndex: 'supplier'
dataIndex: 'fsje'
},
{
title: '付款时间',
... ...
<template>
<a-card :bordered="false" :class="'cust-erp-sub-tab'">
<a-spin :spinning="loading">
<a-form-model ref="form" :model="model" :rules="validatorRules">
<a-row>
<h1>{{ sskcTitle }}</h1>
... ... @@ -114,6 +115,7 @@
</a-row>
</a-form-model>
</a-spin>
</a-card>
</template>
... ... @@ -136,6 +138,7 @@ export default {
watch: {},
data() {
return {
loading: false,
sskcTitle: '实时库存',
lszbTitle: '历史中标信息',
bctbTitle: '本次投标信息',
... ... @@ -203,6 +206,7 @@ export default {
this.sskcTitle = '实时库存'
},
loadData(rows) {
this.loading = true
if (rows) {
const row = rows[0]
console.log("row",row)
... ... @@ -277,6 +281,7 @@ export default {
}
})
}
this.loading = false
},
clearList() {
this.dataSource = []
... ...
... ... @@ -11,7 +11,7 @@
<!-- 操作按钮区域 -->
<div class="table-operator">
<a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
<a-button @click="handleAdd" type="primary" icon="plus" v-has="'kucun:blp:add'">新增</a-button>
<!-- <a-button type="primary" icon="download" @click="handleExportXls('不良品库')">导出</a-button>
<a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
<a-button type="primary" icon="import">导入</a-button>
... ... @@ -144,8 +144,17 @@
components: {
TblTradeInventoryDefectiveProductModal
},
props: {
rowData: {
type: Object, // 类型为对象
default: () => ({}), // 默认值为空对象
},
},
data () {
return {
queryParam: {
expressDeliveryNumber: this.rowData.hth
},
validatorRules:{
thFlag: [
{ required: true, message: '请选择退/换货', trigger: 'change' }
... ...
... ... @@ -157,22 +157,22 @@
dataIndex: 'modelChange',
scopedSlots: {customRender: 'fileSlot'}
},
{
title:'型号变更说明上传时间',
align:"center",
dataIndex: 'modelChangeDate',
},
// {
// title:'型号变更说明上传时间',
// align:"center",
// dataIndex: 'modelChangeDate',
// },
{
title:'合格证',
align:"center",
dataIndex: 'cert',
scopedSlots: {customRender: 'fileSlot'}
},
{
title:'合格证上传时间',
align:"center",
dataIndex: 'certDate',
},
// {
// title:'合格证上传时间',
// align:"center",
// dataIndex: 'certDate',
// },
{
title:'其他',
align:"center",
... ... @@ -180,7 +180,7 @@
scopedSlots: {customRender: 'fileSlot'}
},
{
title:'其他文件上传时间',
title:'上传时间',
align:"center",
dataIndex: 'otherDate',
},
... ...
... ... @@ -87,7 +87,8 @@
<a @click="fkInfo(record)">付款管理</a> &nbsp
</span>
<span slot="action5" slot-scope="text, record">
<a @click="blpInfo(record)">{{record.blpNum}}</a> &nbsp
<div v-if="record.blpNum == null">0</div>
<a v-else @click="blpInfo(record)">{{record.blpNum}}</a> &nbsp
</span>
</a-table>
</a-tab-pane>
... ... @@ -211,7 +212,6 @@
<a-input
v-model="model2.supplier"
placeholder="请输入供应商(TEL)"
disabled="disabled"
></a-input>
</a-form-model-item>
</a-col>
... ... @@ -222,7 +222,6 @@
<a-input
v-model="model2.procurementChannels"
placeholder="请输入采购渠道"
disabled="disabled"
></a-input>
</a-form-model-item>
</a-col>
... ... @@ -233,7 +232,6 @@
<a-input
v-model="model2.purchaseQuantity"
placeholder="请输入数量"
disabled="disabled"
></a-input>
</a-form-model-item>
</a-col>
... ... @@ -244,7 +242,6 @@
<a-input
v-model="model2.unitPrice"
placeholder="请输入单价(不含税,元)"
disabled="disabled"
></a-input>
</a-form-model-item>
</a-col>
... ... @@ -255,7 +252,6 @@
<a-input
v-model="model2.taxRate"
placeholder="请输入税率(%)"
disabled="disabled"
></a-input>
</a-form-model-item>
</a-col>
... ... @@ -266,7 +262,6 @@
<a-input
v-model="model2.amount"
placeholder="请输入金额(元)"
disabled="disabled"
></a-input>
</a-form-model-item>
</a-col>
... ... @@ -277,7 +272,6 @@
<a-input
v-model="model2.hth"
placeholder="请输入合同/订单号"
:disabled = "bjflag"
></a-input>
</a-form-model-item>
</a-col>
... ... @@ -288,7 +282,6 @@
<a-input
v-model="model2.wldh"
placeholder="请输入物流单号"
:disabled = "bjflag"
></a-input>
</a-form-model-item>
</a-col>
... ... @@ -315,25 +308,6 @@
</a-col>
<a-col :span="12" v-if="bjflag">
<a-form-model-item label="本次入库数量" :labelCol="labelCol" :wrapperCol="wrapperCol"
prop="rkNum">
<a-input
v-model="model2.rkNum"
placeholder="请输入已入库数量"
></a-input>
</a-form-model-item>
</a-col>
<!-- <a-col :span="12" v-if="bjflag">-->
<!-- <a-form-model-item label="不良品数量" :labelCol="labelCol" :wrapperCol="wrapperCol"-->
<!-- prop="blpNum">-->
<!-- <a-input-->
<!-- v-model="model2.blpNum"-->
<!-- placeholder="请输入已入库数量"-->
<!-- ></a-input>-->
<!-- </a-form-model-item>-->
<!-- </a-col>-->
<a-col :span="12">
<a-form-model-item label="预计到厂时间" :labelCol="labelCol" :wrapperCol="wrapperCol"
... ... @@ -669,7 +643,7 @@
@ok="handleConfirmblp"
@cancel="handleCancelblp"
cancelText="关闭">
<TblTradeInventoryDefectiveProductList ></TblTradeInventoryDefectiveProductList>
<TblTradeInventoryDefectiveProductList :rowData="currentRowData" ></TblTradeInventoryDefectiveProductList>
</j-modal>
... ... @@ -779,7 +753,6 @@ export default {
{ pattern: /^\d+$/, message: '数量必须为整数', trigger: 'blur' }
],
estimatedTime: [{ required: true, message: '请输入预计到厂时间', trigger: 'blur' }],
htfj: [{ required: true, message: '请上传合同附件', trigger: 'blur' }],
},
validatorRules3: {
... ... @@ -1131,7 +1104,13 @@ export default {
{
title: '已入库数量',
align: 'center',
dataIndex: 'yrkNum'
dataIndex: 'yrkNum',
customRender: function(yrkNum) {
if (!yrkNum || yrkNum === 0) {
return '0'
}
return yrkNum;
}
},
{
title: '剩余订单未入库数量',
... ... @@ -1194,7 +1173,7 @@ export default {
{
title: '付款金额(元)',
align: 'center',
dataIndex: 'supplier'
dataIndex: 'fsje'
},
{
title: '付款时间',
... ... @@ -1251,7 +1230,8 @@ export default {
superFieldList: [],
isButtonDisabled: true,
auditFlag: false,
pdfSrc: ''
pdfSrc: '',
currentRowData: null,
}
},
created() {
... ... @@ -1334,6 +1314,7 @@ export default {
}})
},
blpInfo(record){
this.currentRowData = record;
this.visibleBlp = true
},
fkInfo(record) {
... ...
... ... @@ -14,51 +14,11 @@
<a-input placeholder="请输入物料长描述" v-model="queryParam.miaoshu"></a-input>
</a-form-item>
</a-col>
<!-- <a-col :xl="6" :lg="7" :md="8" :sm="24">-->
<!-- <a-form-item label="需求交货期">-->
<!-- <j-date v-model="queryParam.xqjhq" placeholder="请选择计划完成日期" />-->
<!-- </a-form-item>-->
<!-- </a-col>-->
<!-- <a-col :xl="6" :lg="7" :md="8" :sm="24">-->
<!-- <a-form-item label="询单状态">-->
<!-- <a-select v-model="queryParam.xdzt" placeholder="请选择" allowClear>-->
<!-- <a-select-option value="未完成">未完成</a-select-option>-->
<!-- <a-select-option value="已完成">已完成</a-select-option>-->
<!-- </a-select>-->
<!-- </a-form-item>-->
<!-- </a-col>-->
<!-- <a-col :xl="6" :lg="7" :md="8" :sm="24">-->
<!-- <a-form-item label="是否投标">-->
<!-- <a-select v-model="queryParam.sftb" placeholder="请选择" allowClear>-->
<!-- <a-select-option value="是">是</a-select-option>-->
<!-- <a-select-option value="否">否</a-select-option>-->
<!-- </a-select>-->
<!-- </a-form-item>-->
<!-- </a-col>-->
<!-- <a-col :xl="6" :lg="7" :md="8" :sm="24">-->
<!-- <a-form-item label="是否中标">-->
<!-- <a-select v-model="queryParam.sfzb" placeholder="请选择" allowClear>-->
<!-- <a-select-option value="是">是</a-select-option>-->
<!-- <a-select-option value="否">否</a-select-option>-->
<!-- </a-select>-->
<!-- </a-form-item>-->
<!-- </a-col>-->
<!-- <a-col :xl="6" :lg="7" :md="8" :sm="24">-->
<!-- <a-form-item label="是否采购">-->
<!-- <a-select v-model="queryParam.sfcg" placeholder="请选择" allowClear>-->
<!-- <a-select-option value="是">是</a-select-option>-->
<!-- <a-select-option value="否">否</a-select-option>-->
<!-- </a-select>-->
<!-- </a-form-item>-->
<!-- </a-col>-->
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
<a-button type="primary" @click="searchQuery(1)" icon="search">查询</a-button>
<a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
<!-- <a @click="handleToggleSearch" style="margin-left: 8px">
{{ toggleSearchStatus ? '收起' : '展开' }}
<a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
</a> -->
</span>
</a-col>
</a-row>
... ... @@ -105,9 +65,11 @@
:dataSource="dataSource"
:pagination="ipagination"
:loading="loading"
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: handleRowClick, type:'radio'}"
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: handleRadioClick, type:'radio'}"
:customRow="clickThenSelect"
@change="handleTableChange">
@change="handleTableChange"
@rowClick="handleRowClick"
>
<template slot="htmlSlot" slot-scope="text">
<div v-html="text"></div>
... ... @@ -404,6 +366,19 @@ export default {
},
// 行点击事件
handleRowClick(selectedRowKeys, selectionRows) {
console.log("handleRowClick.......................................")
console.log("selectionRows",selectionRows)
console.log("selectedRowKeys",selectedRowKeys)
let row = [selectedRowKeys];
console.log("row",row)
this.loadChildData(row)
console.log("handleRowClick.......................................")
},
handleRadioClick(selectedRowKeys, selectionRows) {
console.log("selectionRows",selectionRows)
console.log("selectedRowKeys",selectedRowKeys)
// this.$refs.tabSskcList.loading = true;
this.selectedRowKeys = selectedRowKeys
this.selectionRows = selectionRows
... ...
... ... @@ -48,6 +48,7 @@
},
data () {
return {
loading: false,
description: '贸易招标信息管理页面',
disableMixinCreated:true,
// 表头
... ... @@ -159,7 +160,9 @@
this.dataSource = []
},
loadData(rows){
this.loading = true
console.log("row:tab2",rows)
this.dataSource = []
const row = rows[0]
console.log("row",row)
const materialCode = row.code
... ... @@ -176,6 +179,7 @@
}
}
})
this.loading = false
},
clearList(){
this.dataSource=[]
... ...
... ... @@ -329,7 +329,7 @@
{
title: '标段(包)名称',
align: 'center',
dataIndex: 'packageName',
dataIndex: 'tenderInfo.tenderName',
width: 130,
},
{
... ... @@ -341,7 +341,7 @@
{
title: '品牌',
align: 'center',
dataIndex: 'tenderInfo.pinpai',
dataIndex: 'tenderInfo.xypp',
width: 130,
},
{
... ... @@ -382,12 +382,24 @@
align: 'center',
dataIndex: 'xydj',
width: 130,
customRender: function (text) {
if (!text){
return "0";
}
return text;
},
},
{
title: '中标单价(不含税,元)',
align: 'center',
dataIndex: 'zbj',
width: 130,
customRender: function (text) {
if (!text){
return "0";
}
return text;
},
},
{
title: '单价差异',
... ... @@ -398,7 +410,7 @@
{
title: '税率(%)',
align: 'center',
dataIndex: 'sl',
dataIndex: 'tenderInfo.sl',
width: 100,
},
{
... ... @@ -406,6 +418,12 @@
align: 'center',
dataIndex: 'bidTotalPrice',
width: 120,
customRender: function (text) {
if (!text){
return "0";
}
return text;
},
},
// {
// title: '操作',
... ...