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

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

Browse Source
This commit is contained in:
liushuai
2020-04-29 17:49:22 +08:00
parent c11f6217ce 585a6d7198
commit 85c1f865ff
39 changed files with 483 additions and 482 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -76,7 +76,7 @@
<!--<el-cascader :options="materialStatus" :props="{ checkStrictly: true }" v-model="materialStatusValue" style="width: 100px" size="small"/>-->
<!--<el-input v-model="materialSpec" placeholder="物料规格" size="small" style="width:120px" clearable/>-->
<el-button type="primary" size="small" icon="el-icon-search" plain style="margin-left: 10px" @click="pageCurrent11=1;pageSize11=50;total11=0;searchTable11()">查询</el-button>
<el-button type="search" size="small" icon="el-icon-download" style="margin-left: 10px" @click="exportUninquirySheet">导出未询价单</el-button>
<el-button v-positive="'loading'" :disabled="false" type="search" size="small" icon="el-icon-download" style="margin-left: 10px" @click="exportUninquirySheet">导出未询价单</el-button>
<el-tooltip :open-delay="100" effect="dark" content="开启物料变更" placement="top">
<el-switch v-model="switchValue" active-color="#13ce66" inactive-color="#ff4949" style="margin-left: 30px"/>
</el-tooltip>
@@ -235,18 +235,21 @@
<!--</template>-->
<!--</el-table-column>-->
</el-table>
<div class="block" style="display: inline-block;">
<el-pagination
:current-page="pageCurrent11"
:page-sizes="[10, 50, 100, 150]"
:page-size="pageSize11"
:total="total11"
style="display:inline-block;width:50px"
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange11"
@current-change="handleCurrentChange11"/>
<div class="block" style="display: inline-block;width:1150px;float: right;">
<div style="display: inline-block;float: right;">
<el-pagination
:current-page="pageCurrent11"
:page-sizes="[10, 50, 100, 150]"
:page-size="pageSize11"
:total="total11"
mini
style="display:inline-block;margin-right: 0px"
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange11"
@current-change="handleCurrentChange11"/>
</div>
</div>
<div style="display: inline-block; float: left">
<div style="display: inline-block;float: left">
<el-tooltip :open-delay="1000" effect="dark" content="为选择的询价单添加物料" placement="top">
<el-button
type="primary"
@@ -417,16 +420,19 @@
<!--</el-table-column>-->
</el-table>
</el-row>
<div class="block" style="display: inline-block;">
<el-pagination
:current-page="pageCurrent12"
:page-sizes="[10, 50, 100, 150]"
:page-size="pageSize12"
:total="total12"
style="display:inline-block;width:50px"
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange12"
@current-change="handleCurrentChange12"/>
<div class="block" style="display: inline-block;width:1150px;float: right;">
<div style="display: inline-block;float: right;">
<el-pagination
:current-page="pageCurrent12"
:page-sizes="[10, 50, 100, 150]"
:page-size="pageSize12"
:total="total12"
mini
style="display:inline-block;margin-right: 0px"
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange12"
@current-change="handleCurrentChange12"/>
</div>
</div>
<div style="display: inline-block; float: left">
<el-tooltip :open-delay="1000" effect="dark" content="为选择的询价单添加物料" placement="top">
@@ -2572,4 +2578,7 @@ export default {
line-height: 46px;
}
}
el-pagination__sizes {
width: 10px;
}
</style>

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

@@ -147,10 +147,10 @@
<el-radio-button label="模板1"/>
<el-radio-button label="模板2" disabled/>
</el-radio-group>
<el-button type="primary" plain size="small" style="margin-left:10px;" @click="editContract()">预览合同</el-button>
<el-button v-positive="'loading'" :disabled="false" type="primary" plain size="small" style="margin-left:10px;" @click="editContract()">预览合同</el-button>
<span>递交审核：</span>
<el-tooltip :open-delay="1000" effect="dark" content="生成合同并提交审核" placement="top">
<el-button :disabled="openDeal" type="primary" plain size="small" @click="generateContract()">递交</el-button>
<el-button v-positive="'loading'" :disabled="openDeal" type="primary" plain size="small" @click="generateContract()">递交</el-button>
</el-tooltip>
<hr>
<!--html代码-->

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

@@ -24,7 +24,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-button type="warning" size="small" icon="el-icon-goods" plain style="" @click="requestFund">请款</el-button>
<!-- <el-checkbox v-model="searchAll" style="margin-left: 50px">查询全部</el-checkbox>-->
<el-button type="success" size="small" icon="el-icon-download" plain style="float: right; margin-right: 20px;" @click="exportExcel">导出</el-button>
<el-button v-positive="'loading'" :disabled="false" type="success" size="small" icon="el-icon-download" plain style="float: right; margin-right: 20px;" @click="exportExcel">导出</el-button>
</div>
<!--<h3>请款表</h3>-->
<el-table v-loading="" :data="tableData1" border size="mini" height="200" stripe highlight-current-row @row-click="searchTable02">
@@ -246,7 +246,7 @@
</el-table-column>
</el-table>
<span>合计：<el-input v-model="SUM" readonly size="mini" style="width: 150px; margin: 10px 10px 0 10px"/>元</span>
<el-button type="primary" size="small" style="float:right;margin: 10px" icon="el-icon-check" @click="submitRequestFund">确定请款</el-button>
<el-button v-positive="'loading'" :disabled="false" type="primary" size="small" style="float:right;margin: 10px" icon="el-icon-check" @click="submitRequestFund">确定请款</el-button>
</el-dialog>
</div>
</template>

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

@@ -49,7 +49,7 @@
<el-tabs v-model="PartType" type="border-card" @tab-click="searchTable()">
<el-tab-pane label="标准件" name="标准件">
<el-table v-loading="loading0" :data="tableData0" size="mini" height="700px" border stripe @sort-change="sortChange0">
<el-table-column align="center" prop="询价状态编号" label="采购状态" width="90px">
<el-table-column align="center" prop="询价状态编号" label="采购状态" width="110px" sortable="custom">
<template slot-scope="scope">
<!--<el-tag v-if="!scope.row.人员编号" type="primary" size="small">未分配</el-tag>-->
<!--<el-tag v-if="parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!==''" type="warning" size="small">未询价</el-tag>-->
@@ -161,7 +161,7 @@
<div class="block">
<el-pagination
:current-page="pageCurrent0"
:page-sizes="[10, 20, 30, 40]"
:page-sizes="[10, 20, 30, 40, 50]"
:page-size="pageSize0"
:total="total0"
style="margin-top:10px;display:inline-block;width:50%"
@@ -172,7 +172,7 @@
</el-tab-pane>
<el-tab-pane label="外购件" name="外购件">
<el-table v-loading="loading1" :data="tableData1" size="mini" height="700px" border stripe @sort-change="sortChange1">
<el-table-column align="center" label="采购状态" prop="询价状态编号" width="90px">
<el-table-column align="center" label="采购状态" prop="询价状态编号" width="110px" sortable="custom">
<template slot-scope="scope">
<span v-if="!scope.row.人员编号" type="primary" size="small">未分配</span>
<span v-if="parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!==''" type="warning" size="small">未询价</span>
@@ -276,7 +276,7 @@
<div class="block">
<el-pagination
:current-page="pageCurrent1"
:page-sizes="[10, 20, 30, 40]"
:page-sizes="[10, 20, 30, 40, 50]"
:page-size="pageSize1"
:total="total1"
style="margin-top:10px;display:inline-block;width:50%"
@@ -287,7 +287,7 @@
</el-tab-pane>
<el-tab-pane label="基本件" name="基本件">
<el-table v-loading="loading2" :data="tableData2" size="mini" height="700px" border stripe @sort-change="sortChange2">
<el-table-column align="center" label="采购状态" prop="询价状态编号" width="90px">
<el-table-column align="center" label="采购状态" prop="询价状态编号" width="110px" sortable="custom">
<template slot-scope="scope">
<span v-if="!scope.row.人员编号" type="primary" size="small">未分配</span>
<span v-if="parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!==''" type="warning" size="small">未询价</span>
@@ -397,7 +397,7 @@
<div class="block">
<el-pagination
:current-page="pageCurrent2"
:page-sizes="[10, 20, 30, 40]"
:page-sizes="[10, 20, 30, 40, 50]"
:page-size="pageSize2"
:total="total2"
style="margin-top:10px;display:inline-block;width:50%"
@@ -434,13 +434,13 @@ export default {
tableData2: [],
tableData3: [],
pageCurrent0: 1,
pageSize0: 20,
pageSize0: 50,
total0: 0,
pageCurrent1: 1,
pageSize1: 20,
pageSize1: 50,
total1: 0,
pageCurrent2: 1,
pageSize2: 20,
pageSize2: 50,
total2: 0
}
},
@@ -657,6 +657,10 @@ export default {
this.partName = 4
} else if (column.prop === '供应商名称') {
this.partName = 5
} else if (column.prop === '供货商') {
this.partName = 4
} else if (column.prop === '询价状态编号') {
this.partName = 6
} else {
this.partName = ''
}
@@ -728,6 +732,8 @@ export default {
this.partName = 4
} else if (column.prop === '供应商名称') {
this.partName = 5
} else if (column.prop === '询价状态编号') {
this.partName = 6
} else {
this.partName = ''
}
@@ -801,6 +807,8 @@ export default {
this.partName = 4
} else if (column.prop === '供应商名称') {
this.partName = 5
} else if (column.prop === '询价状态编号') {
this.partName = 6
} else {
this.partName = ''
}