Merge branch 'master' of http://123.56.95.229:10010/r/高精
This commit is contained in:
@@ -13,7 +13,6 @@
|
||||
</el-option>
|
||||
</el-select>
|
||||
<el-input v-model="contractName" placeholder="合同名称" style="width: 120px" size="small"/>
|
||||
<!-- <el-input v-model="supplierName" size="small" placeholder="请双击选择供应商" readonly clearable @dblclick.native="dialogVisible1=true;submitDisable=true" @clear="emptySupplierDetail"/>-->
|
||||
<el-select v-model="supplierValue" placeholder="选择供应商" filterable style="width: 220px" size="small" clearable>
|
||||
<el-option
|
||||
v-for="item in supplierValues"
|
||||
@@ -29,13 +28,6 @@
|
||||
:label="item.label"
|
||||
:value="item.value"/>
|
||||
</el-select>
|
||||
<!-- <el-date-picker-->
|
||||
<!-- v-model="stipulateArrivalTime"-->
|
||||
<!-- size="small"-->
|
||||
<!-- type="date"-->
|
||||
<!-- format="yyyy-MM-dd"-->
|
||||
<!-- value-format="yyyy-MM-dd"-->
|
||||
<!-- placeholder="规定到货时间"/>-->
|
||||
<el-input v-model="name" placeholder="采购员" style="width: 120px" size="small" readonly/>
|
||||
<el-input v-model="taxRate" placeholder="税率" style="width: 100px" size="small"/>
|
||||
<el-button v-show="contractNumType===0" type="primary" plain size="small" @click="linkGroup">成组采购</el-button>
|
||||
@@ -162,11 +154,7 @@
|
||||
:label="item.label"
|
||||
:value="item.value"/>
|
||||
</el-select>
|
||||
<el-button
|
||||
type="distribution"
|
||||
size="small"
|
||||
style="margin-left: 7.5%; margin-top: 10px"
|
||||
@click="doneContract">生成采购合同</el-button>
|
||||
<el-button v-positive="'loading'" :disabled="false" type="distribution" size="small" style="margin-left: 7.5%; margin-top: 10px" @click="doneContract">生成采购合同</el-button>
|
||||
</el-card>
|
||||
|
||||
<el-dialog v-el-drag-dialog :visible.sync="dialogVisible1" title="供应商选择" center style="min-height: 300px">
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
<el-button type="primary" size="small" icon="el-icon-search" plain style="margin-left: 10px" @click="pageCurrent1=1;pageSize1=10;total1=0;searchTable1()">查询</el-button>
|
||||
</el-tooltip>
|
||||
<el-tooltip :open-delay="1200" effect="dark" content="将零件打回重新分配备料计划" placement="top">
|
||||
<el-button type="danger" size="small" icon="el-icon-download" plain style="margin-left: 10px;float: right;" @click="back">打回重新分配</el-button>
|
||||
<el-button v-positive="'loading'" :disabled="false" type="danger" size="small" icon="el-icon-download" plain style="margin-left: 10px;float: right;" @click="back">打回重新分配</el-button>
|
||||
</el-tooltip>
|
||||
<el-table
|
||||
v-loading="loading1"
|
||||
@@ -82,10 +82,10 @@
|
||||
<!--<el-input v-model="purchasingOrder" placeholder="采购计划单号" size="small" style="margin: 3px 0;width: 155px" clearable @keyup.enter.native="pageCurrent2=1;pageSize2=10;total2=0;searchTable2()"/>-->
|
||||
<el-button class="button111" size="small" icon="el-icon-circle-plus-outline" style="margin-left: 10px" @click="addPurchaseOrder">外购备料</el-button>
|
||||
<el-tooltip :open-delay="1200" effect="dark" content="向选择的采购计划里添加采购零件" placement="top">
|
||||
<el-button :disabled="Number(采购计划状态)===3 || Number(采购计划状态)===4" type="primary" plain size="small" icon="el-icon-download" style="margin-left: 10px" @click="addMateriel">选入</el-button>
|
||||
<el-button v-positive="'loading'" :disabled="Number(采购计划状态)===3 || Number(采购计划状态)===4" type="primary" plain size="small" icon="el-icon-download" style="margin-left: 10px" @click="addMateriel">选入</el-button>
|
||||
</el-tooltip>
|
||||
<el-tooltip :open-delay="1200" effect="dark" content="保存选中的采购计划单" placement="top">
|
||||
<el-button :disabled="Number(采购计划状态)===3 || Number(采购计划状态)===4" type="success" size="small" icon="el-icon-tickets" plain style="margin-top: 3px;margin-left: 10px" @click="saveMateriel">保存</el-button>
|
||||
<el-button v-positive="'loading'" :disabled="Number(采购计划状态)===3 || Number(采购计划状态)===4" type="success" size="small" icon="el-icon-tickets" plain style="margin-top: 3px;margin-left: 10px" @click="saveMateriel">保存</el-button>
|
||||
</el-tooltip>
|
||||
<el-select v-model="supplierName0" placeholder="供应商" style="width: 220px;margin-left: 10px" size="small" filterable clearable @change="pageCurrent2=1;pageSize2=10;total2=0;searchTable2()">
|
||||
<el-option
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
end-placeholder="结束日期"/>
|
||||
<el-button type="primary" plain size="small" icon="el-icon-search" style="margin-left: 10px" @click="searchTable4()">查询</el-button>
|
||||
<el-button class="button111" size="small" icon="el-icon-plus" style="margin-left: 10px" @click="addArrivalOrder">到货单</el-button>
|
||||
<el-button type="success" plain size="small" icon="el-icon-download" style="margin-left:10px" @click="downloadExcel()">导出</el-button>
|
||||
<el-button v-positive="'loading'" :disabled="false" type="success" plain size="small" icon="el-icon-download" style="margin-left:10px" @click="downloadExcel()">导出</el-button>
|
||||
</div>
|
||||
</el-card>
|
||||
<el-card style="width: 650px;margin-left: 0px;display: inline-block">
|
||||
@@ -195,321 +195,267 @@
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</el-card>
|
||||
|
||||
<el-dialog v-el-drag-dialog :title="title" :visible.sync="dialogVisible" center style="min-height: 400px" width="360px">
|
||||
<el-form ref="form" :model="form" :rules="rules" label-position="right" label-width="80px">
|
||||
<el-form-item label="到货单号">
|
||||
<el-input v-model="NewOrder" style="width: 180px" size="small" disabled/>
|
||||
</el-form-item>
|
||||
<el-form-item label="供应商" prop="supplierNameValue">
|
||||
<el-select v-show="title==='新增到货单'" v-model="form.supplierNameValue" placeholder="供应商" style="width: 180px" size="small" filterable @change="searchTable20()">
|
||||
</div>
|
||||
<el-dialog v-el-drag-dialog :title="title" :visible.sync="dialogVisible" center style="min-height: 400px" width="360px">
|
||||
<el-form ref="form" :model="form" :rules="rules" label-position="right" label-width="80px">
|
||||
<el-form-item label="到货单号">
|
||||
<el-input v-model="NewOrder" style="width: 180px" size="small" disabled/>
|
||||
</el-form-item>
|
||||
<el-form-item label="供应商" prop="supplierNameValue">
|
||||
<el-select v-show="title==='新增到货单'" v-model="form.supplierNameValue" placeholder="供应商" style="width: 180px" size="small" filterable @change="searchTable20()">
|
||||
<el-option
|
||||
v-for="item in supplierNames"
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
:value="item.value"/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="到货日期" prop="invoiceTime">
|
||||
<el-date-picker v-model="form.日期" size="small" type="date" value-format="yyyy-MM-dd" style="width: 180px" format="yyyy-MM-dd" placeholder="选择日期"/>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<div slot="footer" class="dialog-footer">
|
||||
<el-button
|
||||
v-show="title==='新增到货单'"
|
||||
:disabled="addArrivalOrder_disable"
|
||||
type="primary"
|
||||
size="small"
|
||||
icon="el-icon-check"
|
||||
@click="submitAddArrivalOrder">保存</el-button>
|
||||
<el-button
|
||||
v-show="title==='编辑到货单'"
|
||||
:disabled="addArrivalOrder_disable"
|
||||
type="primary"
|
||||
size="small"
|
||||
icon="el-icon-check"
|
||||
@click="submitEditArrivalOrder">确定</el-button>
|
||||
</div>
|
||||
</el-dialog>
|
||||
<el-dialog v-el-drag-dialog :visible.sync="dialogVisible10" title="添加到货明细" center style="min-height: 200px" width="1600px">
|
||||
<el-form ref="form10" :model="form10" :rules="rules10" label-position="right" label-width="60px">
|
||||
<el-row style="background-color: white">
|
||||
<el-col :span="5" style="margin-left: 2%">
|
||||
<span>供应商</span>
|
||||
<el-input v-model="供应商名称" style="width: 250px" size="small" readonly/>
|
||||
</el-col>
|
||||
<el-col :span="4">
|
||||
<span>到货单编号</span>
|
||||
<el-input v-model="到货单编号" style="width: 150px" size="small" readonly/>
|
||||
</el-col>
|
||||
<el-col :span="4">
|
||||
<span>计划类型</span>
|
||||
<el-select v-model="planType" placeholder="计划类型" size="small" style="width: 150px" filterable @change="searchTable20()">
|
||||
<el-option
|
||||
v-for="item in supplierNames"
|
||||
v-for="item in planTypes"
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
:value="item.value"/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="到货日期" prop="invoiceTime">
|
||||
<el-date-picker v-model="form.日期" size="small" type="date" value-format="yyyy-MM-dd" style="width: 180px" format="yyyy-MM-dd" placeholder="选择日期"/>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<div slot="footer" class="dialog-footer">
|
||||
<el-button
|
||||
v-show="title==='新增到货单'"
|
||||
:disabled="addArrivalOrder_disable"
|
||||
type="primary"
|
||||
size="small"
|
||||
icon="el-icon-check"
|
||||
@click="submitAddArrivalOrder">保存</el-button>
|
||||
<el-button
|
||||
v-show="title==='编辑到货单'"
|
||||
:disabled="addArrivalOrder_disable"
|
||||
type="primary"
|
||||
size="small"
|
||||
icon="el-icon-check"
|
||||
@click="submitEditArrivalOrder">确定</el-button>
|
||||
</div>
|
||||
</el-dialog>
|
||||
<el-dialog v-el-drag-dialog :visible.sync="dialogVisible10" title="添加到货明细" center style="min-height: 200px" width="1600px">
|
||||
<el-form ref="form10" :model="form10" :rules="rules10" label-position="right" label-width="60px">
|
||||
<el-row style="background-color: white">
|
||||
<el-col :span="5" style="margin-left: 2%">
|
||||
<span>供应商</span>
|
||||
<el-input v-model="供应商名称" style="width: 250px" size="small" readonly/>
|
||||
</el-col>
|
||||
<el-col :span="4">
|
||||
<span>到货单编号</span>
|
||||
<el-input v-model="到货单编号" style="width: 150px" size="small" readonly/>
|
||||
</el-col>
|
||||
<el-col :span="4">
|
||||
<span>计划类型</span>
|
||||
<el-select v-model="planType" placeholder="计划类型" size="small" style="width: 150px" filterable @change="searchTable20()">
|
||||
<el-option
|
||||
v-for="item in planTypes"
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
:value="item.value"/>
|
||||
</el-select>
|
||||
</el-col>
|
||||
<el-col :span="4">
|
||||
<span>零件图号</span>
|
||||
<el-input v-model="零件图号" style="width: 150px" size="small" clearable/>
|
||||
</el-col>
|
||||
<el-col :span="2">
|
||||
<el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px" @click="searchTable20()">查询</el-button>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<div style="width: 20%;float: left;margin-top: 20px">
|
||||
<div style="background: white">
|
||||
<el-row style="height: 50px">
|
||||
<el-form-item label="材料" prop="CailiaoValue">
|
||||
<el-input v-model="form10.CailiaoValue" size="small"/>
|
||||
</el-form-item>
|
||||
</el-row>
|
||||
<el-row style="height: 50px">
|
||||
<el-form-item label="重量" prop="数量">
|
||||
<el-input-number v-model="form10.数量" :precision="2" :step="1" :min="0" size="medium" @change="Calculation"/>
|
||||
</el-form-item>
|
||||
</el-row>
|
||||
<el-row style="height: 50px">
|
||||
<el-form-item label="单价" prop="单价">
|
||||
<el-input-number v-model="form10.单价" :precision="2" :step="1" :min="0" size="medium" @change="Calculation"/>
|
||||
</el-form-item>
|
||||
</el-row>
|
||||
<el-row style="height: 50px">
|
||||
<el-form-item label="单位" prop="单位">
|
||||
<el-input v-model="form10.单位" size="small"/>
|
||||
</el-form-item>
|
||||
</el-row>
|
||||
<el-row style="height: 50px">
|
||||
<el-form-item label="金额(元)" prop="金额">
|
||||
<el-input-number v-model="form10.金额" :precision="2" :step="1" size="medium" disabled/>
|
||||
</el-form-item>
|
||||
</el-row>
|
||||
</div>
|
||||
<div>
|
||||
<el-button type="primary" size="small" style="margin-left: 40%;margin-top: 10px" @click="submitAddArrivalOrderMX">确定</el-button>
|
||||
</div>
|
||||
</el-col>
|
||||
<el-col :span="4">
|
||||
<span>零件图号</span>
|
||||
<el-input v-model="零件图号" style="width: 150px" size="small" clearable/>
|
||||
</el-col>
|
||||
<el-col :span="2">
|
||||
<el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px" @click="searchTable20()">查询</el-button>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<div style="width: 20%;float: left;margin-top: 20px">
|
||||
<div style="background: white">
|
||||
<el-row style="height: 50px">
|
||||
<el-form-item label="材料" prop="CailiaoValue">
|
||||
<el-input v-model="form10.CailiaoValue" size="small"/>
|
||||
</el-form-item>
|
||||
</el-row>
|
||||
<el-row style="height: 50px">
|
||||
<el-form-item label="重量" prop="数量">
|
||||
<el-input-number v-model="form10.数量" :precision="2" :step="1" :min="0" size="medium" @change="Calculation"/>
|
||||
</el-form-item>
|
||||
</el-row>
|
||||
<el-row style="height: 50px">
|
||||
<el-form-item label="单价" prop="单价">
|
||||
<el-input-number v-model="form10.单价" :precision="2" :step="1" :min="0" size="medium" @change="Calculation"/>
|
||||
</el-form-item>
|
||||
</el-row>
|
||||
<el-row style="height: 50px">
|
||||
<el-form-item label="单位" prop="单位">
|
||||
<el-input v-model="form10.单位" size="small"/>
|
||||
</el-form-item>
|
||||
</el-row>
|
||||
<el-row style="height: 50px">
|
||||
<el-form-item label="金额(元)" prop="金额">
|
||||
<el-input-number v-model="form10.金额" :precision="2" :step="1" size="medium" disabled/>
|
||||
</el-form-item>
|
||||
</el-row>
|
||||
</div>
|
||||
<div style="width: 79%;float: left;margin-left: 10px">
|
||||
<el-table
|
||||
ref="multipleTable"
|
||||
:row-key="getRowKeys"
|
||||
:summary-method="getSummaries2"
|
||||
:data="tableData20"
|
||||
border
|
||||
show-summary
|
||||
highlight-current-row
|
||||
stripe
|
||||
style="margin: 3px 0"
|
||||
height="350px"
|
||||
size="mini"
|
||||
@selection-change="handleSelectionChange">
|
||||
<el-table-column :reserve-selection="true" type="selection" width="50" align="center"/>
|
||||
<el-table-column label="采购单号" align="center" width="120">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.采购单号 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="物料编码" align="center" width="150">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.物料零件编码 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="零件名称" align="center" width="110px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.零件名称 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="材料" align="center" width="90px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.材料 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="备料数" align="center" width="65px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.采购数量 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="已到数" align="center" width="65px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.到货数量 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="到货件数" align="center" width="120px">
|
||||
<template slot-scope="scope">
|
||||
<el-input-number v-model="scope.row.未到货数量" :disabled="disable === '1'" :max="scope.row.采购数量-parseInt(scope.row.到货数量)" :step="1" :min="1" size="mini" style="width:100%" @change="saveData(scope.row)"/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="到货重量(KG)" align="center" width="150px" prop="到货重量">
|
||||
<template slot-scope="scope">
|
||||
<el-input-number v-model="scope.row.到货重量" :disabled="disable === '1'" :step="1" :min="0.00" size="mini" style="width:100%" @change="saveData(scope.row)"/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="成品尺寸(长、宽、高)" align="center" width="170px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.成品尺寸 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<!--<el-table-column label="单位" align="center" width="60px">-->
|
||||
<!--<template slot-scope="scope">-->
|
||||
<!--{{ scope.row.单位 ? scope.row.单位 : '-' }}-->
|
||||
<!--</template>-->
|
||||
<!--</el-table-column>-->
|
||||
<el-table-column label="备注" align="center">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.备注1 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<div>
|
||||
<el-button type="primary" size="small" style="margin-left: 40%;margin-top: 10px" @click="submitAddArrivalOrderMX">确定</el-button>
|
||||
</div>
|
||||
</el-row>
|
||||
</el-form>
|
||||
</el-dialog>
|
||||
|
||||
<!--<el-dialog v-el-drag-dialog :title="title1" :visible.sync="dialogVisible1" center style="min-height: 200px" width="430px">-->
|
||||
<!--<el-form ref="form1" :model="form1" :rules="rules1" label-position="right" label-width="120px">-->
|
||||
<!--<el-row>-->
|
||||
<!--<el-form-item v-show="title1==='添加到货明细'" label="材料" prop="CailiaoValue">-->
|
||||
<!--<el-input v-model="form1.CailiaoValue" size="small"/>-->
|
||||
<!--</el-form-item>-->
|
||||
<!--</el-row>-->
|
||||
<!--<el-row>-->
|
||||
<!--<el-form-item label="数量" prop="数量">-->
|
||||
<!--<el-input-number v-model="form1.数量" :precision="2" :step="1" :min="0" size="medium" @change="Calculation"/>-->
|
||||
<!--</el-form-item>-->
|
||||
<!--</el-row>-->
|
||||
<!--<el-row>-->
|
||||
<!--<el-form-item label="单价" prop="单价">-->
|
||||
<!--<el-input-number v-model="form1.单价" :precision="2" :step="1" :min="0" size="medium" @change="Calculation"/>-->
|
||||
<!--</el-form-item>-->
|
||||
<!--</el-row>-->
|
||||
<!--<el-row>-->
|
||||
<!--<el-form-item label="单位" prop="单位">-->
|
||||
<!--<el-input v-model="form1.单位" size="small"/>-->
|
||||
<!--</el-form-item>-->
|
||||
<!--</el-row>-->
|
||||
<!--<el-row>-->
|
||||
<!--<el-form-item label="金额" prop="金额">-->
|
||||
<!--<el-input-number v-model="form1.金额" :precision="2" :step="1" size="medium"/>-->
|
||||
<!--</el-form-item>-->
|
||||
<!--</el-row>-->
|
||||
<!--</el-form>-->
|
||||
<!--<div slot="footer" class="dialog-footer">-->
|
||||
<!--<el-button-->
|
||||
<!--v-show="title1==='添加到货明细'"-->
|
||||
<!--type="warning"-->
|
||||
<!--size="small"-->
|
||||
<!--plain-->
|
||||
<!--icon="el-icon-check"-->
|
||||
<!--@click="submitAddArrivalOrderMX">保存</el-button>-->
|
||||
<!--<el-button-->
|
||||
<!--v-show="title1==='添加到货明细'"-->
|
||||
<!--type="primary"-->
|
||||
<!--plain-->
|
||||
<!--size="small"-->
|
||||
<!--icon="el-icon-check"-->
|
||||
<!--@click="submitAddArrivalOrderMX1">继续添加</el-button>-->
|
||||
<!--<el-button-->
|
||||
<!--v-show="title1==='编辑到货明细'"-->
|
||||
<!--type="primary"-->
|
||||
<!--size="small"-->
|
||||
<!--icon="el-icon-check"-->
|
||||
<!--@click="submitEditArrivalOrderMX">确定</el-button>-->
|
||||
<!--</div>-->
|
||||
<!--</el-dialog>-->
|
||||
|
||||
<el-dialog v-el-drag-dialog :visible.sync="dialogVisible2" title="关联备料材料" center style="min-height: 550px" width="1400px">
|
||||
<span>计划类型</span>
|
||||
<el-select v-model="planType" placeholder="计划类型" size="small" style="width: 150px" filterable @change="searchTable20()">
|
||||
<el-option
|
||||
v-for="item in planTypes"
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
:value="item.value"/>
|
||||
</el-select>
|
||||
<span>零件图号</span>
|
||||
<el-input v-model="零件图号" style="width: 150px" size="small" clearable/>
|
||||
<el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px" @click="searchTable20()">查询</el-button>
|
||||
<span style="margin-left: 20px">未绑定重量:{{ 未绑定数量 }}KG</span>
|
||||
<el-table
|
||||
ref="multipleTable"
|
||||
:row-key="getRowKeys"
|
||||
:summary-method="getSummaries3"
|
||||
:row-selection="{selectedRowKeys: selectedRowKeys}"
|
||||
:data="tableData20"
|
||||
border
|
||||
show-summary
|
||||
highlight-current-row
|
||||
stripe
|
||||
style="margin: 3px 0"
|
||||
height="300px"
|
||||
size="mini"
|
||||
@selection-change="handleSelectionChange1">
|
||||
<el-table-column :reserve-selection="mark" type="selection" width="50" align="center"/>
|
||||
<el-table-column label="采购单号" align="center" width="120">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.采购单号 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="物料编码" align="center" width="150">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.物料零件编码 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="零件名称" align="center" width="90px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.零件名称 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="材料" align="center" width="70px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.材料 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="备料数" align="center" width="70px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.采购数量 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="已到数" align="center" width="70px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.到货数量 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="到货件数" align="center" width="120px">
|
||||
<template slot-scope="scope">
|
||||
<el-input-number v-model="scope.row.未到货数量" :disabled="disable === '1'" :max="scope.row.采购数量-parseInt(scope.row.到货数量)" :step="1" :min="1" size="mini" style="width:95px" @change="saveData(scope.row)"/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="到货重量(KG)" align="center" width="150px">
|
||||
<template slot-scope="scope">
|
||||
<el-input-number v-model="scope.row.到货重量" :disabled="disable === '1'" :step="1" :min="0" size="mini" style="width:100%" @change="saveData(scope.row)"/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="成品尺寸(长、宽、高)" align="center">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.成品尺寸 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="单位" align="center" width="60px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.单位 ? scope.row.单位 : '-' }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="备注" align="center">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.备注1 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<div slot="footer" class="dialog-footer">
|
||||
<el-button type="primary" size="small" icon="el-icon-download" style="margin-left: 10px" @click="addMateriel">关联备料材料</el-button>
|
||||
</div>
|
||||
</el-dialog>
|
||||
</div>
|
||||
</div>
|
||||
<div style="width: 79%;float: left;margin-left: 10px">
|
||||
<el-table
|
||||
ref="multipleTable"
|
||||
:row-key="getRowKeys"
|
||||
:summary-method="getSummaries2"
|
||||
:data="tableData20"
|
||||
border
|
||||
show-summary
|
||||
highlight-current-row
|
||||
stripe
|
||||
style="margin: 3px 0"
|
||||
height="350px"
|
||||
size="mini"
|
||||
@selection-change="handleSelectionChange">
|
||||
<el-table-column :reserve-selection="true" type="selection" width="50" align="center"/>
|
||||
<el-table-column label="采购单号" align="center" width="120">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.采购单号 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="物料编码" align="center" width="150">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.物料零件编码 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="零件名称" align="center" width="110px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.零件名称 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="材料" align="center" width="90px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.材料 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="备料数" align="center" width="65px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.采购数量 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="已到数" align="center" width="65px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.到货数量 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="到货件数" align="center" width="120px">
|
||||
<template slot-scope="scope">
|
||||
<el-input-number v-model="scope.row.未到货数量" :disabled="disable === '1'" :max="scope.row.采购数量-parseInt(scope.row.到货数量)" :step="1" :min="1" size="mini" style="width:100%" @change="saveData(scope.row)"/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="到货重量(KG)" align="center" width="150px" prop="到货重量">
|
||||
<template slot-scope="scope">
|
||||
<el-input-number v-model="scope.row.到货重量" :disabled="disable === '1'" :step="1" :min="0.00" size="mini" style="width:100%" @change="saveData(scope.row)"/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="成品尺寸(长、宽、高)" align="center" width="170px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.成品尺寸 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<!--<el-table-column label="单位" align="center" width="60px">-->
|
||||
<!--<template slot-scope="scope">-->
|
||||
<!--{{ scope.row.单位 ? scope.row.单位 : '-' }}-->
|
||||
<!--</template>-->
|
||||
<!--</el-table-column>-->
|
||||
<el-table-column label="备注" align="center">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.备注1 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</div>
|
||||
</el-row>
|
||||
</el-form>
|
||||
</el-dialog>
|
||||
<el-dialog v-el-drag-dialog :visible.sync="dialogVisible2" title="关联备料材料" center style="min-height: 550px" width="1400px">
|
||||
<span>计划类型</span>
|
||||
<el-select v-model="planType" placeholder="计划类型" size="small" style="width: 150px" filterable @change="searchTable20()">
|
||||
<el-option
|
||||
v-for="item in planTypes"
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
:value="item.value"/>
|
||||
</el-select>
|
||||
<span>零件图号</span>
|
||||
<el-input v-model="零件图号" style="width: 150px" size="small" clearable/>
|
||||
<el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px" @click="searchTable20()">查询</el-button>
|
||||
<span style="margin-left: 20px">未绑定重量:{{ 未绑定数量 }}KG</span>
|
||||
<el-table
|
||||
ref="multipleTable"
|
||||
:row-key="getRowKeys"
|
||||
:summary-method="getSummaries3"
|
||||
:row-selection="{selectedRowKeys: selectedRowKeys}"
|
||||
:data="tableData20"
|
||||
border
|
||||
show-summary
|
||||
highlight-current-row
|
||||
stripe
|
||||
style="margin: 3px 0"
|
||||
height="300px"
|
||||
size="mini"
|
||||
@selection-change="handleSelectionChange1">
|
||||
<el-table-column :reserve-selection="mark" type="selection" width="50" align="center"/>
|
||||
<el-table-column label="采购单号" align="center" width="120">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.采购单号 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="物料编码" align="center" width="150">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.物料零件编码 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="零件名称" align="center" width="90px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.零件名称 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="材料" align="center" width="70px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.材料 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="备料数" align="center" width="70px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.采购数量 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="已到数" align="center" width="70px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.到货数量 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="到货件数" align="center" width="120px">
|
||||
<template slot-scope="scope">
|
||||
<el-input-number v-model="scope.row.未到货数量" :disabled="disable === '1'" :max="scope.row.采购数量-parseInt(scope.row.到货数量)" :step="1" :min="1" size="mini" style="width:95px" @change="saveData(scope.row)"/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="到货重量(KG)" align="center" width="150px">
|
||||
<template slot-scope="scope">
|
||||
<el-input-number v-model="scope.row.到货重量" :disabled="disable === '1'" :step="1" :min="0" size="mini" style="width:100%" @change="saveData(scope.row)"/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="成品尺寸(长、宽、高)" align="center">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.成品尺寸 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="单位" align="center" width="60px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.单位 ? scope.row.单位 : '-' }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="备注" align="center">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.备注1 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<div slot="footer" class="dialog-footer">
|
||||
<el-button v-positive="'loading'" :disabled="false" type="primary" size="small" icon="el-icon-download" style="margin-left: 10px" @click="addMateriel">关联备料材料</el-button>
|
||||
</div>
|
||||
</el-dialog>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
@@ -64,7 +64,7 @@
|
||||
<!--<el-tooltip :open-delay="1200" effect="dark" content="保存选中的采购计划单" placement="top">-->
|
||||
<!--<el-button type="baocun" size="small" icon="el-icon-download" style="margin-left: 10px" @click="saveMateriel">保存采购计划单</el-button>-->
|
||||
<!--</el-tooltip>-->
|
||||
<el-button type="primary" size="small" plain icon="el-icon-download" style="margin-left: 10px" @click="submitAddMaterial">选入备料</el-button>
|
||||
<el-button v-positive="'loading'" :disabled="false" type="primary" size="small" plain icon="el-icon-download" style="margin-left: 10px" @click="submitAddMaterial">选入备料</el-button>
|
||||
<!--slot="header"-->
|
||||
<!--<el-input v-model="purchasingOrder" placeholder="采购计划单号" size="small" style="margin: 3px 0;width: 155px" clearable @keyup.enter.native="pageCurrent2=1;pageSize2=10;total2=0;searchTable2()"/>-->
|
||||
<el-input v-model="purchasingOrder" placeholder="离线备料单号" size="small" style="width: 160px;margin-top: 3px;margin-left: 20px" clearable/>
|
||||
@@ -251,14 +251,17 @@
|
||||
</el-form>
|
||||
<div slot="footer" class="dialog-footer">
|
||||
<el-button
|
||||
v-positive="'loading'"
|
||||
v-show="title2==='创建外购备料计划'"
|
||||
:disabled="addPurchaseOrder_disable"
|
||||
:disabled="false"
|
||||
type="primary"
|
||||
size="small"
|
||||
icon="el-icon-check"
|
||||
@click="submitAddPurchaseOrder">确定</el-button>
|
||||
<el-button
|
||||
v-positive="'loading'"
|
||||
v-show="title2==='编辑外购备料计划'"
|
||||
:disabled="false"
|
||||
type="primary"
|
||||
size="small"
|
||||
icon="el-icon-check"
|
||||
|
||||
@@ -224,7 +224,7 @@
|
||||
</el-form>
|
||||
<div slot="footer" class="dialog-footer">
|
||||
<el-button size="small" @click="dialogVisible1 = false">取消</el-button>
|
||||
<el-button :disabled="addTable1_disable" size="small" type="primary" @click="submitAdd1('form1')">确定</el-button>
|
||||
<el-button v-positive="'loading'" :disabled="false" size="small" type="primary" @click="submitAdd1('form1')">确定</el-button>
|
||||
</div>
|
||||
</el-dialog>
|
||||
|
||||
@@ -254,7 +254,7 @@
|
||||
</el-form>
|
||||
<div slot="footer" class="dialog-footer">
|
||||
<el-button size="small" @click="dialogVisible2 = false">取消</el-button>
|
||||
<el-button size="small" type="primary" @click="submitEdit1('form1')">确定</el-button>
|
||||
<el-button v-positive="'loading'" :disabled="false" size="small" type="primary" @click="submitEdit1('form1')">确定</el-button>
|
||||
</div>
|
||||
</el-dialog>
|
||||
|
||||
@@ -278,7 +278,7 @@
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<span>合计:<el-input v-positive="'float'" v-model="SUM" size="mini" type="number" style="width: 80px; margin: 10px 10px 0 10px" @change="Keeptwodecimalplaces"/>元</span>
|
||||
<el-button :disabled="aboutArrival_disable" type="primary" size="small" icon="el-icon-download" style="float:right;margin: 10px 10px 0 10px" @click="addMateriel">货票关联</el-button>
|
||||
<el-button v-positive="'loading'" :disabled="false" type="primary" size="small" icon="el-icon-download" style="float:right;margin: 10px 10px 0 10px" @click="addMateriel">货票关联</el-button>
|
||||
</el-dialog>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
@@ -31,7 +31,7 @@
|
||||
start-placeholder="开始日期"
|
||||
end-placeholder="结束日期"/>
|
||||
<el-button icon="el-icon-search" type="primary" plain size="small" style="margin-left: 10px" @click="pageCurrent = 1;pageSize = 100;getTableData()">查询</el-button>
|
||||
<el-button type="success" plain icon="el-icon-download" size="small" @click="exportExcel()">导出</el-button>
|
||||
<el-button v-positive="'loading'" :disabled="false" type="success" plain icon="el-icon-download" size="small" @click="exportExcel()">导出</el-button>
|
||||
</div>
|
||||
</el-card>
|
||||
<el-card style="width: 100%">
|
||||
|
||||
@@ -35,7 +35,7 @@
|
||||
:value="item.value"/>
|
||||
</el-select>
|
||||
<el-button type="primary" size="small" plain icon="el-icon-search" @click="total1=0;pageCurrent1=1;pageSize1=20;searchTable1()">查询</el-button>
|
||||
<el-button type="primary" size="small" plain icon="el-icon-download" @click="exportExcel()">导出合同报表</el-button>
|
||||
<el-button v-positive="'loading'" :disabled="false" type="primary" size="small" plain icon="el-icon-download" @click="exportExcel()">导出合同报表</el-button>
|
||||
</el-row>
|
||||
</el-card>
|
||||
|
||||
|
||||
@@ -9,20 +9,8 @@
|
||||
:label="item.label"
|
||||
:value="item.value"/>
|
||||
</el-select>
|
||||
<el-button
|
||||
type="primary"
|
||||
size="small"
|
||||
plain
|
||||
icon="el-icon-search"
|
||||
style="margin-left:10px"
|
||||
@click="searchTable1()">查询</el-button>
|
||||
<el-button
|
||||
type="primary"
|
||||
size="small"
|
||||
plain
|
||||
icon="el-icon-download"
|
||||
style="margin-left:10px"
|
||||
@click="exportExcel()">导出</el-button>
|
||||
<el-button type="primary" size="small" plain icon="el-icon-search" style="margin-left:10px" @click="searchTable1()">查询</el-button>
|
||||
<el-button v-positive="'loading'" :disabled="false" type="primary" size="small" plain icon="el-icon-download" style="margin-left:10px" @click="exportExcel()">导出</el-button>
|
||||
</el-card>
|
||||
<el-card style="width: 800px">
|
||||
<el-table v-loading="" :data="tableData2" :summary-method="getSummaries1" show-summary border style="width: 100%;max-height: 700px;" height="700px">
|
||||
|
||||
@@ -22,13 +22,7 @@
|
||||
:label="item.label"
|
||||
:value="item.value"/>
|
||||
</el-select>
|
||||
<el-button
|
||||
type="primary"
|
||||
size="small"
|
||||
plain
|
||||
icon="el-icon-search"
|
||||
style="margin-left: 10px"
|
||||
@click="pageCurrent1=1;pageSize1=30;total1=0;searchTable1()">查询</el-button>
|
||||
<el-button type="primary" size="small" plain icon="el-icon-search" style="margin-left: 10px" @click="pageCurrent1=1;pageSize1=30;total1=0;searchTable1()">查询</el-button>
|
||||
<el-button type="distribution" size="small" icon="el-icon-goods" style="" @click="requestFund">请款</el-button>
|
||||
</el-card>
|
||||
<el-row>
|
||||
|
||||
@@ -156,37 +156,37 @@
|
||||
<!--</el-table-column>-->
|
||||
</el-table>
|
||||
</el-card>
|
||||
<el-dialog v-el-drag-dialog :visible.sync="dialogVisible2" title="外购备料请款" center style="min-height: 300px" width="800px">
|
||||
<span>供应商:</span>
|
||||
<el-select v-model="supplierValue" placeholder="供应商" filterable size="small" clearable @change="pageCurrent1=1;pageSize1=10;total1=0;searchTable01()">
|
||||
<el-option
|
||||
v-for="item in supplier"
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
:value="item.value"/>
|
||||
</el-select>
|
||||
<el-table v-loading="" :data="tableData01" border stripe highlight-current-row style="max-height: 300px;" height="300px" size="mini" @selection-change="handleSelectionChange">
|
||||
<el-table-column type="selection" align="center" width="50"/>
|
||||
<el-table-column label="发票号" align="center" min-width="120">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.发票号 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="到票金额" align="center" min-width="70">
|
||||
<template slot-scope="scope">
|
||||
{{ Number(scope.row.开票金额).toFixed(2) }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="到票时间" align="center" min-width="70">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.开票时间 | formatTime }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<span>合计:<el-input v-model="SUM" size="mini" style="width: 90px; margin: 10px 10px 0 10px"/>元</span>
|
||||
<el-button :disabled="requestFund_disable" type="primary" size="small" style="float:right;margin: 10px 10px 0 10px" icon="el-icon-check" @click="submitRequestFund">提交请款审批</el-button>
|
||||
</el-dialog>
|
||||
</div>
|
||||
<el-dialog v-el-drag-dialog :visible.sync="dialogVisible2" title="外购备料请款" center style="min-height: 300px" width="800px">
|
||||
<span>供应商:</span>
|
||||
<el-select v-model="supplierValue" placeholder="供应商" filterable size="small" clearable @change="pageCurrent1=1;pageSize1=10;total1=0;searchTable01()">
|
||||
<el-option
|
||||
v-for="item in supplier"
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
:value="item.value"/>
|
||||
</el-select>
|
||||
<el-table v-loading="" :data="tableData01" border stripe highlight-current-row style="max-height: 300px;" height="300px" size="mini" @selection-change="handleSelectionChange">
|
||||
<el-table-column type="selection" align="center" width="50"/>
|
||||
<el-table-column label="发票号" align="center" min-width="120">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.发票号 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="到票金额" align="center" min-width="70">
|
||||
<template slot-scope="scope">
|
||||
{{ Number(scope.row.开票金额).toFixed(2) }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="到票时间" align="center" min-width="70">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.开票时间 | formatTime }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<span>合计:<el-input v-model="SUM" size="mini" style="width: 90px; margin: 10px 10px 0 10px"/>元</span>
|
||||
<el-button :disabled="requestFund_disable" type="primary" size="small" style="float:right;margin: 10px 10px 0 10px" icon="el-icon-check" @click="submitRequestFund">提交请款审批</el-button>
|
||||
</el-dialog>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
Reference in New Issue
Block a user