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

更新

Browse Source
This commit is contained in:
liushuai
2020-03-14 20:28:29 +08:00
parent 64703a0c64
commit 95fb83f7cc
16 changed files with 326 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -46,7 +46,7 @@
<!--:label="item.label"-->
<!--:value="item.value"/>-->
<!--</el-select>-->
<el-input v-model="materialName" placeholder="名称规格" size="small" style="width:120px" clearable @keyup.enter.native="searchTable11()"/>
<el-input v-model="materialName" placeholder="图号名称规格" size="small" style="width:120px" clearable @keyup.enter.native="searchTable11()"/>
<el-input v-model="supplierName" placeholder="供货商" size="small" style="width:120px" clearable/>
<el-select v-model="machineValue" placeholder="机床" size="small" clearable filterable>
<el-option
@@ -114,7 +114,7 @@
:row-class-name="tableRowClassName"
border
style="width: 100%;max-height: 500px;"
height="500px"
height="400px"
size="mini"
@sort-change="sortChange"
@selection-change="handleSelectionChange1"
@@ -333,7 +333,7 @@
:row-class-name="tableRowClassName2"
border
style="width: 100%;max-height: 500px;"
height="500px"
height="400px"
size="mini"
@selection-change="handleSelectionChange2"
@sort-change="sortChange"
@@ -434,8 +434,9 @@
<div style="display: inline-block; float: left">
<el-tooltip :open-delay="1000" effect="dark" content="为选择的询价单添加物料" placement="top">
<el-button
type="warning"
type="primary"
size="small"
icon="el-icon-bottom"
plain
style="margin: 0px 20px"
@click="addInquirySheet">选入物料</el-button>
@@ -625,13 +626,14 @@
</el-col>
</el-row>
<el-card>
<el-card style="margin-top: 5px">
<el-card style="width: 1188px">
<el-row>
<el-input v-model="inquirySheetNum" placeholder="询价单号或供应商" size="small" clearable @keyup.enter.native="pageCurrent2=1;pageSize2=10000;total2=0;searchTable2()"/>
<el-button
type="search"
type="primary"
size="mini"
plain
icon="el-icon-search"
style="margin:0px 10px"
@click="pageCurrent2=1;pageSize2=10;total2=0;searchTable2()">查询</el-button>
@@ -641,7 +643,7 @@
size="mini"
style="margin-left: 10px"
@click="createInquirySheet">询价单</el-button>
<el-button type="distribution" size="mini" icon="el-icon-edit" style="margin-left: 10px" @click="editInquirySheet()">编辑</el-button>
<el-button type="warning" size="mini" plain icon="el-icon-edit" style="margin-left: 10px" @click="editInquirySheet()">编辑</el-button>
<!--<el-button-->
<!--:disabled="!(parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='')"-->
<!--type="repulse"-->
@@ -649,9 +651,9 @@
<!--size="mini"-->
<!--icon="el-icon-back"-->
<!--@click="deleteInquirySheet">撤回</el-button>-->
<el-button type="repulse" size="mini" icon="el-icon-delete" style="margin-left: 10px" @click="deleteInquirySheet()">删除</el-button>
<el-button :disabled="tableData3.length===0" type="search" size="mini" style="float: right" icon="el-icon-printer" @click="printInquirySheet()">打印</el-button>
<el-button :disabled="tableData3.length===0" type="search" size="mini" style="margin-left:10px;float: right" icon="el-icon-download" @click="exportInquirySheet()">导出</el-button>
<el-button type="danger" size="mini" plain icon="el-icon-delete" style="margin-left: 10px" @click="deleteInquirySheet()">删除</el-button>
<el-button :disabled="tableData3.length===0" type="primary" plain size="mini" style="float: right" icon="el-icon-printer" @click="printInquirySheet()">打印</el-button>
<el-button :disabled="tableData3.length===0" type="success" plain size="mini" style="margin-left:10px;float: right" icon="el-icon-download" @click="exportInquirySheet()">导出</el-button>
</el-row>
</el-card>
<el-row>

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

@@ -148,7 +148,7 @@
<el-radio-button label="模板2" disabled/>
</el-radio-group>
<el-button type="primary" plain size="small" style="margin-left:10px;" @click="editContract()">预览合同</el-button>
<span>递交审批：</span>
<span>递交审核：</span>
<el-tooltip :open-delay="1000" effect="dark" content="生成合同并提交审核" placement="top">
<el-button type="primary" plain size="small" @click="generateContract()">递交</el-button>
</el-tooltip>

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

@@ -54,7 +54,7 @@
{{ scope.row.发票号 }}
</template>
</el-table-column>
<el-table-column label="发票金额" align="center" width="80">
<el-table-column label="发票金额(元)" align="center" width="110">
<template slot-scope="scope">
{{ scope.row.发票金额 }}
</template>
@@ -196,32 +196,32 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="尚欠金额(元)">
<el-input v-positive="'float'" v-model="form1.unpaid" class="editWorkTime" size="small" placeholder="尚欠金额" type="number"/>
<el-form-item label="备注">
<el-input v-model="form1.remark" size="small" placeholder="备注"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="税额(元)">
<el-form-item v-show="false" label="税额(元)">
<el-input v-positive="'float'" v-model="form1.tax" class="editWorkTime" size="small" placeholder="税额" type="number"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="已付款项">
<el-form-item v-show="false" label="已付款项">
<el-input v-model="form1.paid" size="small" placeholder="已付款项"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="是否费用类">
<el-form-item v-show="false" label="是否费用类">
<el-input v-model="form1.isCost" size="small" placeholder="是否费用类发票"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="备注">
<el-input v-model="form1.remark" size="small" placeholder="备注"/>
<el-form-item v-show="false" label="尚欠金额(元)">
<el-input v-positive="'float'" v-model="form1.unpaid" class="editWorkTime" size="small" placeholder="尚欠金额" type="number"/>
</el-form-item>
</el-col>
<!--<b v-show="title1 === '创建发票结算申请单'" style="float:left;color: #f56c6c;margin-top: 13px">* </b>-->
@@ -436,8 +436,8 @@ export default {
if (response.data[0].result === '1') {
this.$message.success('增加成功')
this.dialogVisible1 = false
this.invoiceNum = this.form1.invoiceNum
this.searchTable1(this.invoiceNum)
this.supperiler = this.form1.invoiceNum
this.searchTable1(this.supperiler)
} else {
this.$message.error('增加失败')
}

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

@@ -284,8 +284,8 @@
<template slot-scope="scope">
<el-button :disabled="arrival(scope.row)" type="text" icon="el-icon-edit" plain size="mini" @click="editOfflineContract(scope.row)"/>
<el-button :disabled="arrival(scope.row)" type="text" icon="el-icon-delete" plain size="mini" @click="deleteOfflineContract(scope.row)"/>
<el-tooltip :open-delay="1000" effect="dark" content="导出合同" placement="top">
<el-button type="text" size="mini" icon="el-icon-download" plain @click="exportExcel(scope.row)"/>
<el-tooltip :open-delay="1000" effect="dark" content="打印合同" placement="top">
<el-button type="text" size="mini" icon="el-icon-printer" plain @click="exportExcel(scope.row)"/>
</el-tooltip>
</template>
</el-table-column>

18
src/views/PurchasingCenter/OfflineContractSearch/index.vue
View File

@@ -12,13 +12,17 @@
plain
style="margin-left:10px"
@click="total1=0;pageCurrent1=1;pageSize1=10;searchTable1()">查询</el-button>
<el-button
type="danger"
size="small"
icon="el-icon-back"
plain
style="margin-left:10px"
@click="back">打回</el-button>
<el-tooltip :open-delay="200" effect="dark" content="打回重新编制" placement="top">
<div style="display: inline-block">
<el-button
type="danger"
size="small"
icon="el-icon-back"
plain
style="margin-left:10px"
@click="back">打回</el-button>
</div>
</el-tooltip>
</el-row>
</div>
</el-card>

22
src/views/PurchasingCenter/PurchaseContractSearch/index.vue
View File

@@ -26,7 +26,7 @@
<!--<span>供应商:</span>-->
<!--<el-input v-focus1="rec1" v-model="rec1" size="small"/>-->
<!--<span>{{ rec1 }}</span>-->
<el-input v-model="supplierName" placeholder="供应商" size="small" clearable style="width:180px" @keyup.enter.native="total1=0;pageCurrent1=1;pageSize1=30;searchTable1()"/>
<el-input v-model="supplierName" placeholder="供应商或合同号" size="small" clearable style="width:180px" @keyup.enter.native="total1=0;pageCurrent1=1;pageSize1=30;searchTable1()"/>
<!--<span>合同编号:</span>-->
<!--<el-input v-model="contractNumber" placeholder="合同编号" size="small" clearable style="width:200px" @keyup.enter.native="total1=0;pageCurrent1=1;pageSize1=30;searchTable1()"/>-->
<!--<span>采购员:</span>-->
@@ -74,11 +74,11 @@
@click="total1=0;pageCurrent1=1;pageSize1=30;searchTable1()">查询</el-button>
<el-tooltip :open-delay="1000" effect="dark" content="打印采购合同" placement="top">
<el-button
type="warning"
type="primary"
size="small"
icon="el-icon-download"
icon="el-icon-printer"
plain
@click="download()">导出</el-button>
@click="download()">打印</el-button>
</el-tooltip>
</el-row>
</div>
@@ -217,7 +217,7 @@
<!-- </el-table-column>-->
<el-table-column label="操作" align="center" width="70">
<template slot-scope="scope">
<el-button :disabled="false" type="text" size="mini" icon="el-icon-delete" @click="deleteContract(scope.row)"/>
<el-button :disabled="Number(id) !== Number(scope.row.采购员流水号) || !((Number(scope.row.审核情况流水号) !== 1) && (Number(scope.row.审批情况流水号) !== 1))" type="text" size="mini" icon="el-icon-delete" @click="deleteContract(scope.row)"/>
</template>
</el-table-column>
</el-table>
@@ -246,6 +246,7 @@
import { initContract, initBuyer, searchTable1, searchTable2, handleDone, deleteContract } from '@/api/PurchasingCenter/PurchaseContractSearch'
import QRCode from 'qrcode'
import $ from 'jquery'
import { mapGetters } from 'vuex'
// import { exportExcelMethod } from './exportExcel'
export default {
@@ -343,6 +344,14 @@ export default {
contractValue: '' // 显示表2和变更合同用的变量
}
},
computed: {
...mapGetters([
'sidebar',
'avatar',
'name',
'id'
])
},
created() {
this.fetchData()
this.searchTable1()
@@ -474,6 +483,8 @@ export default {
未通过审核原因: response.data.rows[i].未通过审核原因,
审核情况内容: response.data.rows[i].审核情况内容,
审批情况内容: response.data.rows[i].审批情况内容,
审核情况流水号: response.data.rows[i].审核情况流水号,
审批情况流水号: response.data.rows[i].审批情况流水号,
未通过原因: response.data.rows[i].未通过原因,
合同总额: response.data.rows[i].合同总额,
付款金额: response.data.rows[i].付款金额,
@@ -482,6 +493,7 @@ export default {
姓名: response.data.rows[i].姓名,
合同金额: response.data.rows[i].合同金额,
欠款金额: response.data.rows[i].欠款金额,
采购员流水号: response.data.rows[i].采购员流水号,
采购合同流水号: response.data.rows[i].采购合同流水号
})
}