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-04-07 19:13:40 +08:00
parent a0474aaf33
commit 193dd7ece6
22 changed files with 865 additions and 330 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/views/WorkshopProcurement/AccountingPrice/index.vue
View File

@@ -42,12 +42,12 @@
{{ scope.row.数量 }}
</template>
</el-table-column>
<el-table-column align="center" label="单价(元)" width="100px">
<el-table-column align="center" label="单价(元)" width="150px">
<template slot-scope="scope">
<el-input v-model="scope.row.单价" size="mini" width="80px" align="center" @blur="filterNuber(scope.row.单价, scope.$index, '单价', scope.row)"/>
<el-input v-model="scope.row.单价" size="mini" width="100%" align="center" @blur="filterNuber(scope.row.单价, scope.$index, '单价', scope.row)"/>
</template>
</el-table-column>
<el-table-column align="center" label="总额(元)" width="90px" prop="金额">
<el-table-column align="center" label="总额(元)" width="150px" prop="金额">
<template slot-scope="scope">
{{ scope.row.金额 }}
</template>

7
src/views/WorkshopProcurement/ArrivalStateSearch/index.vue
View File

@@ -26,7 +26,7 @@
</el-card>
<el-card>
<el-table v-loading="loading1" :data="tableData" stripe border style="width: 980px;margin-top: 10px" height="600px" size="mini">
<el-table v-loading="loading1" :data="tableData" stripe border style="width: 1070px;margin-top: 10px" height="600px" size="mini">
<el-table-column label="采购合同编号" align="center" width="140">
<template slot-scope="scope">
{{ scope.row.采购合同编号 }}
@@ -67,6 +67,11 @@
{{ scope.row.已到货数量 }}
</template>
</el-table-column>
<el-table-column label="到货时间" align="center" width="90">
<template slot-scope="scope">
{{ scope.row.到货时间 ? scope.row.到货时间.split(' ')[0] : '' }}
</template>
</el-table-column>
</el-table>
<div class="block" style="margin-top: 10px;">
<el-pagination

9
src/views/WorkshopProcurement/InvoiceSettlementApplication1/index.vue
View File

@@ -9,7 +9,7 @@
<el-card>
<h4 style="margin: 5px">到票结算申请单</h4>
<el-table id="expandTable" :data="tableData1" border stripe highlight-current-row style="width: 100%;" height="350px" size="mini" @row-click="searchTable2">
<el-table id="expandTable" :data="tableData1" border stripe highlight-current-row style="width: 100%;" height="260px" size="mini" @row-click="searchTable2">
<!-- <el-table-column label="详情" type="expand">-->
<!-- <template slot-scope="scope">-->
<!-- <el-form label-position="left" inline class="demo-table-expand">-->
@@ -141,7 +141,7 @@
<span>到票号：</span>
<el-input v-model="invoiceNumber" size="small" placeholder="请选择到票结算申请单" readonly/>
<el-button :disabled="disabled" type="distribution" size="small" icon="el-icon-circle-plus-outline" style="margin-left:10px" @click="addInStoreRecord()">追加入库记录</el-button>
<el-table :data="tableData2" border highlight-current-row style="width: 100%;max-height: 250px;" height="250px" size="mini">
<el-table :data="tableData2" border highlight-current-row style="width: 100%;max-height: 420px;" height="420px" size="mini">
<el-table-column label="名称" align="center" width="150">
<template slot-scope="scope">
{{ scope.row.采购物料名称 || scope.row.离线物料名称 || scope.row.采购零件名称 }}
@@ -716,10 +716,7 @@ export default {
addTable2(this.applyOrderNum, group1, group2, 1).then(response => {
if (response.data[0].result === '1') {
this.$message.success('追加成功')
this.dialogVisible2 = false
searchTable2(this.applyOrderNum).then(response => {
this.tableData2 = response.data
})
this.searchTable01()
} else { this.$message.error('追加失败') }
})
} else if (this.contractType === '离线合同') {

12
src/views/WorkshopProcurement/InvoiceSettlementApprove1/index.vue
View File

@@ -8,7 +8,7 @@
</el-card>
<el-card>
<h4 style="margin: 5px">到票结算申请单</h4>
<el-table id="expandTable" :data="tableData1" border highlight-current-row style="width: 100%" height="330" size="mini" @row-click="searchTable2">
<el-table id="expandTable" :data="tableData1" border highlight-current-row style="width: 100%" height="260" size="mini" @row-click="searchTable2">
<!-- <el-table-column label="展开" align="center" type="expand" >-->
<!-- <template slot-scope="scope">-->
<!-- <el-form label-position="left" inline class="demo-table-expand">-->
@@ -41,7 +41,7 @@
<!-- </el-form>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="供应商" align="center" min-width="200">
<el-table-column label="供应商" align="center" min-width="200" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.供应商名称 }}
</template>
@@ -73,7 +73,7 @@
</el-table-column>
<el-table-column label="审批时间" align="center" min-width="110">
<template slot-scope="scope">
{{ scope.row.审批3时间 ? scope.row.审批3时间 : '—' }}
{{ scope.row.审批3时间 ? scope.row.审批3时间.split(' ')[0] : '—' }}
</template>
</el-table-column>
<el-table-column label="总经理审批" align="center" min-width="100">
@@ -83,7 +83,7 @@
</el-table-column>
<el-table-column label="审批时间" align="center" min-width="110">
<template slot-scope="scope">
{{ scope.row.审批4时间 ? scope.row.审批4时间 : '—' }}
{{ scope.row.审批4时间 ? scope.row.审批4时间.split(' ')[0] : '—' }}
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="160" fixed="right">
@@ -110,7 +110,7 @@
<h4 style="margin: 5px;display: inline-block;width: 150px;">到结算申请单明细</h4>
<span>到票号：</span>
<el-input v-model="invoiceNumber" size="small" placeholder="请选择到票结算申请单" readonly/>
<el-table :data="tableData2" border highlight-current-row style="width: 100%;max-height: 250px;" height="250px" size="mini">
<el-table :data="tableData2" border highlight-current-row style="width: 100%;max-height: 420px;" height="420px" size="mini">
<el-table-column label="名称" align="center" min-width="100">
<template slot-scope="scope">
{{ scope.row.采购物料名称 || scope.row.离线物料名称 || scope.row.采购零件名称 }}
@@ -126,7 +126,7 @@
{{ scope.row.采购物料规格 || scope.row.离线物料规格 || scope.row.采购零件规格 }}
</template>
</el-table-column>
<el-table-column label="供应商" align="center" min-width="150">
<el-table-column label="供应商" align="center" min-width="150" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.供应商名称 }}
</template>

8
src/views/WorkshopProcurement/ProcurementContractApproval/index.vue
View File

@@ -12,8 +12,6 @@
<div style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</div>
</el-option>
</el-select>
<span>采购员:</span>
<el-input v-model="buyerName" placeholder="请双击选择" size="small" clearable style="width:120px" @dblclick.native="initBuyer();dialogVisible2=true;submitDisable=true"/>
<span>供应商:</span>
<el-input v-model="supplierName" placeholder="供应商" size="small" clearable/>
<el-button
@@ -47,6 +45,11 @@
{{ scope.row.姓名 }}
</template>
</el-table-column>
<el-table-column label="递交时间" align="center">
<template slot-scope="scope">
{{ scope.row.操作日期 ? scope.row.操作日期.split(' ')[0] : '' }}
</template>
</el-table-column>
<el-table-column label="总金额" align="center">
<template slot-scope="scope">
{{ scope.row.含税总金额 }}
@@ -476,6 +479,7 @@ export default {
}
this.tableData1 = response.data.rows
this.total1 = response.data.total
this.type = 0
})
},
Open(row) {

12
src/views/WorkshopProcurement/PurchaseContractRequestFund1/index.vue
View File

@@ -55,6 +55,11 @@
{{ scope.row.请款金额 }}
</template>
</el-table-column>
<el-table-column label="审批时间" align="center" width="90">
<template slot-scope="scope">
{{ scope.row.审批时间 ? scope.row.审批时间.split(' ')[0] : '' }}
</template>
</el-table-column>
<!-- <el-table-column label="请款付款情况" align="center">-->
<el-table-column label="审批情况" width="80" align="center">
<template slot-scope="scope">
@@ -68,6 +73,11 @@
{{ scope.row.未通过审批原因 === '通过' ? '—' : scope.row.未通过审批原因 }}
</template>
</el-table-column>
<el-table-column label="付款时间" align="center" width="90">
<template slot-scope="scope">
{{ scope.row.付款时间 ? scope.row.付款时间.split(' ')[0] : '' }}
</template>
</el-table-column>
<el-table-column label="付款情况" width="80" align="center">
<template slot-scope="scope">
<span v-if="Number(scope.row.付款情况流水号)===3" type="primary" size="small">未操作</span>
@@ -112,7 +122,7 @@
</el-col>
<el-col style="width: 440px">
<el-card>
<el-table :data="gridData" highlight-current-row size="mini" show-summary>
<el-table :data="gridData" highlight-current-row border size="mini" show-summary>
<el-table-column width="50" align="center" type="index" label="序号"/>
<el-table-column min-width="120" align="center" label="采购合同编号">
<template slot-scope="scope">