meswork/JY1.0
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://192.168.0.149:10010/r/高精2.0

Browse Source
This commit is contained in:
zhangdingyu
2019-12-05 08:52:38 +08:00
parent f5538038f9 755feb2f83
commit 98b3c48e10
6 changed files with 175 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/api/PurchasingCenter/CreateInquirySheet.js
View File

@@ -114,14 +114,14 @@ export function searchSupplier(check1, value1, check2, value2, check3, value3, c
}) })
} }
// 查询询价单 // 查询询价单
export function searchCreateInquirySheet(pageCurrent, pageSize, check1, name, check2, num, id) { export function searchCreateInquirySheet(pageCurrent, pageSize, check2, num, id) {
return request({ return request({
url: '', url: '',
method: 'post', method: 'post',
data: { data: {
type: '1', type: '1',
name: '采购管理_询价单_查询数据', name: '采购管理_询价单_查询数据',
param: `供应商名称_check=${check1}&供应商名称=${name}&询价单编号_check=${check2}&询价单编号=${num}&采购员流水号_check=1&采购员流水号=${id}`, param: `询价单编号_check=${check2}&询价单编号=${num}&采购员流水号_check=1&采购员流水号=${id}`,
Pagination: pageCurrent + '&' + pageSize Pagination: pageCurrent + '&' + pageSize
} }
}) })
@@ -254,7 +254,7 @@ export function saveOrder(num1, num2, num3) {
data: { data: {
type: '2', type: '2',
name: '采购管理_询价单明细_保存数据', name: '采购管理_询价单明细_保存数据',
param: `询价单明细流水号组=${num1}&数量组=${num2}&备注组=${num3}` param: `询价单明细流水号=${num1}&数量=${num2}&备注=${num3}`
} }
}) })
} }

4
src/api/PurchasingCenter/CreatePurchaseContract.js
View File

@@ -24,14 +24,14 @@ export function initSupplier11(num) {
}) })
} }
// 查询询价单列表 表1 // 查询询价单列表 表1
export function searchInquirySheet(check1, value1, check2, value2, check3, id, check4, supplier) { export function searchInquirySheet(check2, value2, check3, id, check4, supplier) {
return request({ return request({
url: '', url: '',
method: 'post', method: 'post',
data: { data: {
type: '1', type: '1',
name: '采购管理_询价单_查询数据', name: '采购管理_询价单_查询数据',
param: `供应商名称_check=${check1}&供应商名称=${value1}&询价单编号_check=${check2}&询价单编号=${value2}&采购员流水号_check=${check3}&采购员流水号=${id}&供应商流水号_check=${check4}&供应商流水号=${supplier}` param: `询价单编号_check=${check2}&询价单编号=${value2}&采购员流水号_check=${check3}&采购员流水号=${id}&供应商流水号_check=${check4}&供应商流水号=${supplier}`
} }
}) })
} }

228
src/views/PurchasingCenter/CreateInquirySheet/index.vue
View File

@@ -116,31 +116,42 @@
style="width: 100%;max-height: 500px;" style="width: 100%;max-height: 500px;"
height="500px" height="500px"
size="mini" size="mini"
@selection-change="handleSelectionChange1"> @selection-change="handleSelectionChange1"
@select="handleSelection">
<el-table-column :selectable="selectable" align="center" width="50" type="selection"/> <el-table-column :selectable="selectable" align="center" width="50" type="selection"/>
<el-table-column v-if="switchValue" label="操作" align="center" width="100" fixed="left"> <el-table-column v-if="switchValue" label="操作" align="center" width="100" fixed="left">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button :disabled="parseInt(scope.row.询价状态编号)!==1||parseInt(scope.row.是否确认)!==1" type="primary" size="mini" @click="materialChange(scope.row)">物料变更</el-button> <el-button :disabled="parseInt(scope.row.询价状态编号)!==1||parseInt(scope.row.是否确认)!==1" type="primary" size="mini" @click="materialChange(scope.row)">物料变更</el-button>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="状态" align="center" width="70"> <!--<el-table-column label="状态" align="center" width="70">-->
<template slot-scope="scope"> <!--<template slot-scope="scope">-->
<span v-if="unInquiry(scope.row)" style="color: orange">未询价</span> <!--<span v-if="unInquiry(scope.row)" style="color: orange">未询价</span>-->
<span v-if="inquiry(scope.row)" style="color: blue">已询价</span> <!--<span v-if="inquiry(scope.row)" style="color: blue">已询价</span>-->
<span v-if="approval(scope.row)" style="color: green">审批中</span> <!--<span v-if="approval(scope.row)" style="color: green">审批中</span>-->
<span v-if="purchased(scope.row)">已采购</span> <!--<span v-if="purchased(scope.row)">已采购</span>-->
</template> <!--</template>-->
</el-table-column> <!--</el-table-column>-->
<el-table-column :filters="supplierFilters" :filter-method="filterHandler" label="供货商" align="center" min-width="100" prop="供货商" show-overflow-tooltip> <el-table-column :filters="supplierFilters" :filter-method="filterHandler" label="供货商" align="center" min-width="100" prop="供货商" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.供货商 }} {{ scope.row.供货商 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :filters="remarkFilters" :filter-method="filterHandler0" label="备注" align="center" min-width="100" prop="备注" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.备注 }}
</template>
</el-table-column>
<el-table-column label="机床图号" align="center" width="130" prop="机床图号" show-overflow-tooltip> <el-table-column label="机床图号" align="center" width="130" prop="机床图号" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.机床图号 }} {{ scope.row.机床图号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="组号" align="center" min-width="50">
<template slot-scope="scope">
{{ scope.row.组号 }}
</template>
</el-table-column>
<el-table-column label="名称" align="center" width="180" prop="名称"> <el-table-column label="名称" align="center" width="180" prop="名称">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.物料名称 }} {{ scope.row.物料名称 }}
@@ -156,11 +167,6 @@
{{ scope.row.物料型号 }} {{ scope.row.物料型号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="组号" align="center" min-width="50">
<template slot-scope="scope">
{{ scope.row.组号 }}
</template>
</el-table-column>
<el-table-column label="分配数" align="center" min-width="60"> <el-table-column label="分配数" align="center" min-width="60">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.零件数量 }} {{ scope.row.零件数量 }}
@@ -199,11 +205,6 @@
{{ Number(scope.row.滞货数量) }} {{ Number(scope.row.滞货数量) }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :filters="remarkFilters" :filter-method="filterHandler0" label="备注" align="center" min-width="100" prop="备注" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.备注 }}
</template>
</el-table-column>
<el-table-column label="分配时间" align="center" min-width="90"> <el-table-column label="分配时间" align="center" min-width="90">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.任务分配时间.split(' ')[0] }} {{ scope.row.任务分配时间.split(' ')[0] }}
@@ -214,12 +215,12 @@
{{ scope.row.组件设计者 || scope.row.机床设计者 || '—' }} {{ scope.row.组件设计者 || scope.row.机床设计者 || '—' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="询价单编号" align="center" min-width="100"> <!--<el-table-column label="询价单编号" align="center" min-width="100">-->
<template slot-scope="scope"> <!--<template slot-scope="scope">-->
<b v-if="inquiry(scope.row)">{{ scope.row.询价单编号 }}</b> <!--<b v-if="inquiry(scope.row)">{{ scope.row.询价单编号 }}</b>-->
<b v-else>—</b> <!--<b v-else>—</b>-->
</template> <!--</template>-->
</el-table-column> <!--</el-table-column>-->
<!--<el-table-column :filters="source" :filter-method="filterSource" align="center" label="数据来源" min-width="90px" prop="零件类型">--> <!--<el-table-column :filters="source" :filter-method="filterSource" align="center" label="数据来源" min-width="90px" prop="零件类型">-->
<!--<template slot-scope="scope">--> <!--<template slot-scope="scope">-->
<!--{{ Number(scope.row.零件类型) === 1 ? 'BZ' : 'WG' }}--> <!--{{ Number(scope.row.零件类型) === 1 ? 'BZ' : 'WG' }}-->
@@ -232,10 +233,17 @@
:page-sizes="[10, 50, 100, 150]" :page-sizes="[10, 50, 100, 150]"
:page-size="pageSize11" :page-size="pageSize11"
:total="total11" :total="total11"
style="display:inline-block;width:50%" style="display:inline-block;width:50px"
layout="total, sizes, prev, pager, next, jumper" layout="total"
@size-change="handleSizeChange11" @size-change="handleSizeChange11"
@current-change="handleCurrentChange11"/> @current-change="handleCurrentChange11"/>
<el-tooltip :open-delay="1000" effect="dark" content="为选择的询价单添加物料" placement="top">
<el-button
type="warning"
size="small"
style="margin: 0px 20px"
@click="addInquirySheet">选入物料</el-button>
</el-tooltip>
</div> </div>
</el-row> </el-row>
</el-tab-pane> </el-tab-pane>
@@ -248,7 +256,7 @@
<!--:label="item.label"--> <!--:label="item.label"-->
<!--:value="item.value"/>--> <!--:value="item.value"/>-->
<!--</el-select>--> <!--</el-select>-->
<el-input v-model="partNum" placeholder="图号名称规格" size="small" clearable @keyup.enter.native="materialStatusValue=[0];pageCurrent11=1;pageSize11=20;total11=0;searchTable12()"/> <el-input v-model="partNum" placeholder="图号名称规格" size="small" clearable @keyup.enter.native="searchTable12()"/>
<el-select v-model="machineValue" placeholder="机床" size="small" clearable filterable> <el-select v-model="machineValue" placeholder="机床" size="small" clearable filterable>
<el-option <el-option
v-for="item in machine" v-for="item in machine"
@@ -264,7 +272,7 @@
<!--:value="item.value"/>--> <!--:value="item.value"/>-->
<!--</el-select>--> <!--</el-select>-->
<!--<el-cascader :options="materialStatus" :props="{ checkStrictly: true }" v-model="materialStatusValue" style="width: 100px" size="small"/>--> <!--<el-cascader :options="materialStatus" :props="{ checkStrictly: true }" v-model="materialStatusValue" style="width: 100px" size="small"/>-->
<el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px" @click="materialStatusValue=[0];pageCurrent12=1;pageSize12=100;total12=0;searchTable12()">查询</el-button> <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px" @click="searchTable12()">查询</el-button>
<el-button type="warning" size="small" icon="el-icon-download" style="margin-left: 10px" @click="exportUninquirySheet">导出未询价单</el-button> <el-button type="warning" size="small" icon="el-icon-download" style="margin-left: 10px" @click="exportUninquirySheet">导出未询价单</el-button>
<el-date-picker <el-date-picker
v-model="endTime" v-model="endTime"
@@ -306,31 +314,37 @@
<el-table <el-table
v-loading="" v-loading=""
:data="tableData12" :data="tableData12"
:row-class-name="tableRowClassName" :row-class-name="tableRowClassName2"
border border
style="width: 100%;max-height: 500px;" style="width: 100%;max-height: 500px;"
height="500px" height="500px"
size="mini" size="mini"
@selection-change="handleSelectionChange2"> @selection-change="handleSelectionChange2"
@select="handleSelection1">
<el-table-column :selectable="selectable" align="center" width="50" type="selection"/> <el-table-column :selectable="selectable" align="center" width="50" type="selection"/>
<!--<el-table-column label="操作" align="center" width="100" fixed="left">--> <!--<el-table-column label="操作" align="center" width="100" fixed="left">-->
<!--<template slot-scope="scope">--> <!--<template slot-scope="scope">-->
<!--<el-button :disabled="parseInt(scope.row.询价状态编号)!==1||parseInt(scope.row.是否确认)!==1" type="primary" size="mini" @click="partChange(scope.row)">零件变更</el-button>--> <!--<el-button :disabled="parseInt(scope.row.询价状态编号)!==1||parseInt(scope.row.是否确认)!==1" type="primary" size="mini" @click="partChange(scope.row)">零件变更</el-button>-->
<!--</template>--> <!--</template>-->
<!--</el-table-column>--> <!--</el-table-column>-->
<el-table-column label="采购状态" align="center" width="80"> <!--<el-table-column label="采购状态" align="center" width="80">-->
<template slot-scope="scope"> <!--<template slot-scope="scope">-->
<el-tag v-if="unInquiry(scope.row)" type="warning" size="small">未询价</el-tag> <!--<el-tag v-if="unInquiry(scope.row)" type="warning" size="small">未询价</el-tag>-->
<el-tag v-if="inquiry(scope.row)" type="success" size="small">已询价</el-tag> <!--<el-tag v-if="inquiry(scope.row)" type="success" size="small">已询价</el-tag>-->
<el-tag v-if="approval(scope.row)" type="primary" size="small">审批中</el-tag> <!--<el-tag v-if="approval(scope.row)" type="primary" size="small">审批中</el-tag>-->
<el-tag v-if="purchased(scope.row)" type="info" size="small">已采购</el-tag> <!--<el-tag v-if="purchased(scope.row)" type="info" size="small">已采购</el-tag>-->
</template> <!--</template>-->
</el-table-column> <!--</el-table-column>-->
<el-table-column :filters="supplierFilters" :filter-method="filterHandler" label="供货商" align="center" min-width="100" prop="供货商"> <el-table-column :filters="supplierFilters" :filter-method="filterHandler" label="供货商" align="center" min-width="100" prop="供货商">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.供货商 }} {{ scope.row.供货商 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :filters="remarkFilters" :filter-method="filterHandler0" label="备注" align="center" min-width="100" prop="备注">
<template slot-scope="scope">
{{ scope.row.备注 }}
</template>
</el-table-column>
<el-table-column label="图号" align="center" min-width="130"> <el-table-column label="图号" align="center" min-width="130">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.零件图号 }} {{ scope.row.零件图号 }}
@@ -371,11 +385,6 @@
{{ scope.row.零件数量 }} {{ scope.row.零件数量 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :filters="remarkFilters" :filter-method="filterHandler0" label="备注" align="center" min-width="100" prop="备注">
<template slot-scope="scope">
{{ scope.row.备注 }}
</template>
</el-table-column>
<el-table-column label="分配时间" align="center" min-width="100"> <el-table-column label="分配时间" align="center" min-width="100">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.任务分配时间.split(' ')[0] }} {{ scope.row.任务分配时间.split(' ')[0] }}
@@ -386,12 +395,12 @@
{{ scope.row.组件设计者 || scope.row.机床设计者 || '—' }} {{ scope.row.组件设计者 || scope.row.机床设计者 || '—' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="询价单编号" align="center" min-width="100"> <!--<el-table-column label="询价单编号" align="center" min-width="100">-->
<template slot-scope="scope"> <!--<template slot-scope="scope">-->
<b v-if="inquiry(scope.row)">{{ scope.row.询价单编号 }}</b> <!--<b v-if="inquiry(scope.row)">{{ scope.row.询价单编号 }}</b>-->
<b v-else>—</b> <!--<b v-else>—</b>-->
</template> <!--</template>-->
</el-table-column> <!--</el-table-column>-->
</el-table> </el-table>
</el-row> </el-row>
<div class="block"> <div class="block">
@@ -400,10 +409,17 @@
:page-sizes="[10, 50, 100, 150]" :page-sizes="[10, 50, 100, 150]"
:page-size="pageSize12" :page-size="pageSize12"
:total="total12" :total="total12"
style="display:inline-block;width:50%" style="display:inline-block;width:50px"
layout="total, sizes, prev, pager, next, jumper" layout="total"
@size-change="handleSizeChange12" @size-change="handleSizeChange12"
@current-change="handleCurrentChange12"/> @current-change="handleCurrentChange12"/>
<el-tooltip :open-delay="1000" effect="dark" content="为选择的询价单添加物料" placement="top">
<el-button
type="warning"
size="small"
style="margin: 0px 20px"
@click="addInquirySheet">选入物料</el-button>
</el-tooltip>
</div> </div>
</el-tab-pane> </el-tab-pane>
<!--<el-tab-pane v-show="false" label="标准件" name="标准件">--> <!--<el-tab-pane v-show="false" label="标准件" name="标准件">-->
@@ -592,39 +608,24 @@
<el-card> <el-card>
<el-card style="width: 1188px"> <el-card style="width: 1188px">
<el-row> <el-row>
<el-input v-model="inquirySheetNum" placeholder="询价单号" size="small" clearable/> <el-input v-model="inquirySheetNum" placeholder="询价单号或供应商" size="small" clearable @keyup.enter.native="pageCurrent2=1;pageSize2=10000;total2=0;searchTable2()"/>
<el-input v-model="supplierName" placeholder="供应商" size="small" style="margin: 0px 10px" clearable/>
<el-button <el-button
type="success" type="success"
size="small" size="mini"
icon="el-icon-search" icon="el-icon-search"
style="margin:0px 10px" style="margin:0px 10px"
@click="pageCurrent2=1;pageSize2=10000;total2=0;searchTable2()">查询</el-button> @click="pageCurrent2=1;pageSize2=10000;total2=0;searchTable2()">查询</el-button>
<el-tooltip :open-delay="1000" effect="dark" content="为选择的询价单添加物料" placement="top">
<el-button
type="warning"
size="small"
style="margin: 0px 20px"
@click="addInquirySheet">选入物料</el-button>
</el-tooltip>
<el-button <el-button
type="primary" type="primary"
size="small" icon="el-icon-circle-plus-outline"
style="float: right;margin:0px 10px" size="mini"
@click="createInquirySheet">创建询价单</el-button> style="margin-left: 10px"
</el-row> @click="createInquirySheet">创建</el-button>
<el-row style="margin-top: 5px;"> <el-button type="warning" size="mini" plain icon="el-icon-edit" style="margin-left: 10px" @click="editInquirySheet()">编辑</el-button>
<h3 style="margin: 0px 30px;display:inline-block; ">询价单</h3> <el-button type="danger" size="mini" plain icon="el-icon-delete" style="margin-left: 10px" @click="deleteInquirySheet()">删除</el-button>
<el-button type="warning" size="mini" plain icon="el-icon-edit" style="margin: 0px 20px" @click="editInquirySheet()">编辑</el-button>
<el-button type="danger" size="mini" plain icon="el-icon-delete" style="margin: 0px 60px 0px 20px" @click="deleteInquirySheet()">删除</el-button>
<!--<h3 style="margin: 0px 40px;display:inline-block;">询价单明细</h3>-->
<el-button :disabled="tableData3.length===0" type="primary" size="small" plain style="float: right" @click="printInquirySheet()">打印</el-button> <el-button :disabled="tableData3.length===0" type="primary" size="small" plain style="float: right" @click="printInquirySheet()">打印</el-button>
<el-button :disabled="tableData3.length===0" type="warning" size="small" style="margin-left:10px;float: right" @click="exportInquirySheet()">导出</el-button> <el-button :disabled="tableData3.length===0" type="warning" size="small" style="margin-left:10px;float: right" @click="exportInquirySheet()">导出</el-button>
<el-tooltip :open-delay="1000" effect="dark" content="保存该询价单" placement="top" style="float: right">
<el-button :disabled="tableData3.length===0" type="success" size="small" @click="saveOrder()">保存</el-button>
</el-tooltip>
</el-row> </el-row>
<!--<el-button :loading="baseInfoLoading" type="success" size="mini" style="float: right" plain @click="inquirySheetBaseInfoMaintain">信息维护</el-button>-->
</el-card> </el-card>
<el-row> <el-row>
<el-col style="width:310px"> <el-col style="width:310px">
@@ -729,7 +730,7 @@
</el-table-column> </el-table-column>
<el-table-column label="实询数" align="center" width="110"> <el-table-column label="实询数" align="center" width="110">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-direction="{x: 0, y: scope.$index}" v-model="scope.row.数量" size="mini" style="width: 75px"/> <el-input v-direction="{x: 0, y: scope.$index}" v-model="scope.row.数量" size="mini" style="width: 75px" @change="saveOrder(scope.row)"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="单位" align="center" width="50"> <el-table-column label="单位" align="center" width="50">
@@ -739,7 +740,7 @@
</el-table-column> </el-table-column>
<el-table-column label="询价备注" align="center" width="110"> <el-table-column label="询价备注" align="center" width="110">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-direction="{x: 1, y: scope.$index}" v-model="scope.row.备注" size="mini" style="width: 75px"/> <el-input v-direction="{x: 1, y: scope.$index}" v-model="scope.row.备注" size="mini" style="width: 75px" @change="saveOrder(scope.row)"/>
</template> </template>
</el-table-column> </el-table-column>
<!-- <el-table-column label="询价单编号" align="center" min-width="100">--> <!-- <el-table-column label="询价单编号" align="center" min-width="100">-->
@@ -1180,11 +1181,11 @@ export default {
tableData11: [], // 外购件列表 tableData11: [], // 外购件列表
total11: 0, total11: 0,
pageCurrent11: 1, pageCurrent11: 1,
pageSize11: 100, pageSize11: 1000,
tableData12: [], // 基本件列表 tableData12: [], // 基本件列表
total12: 0, total12: 0,
pageCurrent12: 1, pageCurrent12: 1,
pageSize12: 100, pageSize12: 1000,
tableData13: [], // 外购件列表 tableData13: [], // 外购件列表
total13: 0, total13: 0,
pageCurrent13: 1, pageCurrent13: 1,
@@ -1197,6 +1198,7 @@ export default {
pageSize2: 10000, pageSize2: 10000,
tableData3: [], // 询价单明细 tableData3: [], // 询价单明细
dialogVisible1: false, dialogVisible1: false,
visible1: false,
inquirySheetNum: '', // 询价单号 inquirySheetNum: '', // 询价单号
inquirySheetFlowNum: '', // 询价单流水号 inquirySheetFlowNum: '', // 询价单流水号
form1: {}, form1: {},
@@ -1265,6 +1267,8 @@ export default {
cancelNum: 0, cancelNum: 0,
machines1: [], machines1: [],
machines2: [], machines2: [],
numbers: [],
numbers1: [],
row1: '' row1: ''
} }
}, },
@@ -1312,6 +1316,30 @@ export default {
this.searchTable11() this.searchTable11()
}) })
}, },
handleSelection(val, row) {
this.tableData11.forEach((item, i) => {
if (item.组件零件流水号 === row.组件零件流水号) {
console.log(this.numbers.indexOf(i), 234)
if (this.numbers.indexOf(i) === -1) {
this.numbers.push(i)
} else {
this.numbers.splice(this.numbers.indexOf(i), 1)
}
}
})
},
handleSelection1(val, row) {
this.tableData12.forEach((item, i) => {
if (item.组件零件基本件流水号 === row.组件零件基本件流水号) {
console.log(this.numbers1.indexOf(i), 234)
if (this.numbers1.indexOf(i) === -1) {
this.numbers1.push(i)
} else {
this.numbers1.splice(this.numbers1.indexOf(i), 1)
}
}
})
},
timeChange1() { timeChange1() {
if (this.startTime) { if (this.startTime) {
timeChange1(this.startTime[0], this.startTime[1]) timeChange1(this.startTime[0], this.startTime[1])
@@ -1689,20 +1717,9 @@ export default {
// this.$message.info('已取消操作') // this.$message.info('已取消操作')
// }) // })
// }, // },
saveOrder() { // 保存询价单 saveOrder(row) { // 保存询价单
const orderNumGroup = [] console.log(row, 1111)
const numGroup = [] saveOrder(row.询价单明细流水号, row.数量, row.备注).then(response => {})
const remarkGroup = []
for (let i = 0; i < this.tableData3.length; i++) {
orderNumGroup.push(this.tableData3[i].询价单明细流水号)
numGroup.push(this.tableData3[i].数量)
remarkGroup.push(this.tableData3[i].备注)
}
saveOrder(orderNumGroup, numGroup, remarkGroup).then(response => {
if (response.data[0].result === '1') {
this.$message.success('保存成功')
} else { this.$message.error('保存失败') }
})
}, },
selectable(row, index) { // 控制某行是否可选 selectable(row, index) { // 控制某行是否可选
return (parseInt(row.询价状态编号) === 1 && parseInt(row.采购状态编号) < 3 && parseInt(row.是否确认) === 1) // 未询价&&未采购&&确认物料修改 return (parseInt(row.询价状态编号) === 1 && parseInt(row.采购状态编号) < 3 && parseInt(row.是否确认) === 1) // 未询价&&未采购&&确认物料修改
@@ -1823,9 +1840,8 @@ export default {
this.searchTable13() this.searchTable13()
}, },
searchTable2() { // 查询询价单列表 searchTable2() { // 查询询价单列表
this.supplierName ? this.check3 = 1 : this.check3 = 0
this.inquirySheetNum ? this.check4 = 1 : this.check4 = 0 this.inquirySheetNum ? this.check4 = 1 : this.check4 = 0
searchCreateInquirySheet(this.pageCurrent2, this.pageSize2, this.check3, this.supplierName, this.check4, this.inquirySheetNum, this.id).then(response => { searchCreateInquirySheet(this.pageCurrent2, this.pageSize2, this.check4, this.inquirySheetNum, this.id).then(response => {
this.tableData2 = response.data.rows this.tableData2 = response.data.rows
this.total2 = response.data.total this.total2 = response.data.total
}) })
@@ -2299,10 +2315,22 @@ export default {
}) })
}, },
tableRowClassName({ row, rowIndex }) { tableRowClassName({ row, rowIndex }) {
if (parseInt(row.是否确认) === 0) { let color = ''
return 'MistyRose' this.numbers.forEach((r, i) => {
} if (rowIndex === r) {
return '' color = 'MistyRose'
}
})
return color
},
tableRowClassName2({ row, rowIndex }) {
let color = ''
this.numbers1.forEach((r, i) => {
if (rowIndex === r) {
color = 'MistyRose'
}
})
return color
} }
} }
} }
@@ -2352,7 +2380,7 @@ export default {
background: Tomato!important; background: Tomato!important;
} }
.el-table .MistyRose { .el-table .MistyRose {
background: MistyRose!important; background: #9BD7FC!important;
} }
.el-table .gray { .el-table .gray {
background: lightgray; background: lightgray;

15
src/views/PurchasingCenter/CreatePurchaseContract/index.vue
View File

@@ -38,8 +38,12 @@
active-value="含税" active-value="含税"
inactive-value="未税"/> inactive-value="未税"/>
</el-tooltip> </el-tooltip>
<el-button v-if="quickChangePrice" size="mini" style="margin: 0px 0 0 10px" @click="quickChangePrice=!quickChangePrice">快速修改价格</el-button>
<el-button v-else size="mini" style="margin: 10px 0 0 10px" @click="quickChangePrice=!quickChangePrice">还原</el-button>
<el-button v-show="isShowN" type="text" style="margin: 10px 0 0 10px" @click="isShowN=false">折叠</el-button>
<el-button v-show="!isShowN" type="text" style="margin: 10px 0 0 10px" @click="isShowN=true">展开其他说明</el-button>
</el-row> </el-row>
<el-row style="margin-top: 10px"> <el-row v-show="isShowN" style="margin-top: 10px">
<!--<span>交货日期:</span>--> <!--<span>交货日期:</span>-->
<el-input v-model="deliveryDate" :disabled="!contractNumValue" size="small" placeholder="交货日期" type="textarea" rows="1" @blur="contractHeaderChange"/> <el-input v-model="deliveryDate" :disabled="!contractNumValue" size="small" placeholder="交货日期" type="textarea" rows="1" @blur="contractHeaderChange"/>
<!--<span>开票信息:</span>--> <!--<span>开票信息:</span>-->
@@ -50,8 +54,6 @@
<el-input v-model="payMethod" :disabled="!contractNumValue" size="small" placeholder="支付方式" type="textarea" rows="1" @blur="contractHeaderChange"/> <el-input v-model="payMethod" :disabled="!contractNumValue" size="small" placeholder="支付方式" type="textarea" rows="1" @blur="contractHeaderChange"/>
<!--<span>其他说明:</span>--> <!--<span>其他说明:</span>-->
<el-input v-model="otherInfo" :disabled="!contractNumValue" size="small" placeholder="其他说明" type="textarea" rows="1" @blur="contractHeaderChange"/> <el-input v-model="otherInfo" :disabled="!contractNumValue" size="small" placeholder="其他说明" type="textarea" rows="1" @blur="contractHeaderChange"/>
<el-button v-if="quickChangePrice" size="mini" style="margin: 0px 0 0 10px" @click="quickChangePrice=!quickChangePrice">快速修改价格</el-button>
<el-button v-else size="mini" style="margin: 10px 0 0 10px" @click="quickChangePrice=!quickChangePrice">还原</el-button>
</el-row> </el-row>
<el-table :data="tableData1" border style="margin: 10px 0;max-height: 480px;" height="480px" size="mini" show-summary tooltip-effect="dark"> <el-table :data="tableData1" border style="margin: 10px 0;max-height: 480px;" height="480px" size="mini" show-summary tooltip-effect="dark">
@@ -171,6 +173,7 @@ export default {
inject: ['reload'], inject: ['reload'],
data() { data() {
return { return {
isShowN: false,
supplierValue11: '', // 供应商查询条件 supplierValue11: '', // 供应商查询条件
supplier11: [], supplier11: [],
quickChangePrice: true, quickChangePrice: true,
@@ -255,7 +258,7 @@ export default {
this.contractNumValue = '' this.contractNumValue = ''
this.tableData1 = [] this.tableData1 = []
if (this.supplierValue11) { this.asdasd = 1 } else { this.asdasd = 0 } if (this.supplierValue11) { this.asdasd = 1 } else { this.asdasd = 0 }
searchInquirySheet(0, 0, 0, 0, 1, this.id, this.asdasd, this.supplierValue11).then(response => { // 初始化询价单号 searchInquirySheet(0, 0, 1, this.id, this.asdasd, this.supplierValue11).then(response => { // 初始化询价单号
this.contractNums = [] this.contractNums = []
for (let i = 0; i < response.data.length; i++) { for (let i = 0; i < response.data.length; i++) {
this.contractNums.push({ this.contractNums.push({
@@ -394,7 +397,7 @@ export default {
this.account2 = res.data[0] ? res.data[0].帐号 : '' this.account2 = res.data[0] ? res.data[0].帐号 : ''
this.bank2 = res.data[0] ? res.data[0].开户行 : '' this.bank2 = res.data[0] ? res.data[0].开户行 : ''
}) })
searchInquirySheet(0, 0, 0, 0, 1, this.id, 0, 0).then(response => { // 初始化询价单号 searchInquirySheet(0, 0, 1, this.id, 0, 0).then(response => { // 初始化询价单号
this.contractNums = [] this.contractNums = []
for (let i = 0; i < response.data.length; i++) { for (let i = 0; i < response.data.length; i++) {
this.contractNums.push({ this.contractNums.push({
@@ -430,7 +433,7 @@ export default {
supplierChange() { supplierChange() {
let check let check
this.supplierValue ? check = 1 : check = 0 this.supplierValue ? check = 1 : check = 0
searchInquirySheet(0, 0, 0, 0, 1, this.id, check, this.supplierValue).then(response => { // 初始化询价单号 searchInquirySheet(0, 0, 1, this.id, check, this.supplierValue).then(response => { // 初始化询价单号
this.contractNums = [] this.contractNums = []
this.contractNumValue = '' this.contractNumValue = ''
for (let i = 0; i < response.data.length; i++) { for (let i = 0; i < response.data.length; i++) {

12
src/views/PurchasingCenter/OfflineContract/index.vue
View File

@@ -165,7 +165,7 @@
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="仓库" name="仓库"> <el-tab-pane label="仓库" name="仓库">
<el-row> <el-row>
<el-input v-model="materialName" style="width: 150px;margin-left: 10px" placeholder="名称规格型号" size="small" clearable @keyup.enter.native="pageCurrent11=1;pageSize11=20;total11=0;searchTable22()"/> <el-input v-model="materialName" style="width: 150px;margin-left: 10px" placeholder="名称规格型号" size="small" clearable @keyup.enter.native="pageCurrent22=1;pageSize22=20;total22=0;searchTable22()"/>
<el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px" @click="searchTable22()">查询</el-button> <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px" @click="searchTable22()">查询</el-button>
</el-row> </el-row>
<el-table <el-table
@@ -1612,13 +1612,13 @@ export default {
}) })
}) })
}, },
handleSizeChange22(val) { // 标准件和外购件列表分页 handleSizeChange22(val) { // 仓库表分页
this.pageSize11 = val this.pageSize22 = val
this.pageCurrent11 = 1 this.pageCurrent22 = 1
this.searchTable22() this.searchTable22()
}, },
handleCurrentChange22(val) { // 标准件和外购件列表分页 handleCurrentChange22(val) { // 仓库表分页
this.pageCurrent11 = val this.pageCurrent22 = val
this.searchTable22() this.searchTable22()
} }
} }

49
src/views/PurchasingCenter/PurchaseContractRequestFund/index.vue
View File

@@ -21,11 +21,6 @@
{{ scope.row.供应商名称 }} {{ scope.row.供应商名称 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="请款时间" prop="请款时间" align="center" min-width="100">
<template slot-scope="scope">
{{ scope.row.请款时间 ? scope.row.请款时间.split(' ')[0] : '-' }}
</template>
</el-table-column>
<el-table-column label="请款人" prop="姓名" align="center" min-width="70" show-overflow-tooltip> <el-table-column label="请款人" prop="姓名" align="center" min-width="70" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.姓名 }} {{ scope.row.姓名 }}
@@ -36,38 +31,43 @@
{{ scope.row.请款金额 }} {{ scope.row.请款金额 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="审核内容" width="80" align="center"> <el-table-column label="请款时间" prop="请款时间" align="center" min-width="100">
<template slot-scope="scope">
{{ scope.row.请款时间 ? scope.row.请款时间.split(' ')[0] : '-' }}
</template>
</el-table-column>
<el-table-column label="审核结果" width="80" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag v-if="Number(scope.row.审核情况流水号)===3" type="primary" size="small">未审核</el-tag> <el-tag v-if="Number(scope.row.审核情况流水号)===3" type="primary" size="small">未审核</el-tag>
<el-tag v-if="Number(scope.row.审核情况流水号)===1" type="success" size="small">已通过</el-tag> <el-tag v-if="Number(scope.row.审核情况流水号)===1" type="success" size="small">已通过</el-tag>
<el-tag v-if="Number(scope.row.审核情况流水号)===2" type="danger" size="small">不通过</el-tag> <el-tag v-if="Number(scope.row.审核情况流水号)===2" type="danger" size="small">不通过</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="未过审核原因" width="100" align="center"> <el-table-column label="审核未过原因" width="100" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.未通过审核原因 === '通过' ? '—' : scope.row.未通过审核原因 }} {{ scope.row.未通过审核原因 === '通过' ? '—' : scope.row.未通过审核原因 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="审批内容" width="70" align="center"> <el-table-column label="审批结果" width="70" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag v-if="Number(scope.row.审批情况流水号)===3" type="primary" size="small">未审批</el-tag> <el-tag v-if="Number(scope.row.审批情况流水号)===3" type="primary" size="small">未审批</el-tag>
<el-tag v-if="Number(scope.row.审批情况流水号)===1" type="success" size="small">已通过</el-tag> <el-tag v-if="Number(scope.row.审批情况流水号)===1" type="success" size="small">已通过</el-tag>
<el-tag v-if="Number(scope.row.审批情况流水号)===2" type="danger" size="small">不通过</el-tag> <el-tag v-if="Number(scope.row.审批情况流水号)===2" type="danger" size="small">不通过</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="未通过审批原因" width="110" align="center"> <el-table-column label="审批未过原因" width="110" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.未通过审批原因 === '通过' ? '—' : scope.row.未通过审批原因 }} {{ scope.row.未通过审批原因 === '通过' ? '—' : scope.row.未通过审批原因 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="付款情况" width="80" align="center"> <el-table-column label="付款结果" width="80" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag v-if="Number(scope.row.付款情况流水号)===3" type="primary" size="small">未操作</el-tag> <el-tag v-if="Number(scope.row.付款情况流水号)===3" type="primary" size="small">未操作</el-tag>
<el-tag v-if="Number(scope.row.付款情况流水号)===1" type="success" size="small">已付款</el-tag> <el-tag v-if="Number(scope.row.付款情况流水号)===1" type="success" size="small">已付款</el-tag>
<el-tag v-if="Number(scope.row.付款情况流水号)===2" type="danger" size="small">不同意</el-tag> <el-tag v-if="Number(scope.row.付款情况流水号)===2" type="danger" size="small">不同意</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="未付款原因" width="100" align="center"> <el-table-column label="未付原因" width="100" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.未付款原因 === '通过' ? '—' : scope.row.未付款原因 }} {{ scope.row.未付款原因 === '通过' ? '—' : scope.row.未付款原因 }}
</template> </template>
@@ -100,6 +100,11 @@
{{ scope.row.采购合同编号 ? scope.row.采购合同编号 : scope.row.离线合同编号 }} {{ scope.row.采购合同编号 ? scope.row.采购合同编号 : scope.row.离线合同编号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="120" align="center" label="合同总额" prop="合同总额">
<template slot-scope="scope">
{{ parseFloat(scope.row.合同总额).toFixed(2) }}
</template>
</el-table-column>
<el-table-column width="120" align="center" label="已付金额" prop="已付金额"> <el-table-column width="120" align="center" label="已付金额" prop="已付金额">
<template slot-scope="scope"> <template slot-scope="scope">
{{ parseFloat(scope.row.已付金额).toFixed(2) }} {{ parseFloat(scope.row.已付金额).toFixed(2) }}
@@ -139,16 +144,16 @@
{{ scope.row.合同类型 === 1 ? scope.row.已到货数量 : scope.row.到货数量 }} {{ scope.row.合同类型 === 1 ? scope.row.已到货数量 : scope.row.到货数量 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="合计" align="center" min-width="100" prop="合计"> <!--<el-table-column label="合计" align="center" min-width="100" prop="合计">-->
<template slot-scope="scope"> <!--<template slot-scope="scope">-->
{{ (parseFloat(scope.row.单价||0) * parseInt(scope.row.数量||0)).toFixed(2) }} <!--{{ (parseFloat(scope.row.单价||0) * parseInt(scope.row.数量||0)).toFixed(2) }}-->
</template> <!--</template>-->
</el-table-column> <!--</el-table-column>-->
<el-table-column label="单价" align="center" min-width="100" prop="单价"> <!--<el-table-column label="单价" align="center" min-width="100" prop="单价">-->
<template slot-scope="scope"> <!--<template slot-scope="scope">-->
{{ parseFloat(scope.row.单价||0).toFixed(2) }} <!--{{ parseFloat(scope.row.单价||0).toFixed(2) }}-->
</template> <!--</template>-->
</el-table-column> <!--</el-table-column>-->
<el-table-column label="交货期要求" align="center" min-width="100" prop="交货期要求"> <el-table-column label="交货期要求" align="center" min-width="100" prop="交货期要求">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.合同类型 === 1 ? scope.row.交货期.split(' ')[0] === '1900-01-01' ? '-' : scope.row.交货期.split(' ')[0] : scope.row.交货期要求 }} {{ scope.row.合同类型 === 1 ? scope.row.交货期.split(' ')[0] === '1900-01-01' ? '-' : scope.row.交货期.split(' ')[0] : scope.row.交货期要求 }}
@@ -370,7 +375,7 @@ export default {
if (index === 0) { if (index === 0) {
sums[index] = '总价' sums[index] = '总价'
return return
} else if (index === 2 || index === 3) { } else if (index === 2 || index === 3 || index === 1) {
const values = data.map(item => Number(item[column.property])) const values = data.map(item => Number(item[column.property]))
if (!values.every(value => isNaN(value))) { if (!values.every(value => isNaN(value))) {
sums[index] = values.reduce((prev, curr) => { sums[index] = values.reduce((prev, curr) => {