更新
This commit is contained in:
@@ -25,19 +25,14 @@
|
||||
start-placeholder="开始日期"
|
||||
end-placeholder="结束日期"/>
|
||||
<el-button type="primary" size="small" icon="el-icon-search" plain style="margin-left: 5px" @click="pageCurrent11=1;pageSize11=20;total11=0;searchTable11()">查询</el-button>
|
||||
<el-popover v-model="visible1" placement="top" width="140">
|
||||
<div style="text-align: right; margin: 0">
|
||||
<el-select v-model="PersonValue" style="width:100px" placeholder="人员" size="small" filterable clearable>
|
||||
<el-option
|
||||
v-for="item in Person"
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
:value="item.value"/>
|
||||
</el-select>
|
||||
<el-button type="primary" size="mini" @click="visible1 = false;tiaozheng1()">确定</el-button>
|
||||
</div>
|
||||
<el-button slot="reference" type="success" size="small" plain style="float: right;margin-right: 20px">调整采购任务</el-button>
|
||||
</el-popover>
|
||||
<el-button type="primary" size="small" plain style="float: right;margin-right: 20px" @click="tiaozheng1">调整采购任务</el-button>
|
||||
<el-select v-model="PersonValue" style="width:100px; float: right" placeholder="人员" size="small" filterable clearable>
|
||||
<el-option
|
||||
v-for="item in Person"
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
:value="item.value"/>
|
||||
</el-select>
|
||||
</el-row>
|
||||
<!--:row-class-name="tableRowClassName"-->
|
||||
<el-table
|
||||
@@ -45,7 +40,7 @@
|
||||
:data="tableData00"
|
||||
border
|
||||
style="width: 100%;max-height: 500px;"
|
||||
height="500px"
|
||||
height="300px"
|
||||
size="mini"
|
||||
@selection-change="handleSelectionChange1"
|
||||
@select="handleSelection">
|
||||
@@ -100,7 +95,7 @@
|
||||
{{ Number(scope.row.零件类型) === 1 ? scope.row.库存 = Number(scope.row.货位存量 ? scope.row.货位存量 : 0) - Number(scope.row.占用数量) : '-' }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="使用库存数量" align="center" width="105" prop="使用库存数">
|
||||
<el-table-column label="使用库存数量" align="center" width="110" prop="使用库存数">
|
||||
<template slot-scope="scope">
|
||||
<span v-if="Number(scope.row.零件类型) !== 1 || (Number(scope.row.货位存量 ? scope.row.货位存量 : 0) - Number(scope.row.占用数量)) === 0">-</span>
|
||||
<el-input-number v-if="Number(scope.row.零件类型) === 1 && (Number(scope.row.货位存量 ? scope.row.货位存量 : 0) - Number(scope.row.占用数量)) !== 0" v-model="scope.row.使用库存数" :min="0" :max="Number(scope.row.零件数量) > (Number(scope.row.货位存量) - Number(scope.row.占用数量)) ? (Number(scope.row.货位存量) - Number(scope.row.占用数量) + Number(scope.row.使用库存数)) : Number(scope.row.零件数量)" :disabled="(Number(scope.row.货位存量) - Number(scope.row.占用数量)) === 0 || parseInt(scope.row.采购状态编号)===3" size="mini" style="width: 90px" @change="changeNumber(scope.row)"/>
|
||||
@@ -145,7 +140,10 @@
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<div class="block" style="margin: 10px 0 0 0;">
|
||||
<el-tooltip :open-delay="100" effect="dark" content="将勾选的物料库中物料选入到选中的离线合同" placement="top">
|
||||
<el-button type="warning" size="small" plain style="margin: 0px 40px 0px 20px; display: inline-block" @click="addMateriel">选入物料</el-button>
|
||||
</el-tooltip>
|
||||
<div class="block" style="margin: 10px 0 0 0;display: inline-block">
|
||||
<el-pagination
|
||||
:current-page="pageCurrent11"
|
||||
:page-sizes="[10, 20, 30, 40, 100]"
|
||||
@@ -160,7 +158,7 @@
|
||||
</el-tab-pane>
|
||||
<el-tab-pane label="仓库" name="仓库">
|
||||
<el-row>
|
||||
<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-input v-model="materialName" style="width: 150px;margin-left: 10px" placeholder="名称规格型号" size="small" clearable @keyup.enter.native="pageCurrent22=1;pageSize22=100000;total22=0;searchTable22()"/>
|
||||
<el-button type="primary" size="small" icon="el-icon-search" plain style="margin-left: 10px" @click="searchTable22()">查询</el-button>
|
||||
</el-row>
|
||||
<el-table
|
||||
@@ -169,7 +167,7 @@
|
||||
border
|
||||
stripe
|
||||
style="width: 594px;max-height: 500px;"
|
||||
height="500px"
|
||||
height="300px"
|
||||
size="mini"
|
||||
@selection-change="handleSelectionChange1"
|
||||
@select="handleSelection1">
|
||||
@@ -195,7 +193,10 @@
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<div class="block">
|
||||
<el-tooltip :open-delay="100" effect="dark" content="将勾选的物料库中物料选入到选中的离线合同" placement="top">
|
||||
<el-button type="warning" size="small" plain style="margin: 0px 40px 0px 20px; display: inline-block" @click="addMateriel">选入物料</el-button>
|
||||
</el-tooltip>
|
||||
<div class="block" style="display: inline-block">
|
||||
<el-pagination
|
||||
:current-page="pageCurrent22"
|
||||
:page-sizes="[20, 50, 100, 150]"
|
||||
@@ -216,38 +217,36 @@
|
||||
<el-input v-model="offlineContract" placeholder="离线合同号/供应商" size="small" style="width: 170px" clearable/>
|
||||
<!--<el-input v-model="supplierName0" placeholder="供应商" size="small" style="width: 140px" clearable/>-->
|
||||
<el-button type="primary" size="small" icon="el-icon-search" plain style="margin-left: 10px" @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" plain style="margin-left: 40px" @click="addMateriel">选入物料</el-button>
|
||||
<el-button type="warning" size="small" plain style="margin-right:10px;margin-left:100px;" @click="addOfflineContract">创建离线合同</el-button>
|
||||
<el-tooltip :open-delay="1000" effect="dark" content="生成合同" placement="top">
|
||||
<el-button :disabled="disable" type="success" size="small" plain style="margin-left:10px;margin-right: 10px" @click="doneOfflineContact">生成离线合同</el-button>
|
||||
</el-tooltip>
|
||||
|
||||
<!--<el-button :disabled="disable" type="info" size="mini" style="float:right" @click="saveContract">保存</el-button>-->
|
||||
<el-tooltip :content="hasTax" placement="top" style="margin-right: 370px">
|
||||
<el-switch v-model="hasTax" active-color="#13ce66" inactive-color="#ff4949" active-value="含税" inactive-value="未税" style="margin: 3px;float:right"/>
|
||||
</el-tooltip>
|
||||
<el-input v-model="taxRate" style="float:right;width:100px;" placeholder="税率" size="mini"/>
|
||||
<el-input v-model="taxRate" style="float:right;width:60px;" placeholder="税率" size="mini"/>
|
||||
<h4 style="float:right;width: 40px;margin: 5px">税率:</h4>
|
||||
<el-tooltip :open-delay="1000" effect="dark" content="生成合同" placement="top">
|
||||
<el-button :disabled="disable" type="success" size="small" plain style="float:right;margin-left:10px;margin-right: 10px" @click="doneOfflineContact">生成离线合同</el-button>
|
||||
</el-tooltip>
|
||||
<el-button type="warning" size="small" plain style="float:right;margin-right:10px;" @click="addOfflineContract">创建离线合同</el-button>
|
||||
|
||||
<!--<el-button v-if="quickChangePrice" size="mini" style="float:right; width: 100px" @click="quickChangePrice=!quickChangePrice">快速修改价格</el-button>-->
|
||||
<!--<el-button v-else size="mini" style="float:right;" @click="quickChangePrice=!quickChangePrice">还原</el-button>-->
|
||||
</div>
|
||||
<el-table v-loading="loading3" :data="tableData2" border stripe style="max-height: 460px;" size="mini" highlight-current-row @row-click="searchTable3">
|
||||
<el-table-column label="详情" type="expand" fixed="left" width="50px">
|
||||
<template slot-scope="scope">
|
||||
<el-form label-position="left" inline class="demo-table-expand">
|
||||
<el-form-item label="离线合同备注">
|
||||
{{ scope.row.离线合同备注 }}
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table v-loading="loading3" :data="tableData2" border style="max-height: 460px;" size="mini" highlight-current-row @row-click="searchTable3">
|
||||
<!-- <el-table-column label="详情" type="expand" fixed="left" width="50px">-->
|
||||
<!-- <template slot-scope="scope">-->
|
||||
<!-- <el-form label-position="left" inline class="demo-table-expand">-->
|
||||
<!-- <el-form-item label="离线合同备注">-->
|
||||
<!-- {{ scope.row.离线合同备注 }}-->
|
||||
<!-- </el-form-item>-->
|
||||
<!-- </el-form>-->
|
||||
<!-- </template>-->
|
||||
<!-- </el-table-column>-->
|
||||
<el-table-column label="合同状态" align="center" width="80" fixed="left">
|
||||
<template slot-scope="scope">
|
||||
<el-tag v-if="editing(scope.row)" type="warning" size="small">编辑中</el-tag>
|
||||
<el-tag v-if="purchasing(scope.row)" type="primary" size="small">已采购</el-tag>
|
||||
<el-tag v-if="arrival(scope.row)" type="success" size="small">全部到货</el-tag>
|
||||
<span v-if="editing(scope.row)" style="color: #E6A23C" size="small">编辑中</span>
|
||||
<span v-if="purchasing(scope.row)" style="color: #409eff" size="small">已采购</span>
|
||||
<span v-if="arrival(scope.row)" style="color: #67c23a" size="small">全部到货</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="离线合同编号" prop="离线合同编号" align="center" width="120">
|
||||
@@ -260,7 +259,7 @@
|
||||
{{ scope.row.离线合同名称 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="供应商" prop="供应商名称" align="center" width="180" show-overflow-tooltip>
|
||||
<el-table-column label="供应商" prop="供应商名称" align="center" width="320" show-overflow-tooltip>
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.供应商名称 }}
|
||||
</template>
|
||||
@@ -290,19 +289,19 @@
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<div class="block" style="margin: 10px 0;">
|
||||
<el-pagination
|
||||
:current-page="pageCurrent2"
|
||||
:page-sizes="[10, 20, 30, 40]"
|
||||
:page-size="pageSize2"
|
||||
:total="total2"
|
||||
style="display:inline-block;width:50%"
|
||||
layout="total"
|
||||
@size-change="handleSizeChange2"
|
||||
@current-change="handleCurrentChange2"/>
|
||||
</div>
|
||||
<!-- <div class="block" style="margin: 10px 0;">-->
|
||||
<!-- <el-pagination-->
|
||||
<!-- :current-page="pageCurrent2"-->
|
||||
<!-- :page-sizes="[10, 20, 30, 40]"-->
|
||||
<!-- :page-size="pageSize2"-->
|
||||
<!-- :total="total2"-->
|
||||
<!-- style="display:inline-block;width:50%"-->
|
||||
<!-- layout="total"-->
|
||||
<!-- @size-change="handleSizeChange2"-->
|
||||
<!-- @current-change="handleCurrentChange2"/>-->
|
||||
<!-- </div>-->
|
||||
<!--<h3>合同详细信息</h3>-->
|
||||
<el-table v-loading="" :data="tableData3" :summary-method="getSummaries" border style="max-height: 500px;" height="450px" size="mini" show-summary>
|
||||
<el-table v-loading="" :data="tableData3" :summary-method="getSummaries" border stripe style="max-height: 500px;" height="450px" size="mini" show-summary>
|
||||
<el-table-column label="物料名称" align="center" width="120" show-overflow-tooltip>
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.物料名称 ? scope.row.物料名称 : scope.row.零件名称 }}
|
||||
@@ -318,7 +317,7 @@
|
||||
{{ scope.row.物料型号 ? scope.row.物料型号 : scope.row.零件图号 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="采购数" align="center" width="90">
|
||||
<el-table-column label="采购数" align="center" width="100">
|
||||
<template slot-scope="scope">
|
||||
<el-input v-direction="{x: 0, y: scope.$index}" v-if="quickChangePrice" v-model="scope.row.数量" :disabled="disable" size="mini" style="width:60px" @change="saveContract()"/>
|
||||
<b v-else>{{ scope.row.数量 }}</b>
|
||||
@@ -340,9 +339,9 @@
|
||||
<b v-show="hasTax!=='未税'">{{ (scope.row.单价 / (1 + taxRate)).toFixed(2) }}</b>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="单价(含税)元" align="center" width="110" prop="单价">
|
||||
<el-table-column label="单价(含税)元" align="center" width="120" prop="单价">
|
||||
<template slot-scope="scope">
|
||||
<el-input v-direction="{x: 1, y: scope.$index}" v-if="hasTax==='含税'" v-model="scope.row.单价" :disabled="disable" size="mini" style="width:90px" @change="saveContract()"/>
|
||||
<el-input v-direction="{x: 1, y: scope.$index}" v-if="hasTax==='含税'" v-model="scope.row.单价" :disabled="disable" size="mini" style="width:80px" @change="saveContract()"/>
|
||||
<b v-show="hasTax!=='含税'">{{ (scope.row.未税单价 * (1 + taxRate)).toFixed(2) }}</b>
|
||||
</template>
|
||||
</el-table-column>
|
||||
@@ -356,9 +355,9 @@
|
||||
{{ hasTax==='含税' ? scope.row.含税总额 = (Number(scope.row.数量) * Number(scope.row.单价)).toFixed(2) : scope.row.含税总额 = (scope.row.未税总额 * (1+taxRate)).toFixed(2) }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="备注" align="center" min-width="140" prop="备注">
|
||||
<el-table-column label="备注" align="center" min-width="120" prop="备注">
|
||||
<template slot-scope="scope">
|
||||
<el-input v-direction="{x: 3, y: scope.$index}" v-if="quickChangePrice" v-model="scope.row.备注" :disabled="disable" size="mini" style="width:120px" @change="saveContract()"/>
|
||||
<el-input v-direction="{x: 3, y: scope.$index}" v-if="quickChangePrice" v-model="scope.row.备注" :disabled="disable" size="mini" style="width:100px" @change="saveContract()"/>
|
||||
<b v-else>{{ scope.row.备注 || '—' }}</b>
|
||||
</template>
|
||||
</el-table-column>
|
||||
@@ -570,13 +569,13 @@
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="离线合同备注" prop="离线合同备注">
|
||||
<el-input v-model="form2.离线合同备注" size="small" type="textarea" style="width: 550px"/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<!-- <el-row>-->
|
||||
<!-- <el-col :span="12">-->
|
||||
<!-- <el-form-item label="离线合同备注" prop="离线合同备注">-->
|
||||
<!-- <el-input v-model="form2.离线合同备注" size="small" type="textarea" style="width: 550px"/>-->
|
||||
<!-- </el-form-item>-->
|
||||
<!-- </el-col>-->
|
||||
<!-- </el-row>-->
|
||||
</el-form>
|
||||
<div slot="footer" class="dialog-footer">
|
||||
<el-button
|
||||
@@ -815,7 +814,7 @@ export default {
|
||||
tabName: '标准件',
|
||||
total22: 0,
|
||||
pageCurrent22: 1,
|
||||
pageSize22: 20
|
||||
pageSize22: 100000
|
||||
}
|
||||
},
|
||||
computed: {
|
||||
@@ -829,7 +828,7 @@ export default {
|
||||
this.projectChange()
|
||||
this.getSupplier1()
|
||||
// this.searchTable2()
|
||||
this.searchTable11()
|
||||
// this.searchTable11()
|
||||
this.initDirection()
|
||||
},
|
||||
methods: {
|
||||
@@ -1042,18 +1041,19 @@ export default {
|
||||
})
|
||||
},
|
||||
tabClick(tab) {
|
||||
console.log(tab.name, 1111)
|
||||
if (tab.name === '外购件') {
|
||||
this.tabName = '外购件'
|
||||
this.searchTable11()
|
||||
} else if (tab.name === '标准件') {
|
||||
this.tabName = '标准件'
|
||||
this.searchTable11()
|
||||
// this.searchTable11()
|
||||
} else if (tab.name === '基本件') {
|
||||
this.tabName = '基本件'
|
||||
this.searchTable12()
|
||||
} else {
|
||||
this.tabName = '仓库'
|
||||
this.searchTable22()
|
||||
// this.searchTable22()
|
||||
}
|
||||
},
|
||||
searchTable2() { // 查询离线合同列表
|
||||
@@ -1387,6 +1387,7 @@ export default {
|
||||
})
|
||||
},
|
||||
saveContract() {
|
||||
console.log(11111)
|
||||
this.totalPrice = 0
|
||||
this.partGroup = []
|
||||
this.numGroup = []
|
||||
@@ -1482,7 +1483,7 @@ export default {
|
||||
}
|
||||
},
|
||||
exportExcel(row) {
|
||||
this.$confirm('确定导出该合同?', '提示', {
|
||||
this.$confirm('确定打印该合同?', '提示', {
|
||||
confirmButtonText: '确定',
|
||||
cancelButtonText: '取消',
|
||||
type: 'warning'
|
||||
|
||||
Reference in New Issue
Block a user