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

sd

Browse Source
This commit is contained in:
caoxinyu
2019-09-24 12:14:25 +08:00
parent 3b9805e47d e067c1884c
commit 660898a646
12 changed files with 79 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/utils/request.js
View File

@@ -24,7 +24,6 @@ export const MESUploadFile = `http://192.168.1.231:8411/submit/MESUploadFile.ash
export const MESDownloadFile = `http://192.168.1.231:8411/submit/MESDownloadFile.ashx`
const service = axios.create({
baseURL: `http://192.168.0.101:8411/submit/MESCommonBase.ashx`,
baseURL: `http://192.168.0.104:8005/submit/MESCommonBase.ashx`,
timeout: 1500000 // 请求超时时间
})

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

@@ -391,7 +391,7 @@
</el-col>
</el-row>
<el-card style="margin-top: 15px">
<el-card>
<div slot="header">
<span>询价单号:</span>
<el-input v-model="inquirySheetNum" placeholder="询价单号" size="small" clearable/>
@@ -408,11 +408,13 @@
size="small"
style="margin-left: 10px"
@click="createInquirySheet">创建询价单</el-button>
<el-button
type="primary"
size="small"
style="margin-left: 10px"
@click="addInquirySheet">选入</el-button>
<el-tooltip effect="dark" content="为选择的询价单添加物料" placement="top" open-delay="1000">
<el-button
type="warning"
size="small"
style="margin-left: 10px"
@click="addInquirySheet">选入物料</el-button>
</el-tooltip>
</div>
<h3 style="margin-top: 0;display:inline-block;width:50%">询价单</h3>
<el-button :loading="baseInfoLoading" type="success" size="mini" style="float: right" @click="inquirySheetBaseInfoMaintain">询价单基础信息维护</el-button>
@@ -486,7 +488,9 @@
@current-change="handleCurrentChange2"/>
<el-button :disabled="tableData3.length===0" type="warning" size="mini" style="margin-left:10px;float: right" @click="printInquirySheet()">打印</el-button>
<el-button :disabled="tableData3.length===0" type="warning" size="mini" style="margin-left:10px;float: right" @click="exportInquirySheet()">导出</el-button>
<el-button :disabled="tableData3.length===0" type="success" size="mini" style="float: right" @click="saveOrder()">保存</el-button>
<el-tooltip effect="dark" content="保存该询价单" placement="top" open-delay="1000">
<el-button :disabled="tableData3.length===0" type="success" size="mini" style="float: right" @click="saveOrder()">保存</el-button>
</el-tooltip>
</div><hr>
<h3 style="margin-top: 0">询价单明细</h3>
<el-table v-loading="" :data="tableData3" border style="max-height: 500px;" height="500px" size="mini">
@@ -547,7 +551,9 @@
</el-table-column>
<el-table-column label="操作" align="center" width="100" fixed="right">
<template slot-scope="scope">
<el-button type="danger" size="mini" plain icon="el-icon-delete" @click="outInquirySheet(scope.row)">移出</el-button>
<el-tooltip effect="dark" content="将该物料从询价单中删除" placement="top" open-delay="1000">
<el-button type="danger" size="mini" plain icon="el-icon-delete" @click="outInquirySheet(scope.row)">移出</el-button>
</el-tooltip>
</template>
</el-table-column>
</el-table>
@@ -1941,7 +1947,7 @@ export default {
text-align: center;
}
.el-card{
margin-bottom: 15px;
margin-bottom: 0px;
}
.el-select{
width:200px

10
src/views/PurchasingCenter/FundApproval1/index.vue
View File

@@ -26,7 +26,7 @@
<el-table-column label="审核" align="center" width="320">
<template slot-scope="scope">
<el-popover placement="right" width="400" trigger="click">
<el-table :data="gridData1" stripe size="mini" highlight-current-row show-summary @row-click="searchContactDetail">
<el-table :data="gridData1" class="subTableHeader" stripe size="mini" highlight-current-row show-summary @row-click="searchContactDetail">
<el-table-column width="50" align="center" type="index" label="序号"/>
<el-table-column min-width="150" align="center" label="采购合同编号">
<template slot-scope="scope">
@@ -39,10 +39,10 @@
</template>
</el-table-column>
</el-table>
<el-button slot="reference" type="success" size="mini" icon="el-icon-search" style="margin-right: 10px" @click="searchTable01(scope.row)">查看详情</el-button>
<el-button slot="reference" type="success" size="mini" icon="el-icon-search" style="margin-right: 10px" plain @click="searchTable01(scope.row)">查看详情</el-button>
</el-popover>
<el-button type="primary" size="mini" icon="el-icon-check" @click="yesApproval(scope.row)">通过</el-button>
<el-button type="danger" size="mini" icon="el-icon-close" @click="noApproval(scope.row)">不通过</el-button>
<el-button type="primary" size="mini" icon="el-icon-check" plain @click="yesApproval(scope.row)">通过</el-button>
<el-button type="danger" size="mini" icon="el-icon-close" plain @click="noApproval(scope.row)">不通过</el-button>
</template>
</el-table-column>
</el-table>
@@ -365,7 +365,7 @@ export default {
<style scoped>
.el-card{
margin-bottom: 15px;
margin-bottom: 0px;
}
.el-select{
width:200px

6
src/views/PurchasingCenter/InvoiceSettlementApplication/index.vue
View File

@@ -166,7 +166,7 @@
</el-table>
</el-card>
<el-dialog :title="title1" :visible.sync="dialogVisible1" center style="min-height: 300px" width="650px">
<el-dialog v-el-drag-dialog :title="title1" :visible.sync="dialogVisible1" center style="min-height: 300px" width="650px">
<el-form ref="form1" :model="form1" :rules="rules1" label-position="right" label-width="90px">
<el-row>
<el-col :span="12">
@@ -245,7 +245,7 @@
</div>
</el-dialog>
<el-dialog :title="title2" :visible.sync="dialogVisible2" center style="min-height: 300px" width="900px">
<el-dialog v-el-drag-dialog :title="title2" :visible.sync="dialogVisible2" center style="min-height: 300px" width="900px">
<span>供应商：</span>
<el-input v-model="supplierName" size="small" placeholder="请选择供应商发票" style="margin: 0 5px 10px 0;" readonly/>
<el-radio-group v-model="contractType" size="small" @change="searchTable01()">
@@ -680,7 +680,7 @@ export default {
<style scoped>
.el-card{
margin-bottom: 15px;
margin-bottom: 0px;
}
.el-select{
width:200px

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

@@ -19,18 +19,22 @@
icon="el-icon-search"
style="margin-left: 10px"
@click="pageCurrent00=1;pageSize00=10;total00=0;searchTable00()">查询</el-button>
<el-button
type="primary"
size="small"
icon="el-icon-edit"
style="margin-left: 10px"
@click="changeInquiryStatus">变更询价状态</el-button>
<el-button
type="primary"
size="small"
icon="el-icon-menu"
style="margin-left: 10px"
@click="bindOfflineContract">绑定离线合同</el-button>
<el-tooltip effect="dark" content="更改选中的零件的询价状态" placement="top" open-delay="1000">
<el-button
type="primary"
size="small"
icon="el-icon-edit"
style="margin-left: 10px"
@click="changeInquiryStatus">变更询价状态</el-button>
</el-tooltip>
<el-tooltip effect="dark" content="把选中的零件绑定到离线合同，将相同零件合并到一条记录采购" placement="top" open-delay="1000">
<el-button
type="warning"
size="small"
icon="el-icon-menu"
style="margin-left: 10px"
@click="bindOfflineContract">绑定离线合同</el-button>
</el-tooltip>
</el-row>
</div>
<el-table
@@ -207,17 +211,17 @@
{{ scope.row.供货商 }}
</template>
</el-table-column>
<el-table-column label="参考价格" min-width="150" align="center">
<el-table-column label="参考价格" min-width="100" align="center">
<template slot-scope="scope">
{{ scope.row.参考价格 }}
</template>
</el-table-column>
<el-table-column label="当前库存量" min-width="90" align="center">
<el-table-column label="当前库存量" min-width="70" align="center">
<template slot-scope="scope">
{{ scope.row.当前库存量 }}
</template>
</el-table-column>
<el-table-column label="安全库存量" min-width="200" align="center">
<el-table-column label="安全库存量" min-width="150" align="center">
<template slot-scope="scope">
<template v-if="scope.row.changeSafeValue">
<el-input v-model="scope.row.安全库存量" class="edit-input" size="mini"/>
@@ -226,16 +230,18 @@
<span v-else>{{ scope.row.安全库存量 }}</span>
</template>
</el-table-column>
<el-table-column label="设置" min-width="100" align="center">
<el-table-column label="设置" min-width="70" align="center">
<template slot-scope="scope">
<el-button v-if="scope.row.changeSafeValue" type="mini" size="mini" icon="el-icon-circle-check-outline" @click="confirmEdit(scope.row)">确定</el-button>
<el-button
v-else
type="warning"
size="mini"
plain
icon="el-icon-edit"
@click="scope.row.changeSafeValue=!scope.row.changeSafeValue">设置</el-button>
<el-tooltip effect="dark" content="设置安全库存量" placement="top" open-delay="1000">
<el-button v-if="scope.row.changeSafeValue" type="mini" size="mini" icon="el-icon-circle-check-outline" @click="confirmEdit(scope.row)">确定</el-button>
<el-button
v-else
type="warning"
size="mini"
plain
icon="el-icon-edit"
@click="scope.row.changeSafeValue=!scope.row.changeSafeValue">设置</el-button>
</el-tooltip>
</template>
</el-table-column>
</el-table>
@@ -271,10 +277,10 @@
style="margin-left: 10px"
@click="addOfflineContract">创建离线合同</el-button>
<el-button
type="primary"
type="warning"
size="small"
style="margin-left: 10px"
@click="addMateriel">选入</el-button>
@click="addMateriel">选入物料</el-button>
</div>
<el-table v-loading="" :data="tableData2" border style="max-height: 460px;" height="300px" size="mini" highlight-current-row @row-click="searchTable3">
<el-table-column type="expand" fixed="left">
@@ -327,7 +333,10 @@
<template slot-scope="scope">
<el-button :disabled="arrival(scope.row)" type="warning" plain size="mini" @click="editOfflineContract(scope.row)">编辑</el-button>
<el-button :disabled="arrival(scope.row)" type="danger" plain size="mini" @click="deleteOfflineContract(scope.row)">删除</el-button>
<el-button type="warning" size="mini" plain @click="exportExcel(scope.row)">导出</el-button>
<el-tooltip effect="dark" content="导出合同" placement="top" open-delay="1000">
<el-button type="warning" size="mini" plain @click="exportExcel(scope.row)">导出</el-button>
</el-tooltip>
</template>
</el-table-column>
</el-table>
@@ -341,7 +350,9 @@
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange2"
@current-change="handleCurrentChange2"/>
<el-button :disabled="disable" type="success" size="mini" style="float:right;margin-left:10px" @click="doneOfflineContact">生成</el-button>
<el-tooltip effect="dark" content="生成合同" placement="top" open-delay="1000">
<el-button :disabled="disable" type="success" size="mini" style="float:right;margin-left: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">
<el-switch
@@ -442,7 +453,7 @@
</el-table>
</el-card>
<el-dialog :visible.sync="dialogVisible1" title="供应商选择" center style="min-height: 300px" width="700px">
<el-dialog v-el-drag-dialog :visible.sync="dialogVisible1" title="供应商选择" center style="min-height: 300px" width="700px">
<el-form ref="form1" :model="form1" label-position="left" label-width="90px" class="searchForm">
<el-row>
<el-col :span="12">
@@ -548,7 +559,7 @@
</el-form>
</el-dialog>
<el-dialog :title="title2" :visible.sync="dialogVisible2" center style="min-height: 300px" width="750px">
<el-dialog v-el-drag-dialog :title="title2" :visible.sync="dialogVisible2" center style="min-height: 300px" width="750px">
<el-form ref="form2" :model="form2" :rules="rules2" label-position="right" label-width="120px">
<el-row>
<el-col :span="12">
@@ -606,7 +617,7 @@
</div>
</el-dialog>
<el-dialog :visible.sync="dialogVisible0" title="绑定到离线合同" center style="min-height: 300px">
<el-dialog v-el-drag-dialog :visible.sync="dialogVisible0" title="绑定到离线合同" center style="min-height: 300px">
<el-table :data="tableData02" border show-summary height="300" size="mini">
<el-table-column label="名称" align="center" min-width="100">
<template slot-scope="scope">
@@ -1550,7 +1561,7 @@ export default {
text-align: center;
}
.el-card{
margin-bottom: 15px;
margin-bottom: 1px;
}
.el-date-editor{
width:150px;

2
src/views/PurchasingCenter/OfflineContractRequestFund/index.vue
View File

@@ -535,7 +535,7 @@ export default {
<style scoped>
.el-card{
margin-bottom: 15px;
margin-bottom: 0px;
}
.el-date-editor{
width:150px;

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

@@ -464,7 +464,7 @@ export default {
margin: 0
}
.el-card{
margin-bottom: 15px;
margin-bottom: 0px;
}
.el-date-editor{
width:150px;

4
src/views/PurchasingCenter/PurchaseContractReview/index.vue
View File

@@ -29,7 +29,7 @@
style="margin-left:10px"
@click="total1=0;pageCurrent1=1;pageSize1=10;searchTable1()">查询</el-button>
<el-button
type="primary"
type="info"
size="small"
icon="el-icon-search"
style="margin-left:10px"
@@ -343,7 +343,7 @@ export default {
<style scoped>
.el-card{
margin-bottom: 15px;
margin-bottom: 0px;
}
.el-date-editor{
width:200px

6
src/views/PurchasingCenter/PurchaseSituationSearch/index.vue
View File

@@ -30,7 +30,9 @@
<span>型&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;号:</span>
<el-input v-model="model" placeholder="型号" size="small" clearable style="width:200px"/>
<el-button type="success" size="small" icon="el-icon-search" style="margin-left: 15px" @click="searchTable()">查询</el-button>
<el-button type="warning" size="small" icon="el-icon-download" style="margin-left: 15px" @click="exportDetail()">导出</el-button>
<el-tooltip effect="dark" content="将全部采购件导出到表格" placement="top" open-delay="1000">
<el-button type="warning" size="small" icon="el-icon-download" style="margin-left: 15px" @click="exportDetail()">导出</el-button>
</el-tooltip>
</el-row>
</el-card>
@@ -541,7 +543,7 @@ export default {
<style scoped>
.el-card{
margin-bottom: 15px;
margin-bottom: 0px;
}
.el-select{
width:200px

2
src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue
View File

@@ -1079,7 +1079,7 @@ export default {
margin: 0
}
.el-card{
margin-bottom: 15px;
margin-bottom: 0px;
}
.el-select{
width:200px

2
src/views/PurchasingCenter/SetPayPlan/index.vue
View File

@@ -105,7 +105,7 @@
<div style="min-height:500px;margin: 0px auto;width:800px;border:1px solid black" v-html="returns"/>
<el-dialog :visible.sync="dialogVisible1" title="增加付款计划" center style="min-height: 300px" width="400px">
<el-dialog v-el-drag-dialog :visible.sync="dialogVisible1" title="增加付款计划" center style="min-height: 300px" width="400px">
<el-form ref="form1" :model="form1" :rules="rules1" label-position="left" label-width="110px">
<el-form-item label="计划付款日期" prop="计划付款日期">
<el-date-picker v-model="form1.计划付款日期" value-format="yyyy-MM-dd" format="yyyy-MM-dd" size="small" type="date" placeholder="选择日期"/>

6
src/views/PurchasingCenter/SupplierManagement/index.vue
View File

@@ -65,7 +65,7 @@
</el-col>
<el-col style="width: 250px;margin:2px 0 0 15px">
<el-button type="success" size="small" icon="el-icon-search" @click="pageCurrent = 1;fetchData()">查询</el-button>
<el-button type="primary" size="small" icon="el-icon-circle-plus-outline" style="margin-left:10px" @click="handleAdd()">新增</el-button>
<el-button type="primary" size="small" icon="el-icon-circle-plus-outline" style="margin-left:10px" @click="handleAdd()">新增供应商</el-button>
</el-col>
</el-row>
</el-form>
@@ -154,7 +154,7 @@
</el-card>
<el-card>
<div style="display: inline-block;margin-bottom: 20px;width:90%">供应商联系人列表</div>
<el-button type="primary" size="small" icon="el-icon-circle-plus-outline" style="margin-bottom:10px;float:right" @click="handleAdd2()">新增</el-button>
<el-button type="primary" size="small" icon="el-icon-circle-plus-outline" style="margin-bottom:10px;float:right" @click="handleAdd2()">新增联系人</el-button>
<el-table :data="List1" border stripe size="mini">
<el-table-column label="姓名" align="center">
<template slot-scope="scope">
@@ -643,7 +643,7 @@ export default {
<style scoped>
.el-card{
margin-bottom: 15px;
margin-bottom: 0px;
}
.el-date-editor{
width:200px