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-21 17:10:21 +08:00
parent 3c554e5909
commit e314062d42
23 changed files with 473 additions and 793 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/api/ManufacturingCenter/PartAssignment.js
View File

@@ -96,7 +96,7 @@ export function searchTable1(PurchaseOrder, check4) {
} }
}) })
} }
export function addData(num1, num2, id, time, remarks) { export function addData(num1, num2, id, remarks) {
return request({ return request({
url: '', url: '',
method: 'post', method: 'post',
@@ -105,11 +105,11 @@ export function addData(num1, num2, id, time, remarks) {
ModularID: router.currentRoute.path, ModularID: router.currentRoute.path,
type: '2', type: '2',
name: '车间管理_基本件采购_请购单_增加数据', name: '车间管理_基本件采购_请购单_增加数据',
param: '请购车间=' + num1 + '&请购人=' + num2 + '&人员编号=' + id + '&请购时间=' + time + '&备注=' + remarks param: '请购车间=' + num1 + '&请购人=' + num2 + '&人员编号=' + id + '&备注=' + remarks
} }
}) })
} }
export function editData(RequisitionList, num1, time) { export function editData(RequisitionList, num1) {
return request({ return request({
url: '', url: '',
method: 'post', method: 'post',
@@ -118,7 +118,7 @@ export function editData(RequisitionList, num1, time) {
ModularID: router.currentRoute.path, ModularID: router.currentRoute.path,
type: '2', type: '2',
name: '车间管理_基本件采购_请购单_编辑数据', name: '车间管理_基本件采购_请购单_编辑数据',
param: '请购单流水号=' + RequisitionList + '&请购车间=' + num1 + '&请购时间=' + time param: '请购单流水号=' + RequisitionList + '&请购车间=' + num1
} }
}) })
} }

8
src/api/PurchasingCenter/MaterialMProcure.js
View File

@@ -89,7 +89,7 @@ export function initMaterialSource() {
} }
}) })
} }
export function searchmaterial(check1, MaterialName, check2, FullNameOfMaterial, check3, MaterialSpecification, check4, MaterialModel, pageCurrent, pageSize, check5, MaterialCategoryValue, check6, MaterialVarietyValue, check7, MeasurementUnitValue, check8, MaterialSourceValue, check9, supplierValue) { export function searchmaterial(check1, MaterialName, check2, FullNameOfMaterial, check3, MaterialSpecification, check4, MaterialModel, pageCurrent, pageSize, check5, MaterialCategoryValue, check6, MaterialVarietyValue, check7, MeasurementUnitValue, check8, MaterialSourceValue, check9, supplierValue, check, dateRange0, dateRange1) {
return request({ return request({
url: '', url: '',
method: 'post', method: 'post',
@@ -98,7 +98,7 @@ export function searchmaterial(check1, MaterialName, check2, FullNameOfMaterial,
ModularID: router.currentRoute.path, ModularID: router.currentRoute.path,
type: '1', type: '1',
name: '库存管理_物料主文件_基本_采购部_查询数据_分页', name: '库存管理_物料主文件_基本_采购部_查询数据_分页',
param: '物料流水号_check=0&物料代码_check=0&物料名称_check=' + check1 + '=int&物料名称=' + MaterialName + '&物料全名_check=' + check2 + '=int&物料全名=' + FullNameOfMaterial + '&物料规格_check=' + check3 + '=int&物料规格=' + MaterialSpecification + '&物料型号_check=' + check4 + '=int&物料型号=' + MaterialModel + '&物料类别流水号_check=' + check5 + '=int&物料类别流水号=' + MaterialCategoryValue + '&物料品种流水号_check=' + check6 + '=int&物料品种流水号=' + MaterialVarietyValue + '&供货商流水号_check=' + check9 + '&供货商流水号=' + supplierValue + '&计量单位流水号_check=' + check7 + '&计量单位流水号=' + MeasurementUnitValue + '&物料来源流水号_check=' + check8 + '&物料来源流水号=' + MaterialSourceValue + '&PageCurrent=' + pageCurrent + '=int&PageSize=' + pageSize + '=int&PageCount=1=int=output&ItemCount=1=int=output' param: '物料流水号_check=0&物料代码_check=0&物料名称_check=' + check1 + '=int&物料名称=' + MaterialName + '&物料全名_check=' + check2 + '=int&物料全名=' + FullNameOfMaterial + '&物料规格_check=' + check3 + '=int&物料规格=' + MaterialSpecification + '&物料型号_check=' + check4 + '=int&物料型号=' + MaterialModel + '&物料类别流水号_check=' + check5 + '=int&物料类别流水号=' + MaterialCategoryValue + '&物料品种流水号_check=' + check6 + '=int&物料品种流水号=' + MaterialVarietyValue + '&供货商流水号_check=' + check9 + '&供货商流水号=' + supplierValue + '&计量单位流水号_check=' + check7 + '&计量单位流水号=' + MeasurementUnitValue + '&物料来源流水号_check=' + check8 + '&物料来源流水号=' + MaterialSourceValue + '&时间_check=' + check + '&开始时间=' + dateRange0 + '&结束时间=' + dateRange1 + '&PageCurrent=' + pageCurrent + '=int&PageSize=' + pageSize + '=int&PageCount=1=int=output&ItemCount=1=int=output'
} }
}) })
} }
@@ -116,7 +116,7 @@ export function getSupplier(check, num, pageCurrent, pageSize) {
} }
}) })
} }
export function addData(MaterialVariety, MaterialName, FullNameOfMaterial, MaterialSpecification, MaterialModel, MeasurementUnitValue, MaterialSourceValue, supplierValue1) { export function addData(MaterialVariety, MaterialName, FullNameOfMaterial, MaterialSpecification, MaterialModel, MeasurementUnitValue, MaterialSourceValue, supplierValue1, id) {
return request({ return request({
url: '', url: '',
method: 'post', method: 'post',
@@ -125,7 +125,7 @@ export function addData(MaterialVariety, MaterialName, FullNameOfMaterial, Mater
ModularID: router.currentRoute.path, ModularID: router.currentRoute.path,
type: '2', type: '2',
name: '库存管理_物料主文件_基本_采购部_增加数据', name: '库存管理_物料主文件_基本_采购部_增加数据',
param: '物料品种流水号=' + MaterialVariety + '&物料名称\\=' + MaterialName + '&物料全名\\=' + FullNameOfMaterial + '&物料规格\\=' + MaterialSpecification + '&物料型号\\=' + MaterialModel + '&计量单位流水号=' + MeasurementUnitValue + '&物料来源流水号=' + MaterialSourceValue + '&供货商流水号=' + supplierValue1 param: '物料品种流水号=' + MaterialVariety + '&物料名称\\=' + MaterialName + '&物料全名\\=' + FullNameOfMaterial + '&物料规格\\=' + MaterialSpecification + '&物料型号\\=' + MaterialModel + '&计量单位流水号=' + MeasurementUnitValue + '&物料来源流水号=' + MaterialSourceValue + '&供货商流水号=' + supplierValue1 + '&申请人=' + id
} }
}) })
} }

4
src/api/PurchasingCenter/OfflineContractSearch.js
View File

@@ -3,7 +3,7 @@ import state from '@/store'
import router from '@/router' import router from '@/router'
// 查询离线合同 // 查询离线合同
export function searchOfflineContract(pageCurrent, pageSize, check1, num, check2, name) { export function searchOfflineContract(pageCurrent, pageSize, check1, num, check2, name, order, partName, check3, dateRange0, dateRange1) {
return request({ return request({
url: '', url: '',
method: 'post', method: 'post',
@@ -12,7 +12,7 @@ export function searchOfflineContract(pageCurrent, pageSize, check1, num, check2
ModularID: router.currentRoute.path, ModularID: router.currentRoute.path,
type: '1', type: '1',
name: '采购管理_离线合同_查询数据', name: '采购管理_离线合同_查询数据',
param: `离线合同编号_check=${check1}&离线合同编号=${num}&供应商名称_check=${check2}&供应商名称=${name}&是否不包含编辑中=1`, param: `离线合同编号_check=${check1}&离线合同编号=${num}&供应商名称_check=${check2}&供应商名称=${name}&排序方式=${order}&排序名称=${partName}&时间_check=${check3}&开始时间=${dateRange0}&结束时间=${dateRange1}&是否不包含编辑中=1`,
Pagination: pageCurrent + '&' + pageSize Pagination: pageCurrent + '&' + pageSize
} }
}) })

6
src/views/Assembly/QualityInspectionInformationInquiry/index.vue
View File

@@ -44,7 +44,7 @@
type="date" type="date"
placeholder="选择结束日期"/> placeholder="选择结束日期"/>
<!--<span>质检情况:</span>--> <!--<span>质检情况:</span>-->
<el-select v-model="qualityInspectionValue" filterable placeholder="选择质检情况" size="small" style="width: 100px;margin-left: 10px" clearable> <el-select v-model="qualityInspectionValue" filterable placeholder="质检情况" size="small" style="width: 100px;margin-left: 10px" clearable>
<el-option <el-option
v-for="item in qualityInspection" v-for="item in qualityInspection"
:key="item.value" :key="item.value"
@@ -52,7 +52,7 @@
:value="item.value"/> :value="item.value"/>
</el-select> </el-select>
<!--<span>质检人员:</span>--> <!--<span>质检人员:</span>-->
<el-select v-model="personNum" filterable placeholder="选择质检人员" size="small" style="width: 130px;margin-left: 10px" clearable> <el-select v-model="personNum" filterable placeholder="质检人员" size="small" style="width: 130px;margin-left: 10px" clearable>
<el-option <el-option
v-for="item in person" v-for="item in person"
:key="item.value" :key="item.value"
@@ -546,7 +546,7 @@
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="不合格数量" prop="不合格数量"> <el-form-item label="不合格数量" prop="不合格数量">
<el-input-number v-model="form2.不合格数量" :min="0" :step="1" placeholder="不合格数量" style="width:150px" size="small" clearable/> <el-input-number v-model="form2.不合格数量" :disabled="form2.质检情况===1" :min="0" :max="Number(form2.检测数)" :step="1" placeholder="不合格数量" style="width:150px" size="small" clearable/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">

2
src/views/ManufacturingCenter/ContractDetailsInquiry/index.vue
View File

@@ -185,7 +185,7 @@ export default {
加工工时: response.data.result[i].设备工时, 加工工时: response.data.result[i].设备工时,
扫码工时: response.data.result[i].扫码工时, 扫码工时: response.data.result[i].扫码工时,
辅助工时: response.data.result[i].辅助工时, 辅助工时: response.data.result[i].辅助工时,
工时比值: Number(response.data.result[i].计划工时) === 0 ? 0 : Math.round(response.data.result[i].扫码工时 / Number(response.data.result[i].计划工时) * 100) / 100.00, 工时比值: Number(response.data.result[i].计划工时) === 0 ? 0 : Math.round(response.data.result[i].完成工时 / Number(response.data.result[i].计划工时) * 100) / 100.00,
加工日期: response.data.result[i].操作时间, 加工日期: response.data.result[i].操作时间,
图号及规格: response.data.result[i].零件图号_零件工艺计划, 图号及规格: response.data.result[i].零件图号_零件工艺计划,
修补工时: response.data.result[i].修补工时, 修补工时: response.data.result[i].修补工时,

2
src/views/ManufacturingCenter/MonthEndHourAccounting/index.vue
View File

@@ -210,7 +210,7 @@ export default {
this.check ? check2 = 1 : check2 = 0 this.check ? check2 = 1 : check2 = 0
searchTable(check2, this.startTime[0], this.startTime[1], this.orderName, this.order, check, this.name, check1, this.partNumber, this.pageCurrent, this.pageSize).then(response => { searchTable(check2, this.startTime[0], this.startTime[1], this.orderName, this.order, check, this.name, check1, this.partNumber, this.pageCurrent, this.pageSize).then(response => {
response.data.rows.map(v => { response.data.rows.map(v => {
this.$set(v, '工时比值', parseInt(v.计划工时) === 0 ? 0 : (Math.round(parseInt(v.扫码工时) / parseInt(v.计划工时) * 100) / 100.00)) this.$set(v, '工时比值', parseInt(v.计划工时) === 0 ? 0 : (Math.round(parseInt(v.完成工时) / parseInt(v.计划工时) * 100) / 100.00))
}) })
this.tableData = response.data.rows this.tableData = response.data.rows
this.total = response.data.total this.total = response.data.total

71
src/views/ManufacturingCenter/PartAssignment/index.vue
View File

@@ -32,14 +32,14 @@
</el-card> </el-card>
<el-tabs type="border-card" @tab-click="selectPart"> <el-tabs type="border-card" @tab-click="selectPart">
<el-tab-pane label="基本件"> <el-tab-pane label="基本件">
<el-table :data="tableData1" :row-class-name="tableRowClassName1" stripe border size="mini" style="width: 1160px" height="300px" @selection-change="handleSelectionChange"> <el-table :data="tableData1" :row-class-name="tableRowClassName1" stripe border size="mini" style="width: 100%" height="300px" @selection-change="handleSelectionChange">
<el-table-column align="center" width="50" type="selection"/> <el-table-column align="center" width="50" type="selection"/>
<el-table-column label="零件名称" align="center" width="140px" show-overflow-tooltip> <el-table-column label="零件名称" align="center" min-width="140px" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.零件名称 }} {{ scope.row.零件名称 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="零件图号" align="center" width="120px" show-overflow-tooltip> <el-table-column label="零件图号" align="center" min-width="120px" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.零件图号 }} {{ scope.row.零件图号 }}
</template> </template>
@@ -69,19 +69,19 @@
{{ scope.row.总数量 }} {{ scope.row.总数量 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="投产总数量" align="center" width="120px"> <el-table-column label="投产总数量" align="center" width="150px">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input-number v-model="scope.row.投产总数量" :min="0" size="mini" style="width: 95px"/> <el-input-number v-model="scope.row.投产总数量" :min="0" size="mini" style="width: 100%"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="备注" align="center" width="90px"> <el-table-column label="备注" align="center" min-width="90px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.零件备注 }} {{ scope.row.零件备注 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" width="100px"> <el-table-column label="操作" align="center" width="100px">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" size="mini" icon="el-icon-right" plain @click="OutParts(scope.row)">移出</el-button> <el-button type="text" size="mini" icon="el-icon-right" @click="OutParts(scope.row)">移出</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@@ -89,22 +89,22 @@
<el-tab-pane label="外购件"> <el-tab-pane label="外购件">
<el-table :data="tableData2" border size="mini" style="width: 100%" height="300px" @selection-change="handleSelectionChange"> <el-table :data="tableData2" border size="mini" style="width: 100%" height="300px" @selection-change="handleSelectionChange">
<el-table-column align="center" width="50" type="selection"/> <el-table-column align="center" width="50" type="selection"/>
<el-table-column label="物料代码" align="center" width="120"> <el-table-column label="物料代码" align="center" min-width="120">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.物料代码 }} {{ scope.row.物料代码 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="物料名称" align="center" width="120"> <el-table-column label="物料名称" align="center" min-width="120">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.物料名称 }} {{ scope.row.物料名称 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="物料规格" align="center" width="120"> <el-table-column label="物料规格" align="center" min-width="120">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.物料规格 }} {{ scope.row.物料规格 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="物料型号" align="center" width="120"> <el-table-column label="物料型号" align="center" min-width="120">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.物料型号 }} {{ scope.row.物料型号 }}
</template> </template>
@@ -124,12 +124,12 @@
{{ scope.row.总数量 }} {{ scope.row.总数量 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="采购总数量" align="center" width="135px"> <el-table-column label="采购总数量" align="center" width="150px">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input-number v-model="scope.row.采购总数量" :min="0" size="mini" style="width: 100%"/> <el-input-number v-model="scope.row.采购总数量" :min="0" size="mini" style="width: 100%"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="备注" align="center" width="120"> <el-table-column label="备注" align="center" min-width="120">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.备注 }} {{ scope.row.备注 }}
</template> </template>
@@ -139,22 +139,22 @@
<el-tab-pane label="标准件"> <el-tab-pane label="标准件">
<el-table :data="tableData3" border size="mini" style="width: 100%" height="300px" @selection-change="handleSelectionChange"> <el-table :data="tableData3" border size="mini" style="width: 100%" height="300px" @selection-change="handleSelectionChange">
<el-table-column align="center" width="50" type="selection"/> <el-table-column align="center" width="50" type="selection"/>
<el-table-column label="物料代码" align="center" width="120"> <el-table-column label="物料代码" align="center" min-width="120">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.物料代码 }} {{ scope.row.物料代码 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="物料名称" align="center" width="120"> <el-table-column label="物料名称" align="center" min-width="120">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.物料名称 }} {{ scope.row.物料名称 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="物料规格" align="center" width="120"> <el-table-column label="物料规格" align="center" min-width="120">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.物料规格 }} {{ scope.row.物料规格 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="物料型号" align="center" width="120"> <el-table-column label="物料型号" align="center" min-width="120">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.物料型号 }} {{ scope.row.物料型号 }}
</template> </template>
@@ -174,12 +174,12 @@
{{ scope.row.总数量 }} {{ scope.row.总数量 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="采购总数量" align="center" width="115px"> <el-table-column label="采购总数量" align="center" width="150px">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input-number v-model="scope.row.采购总数量" :min="0" size="mini" style="width: 90px"/> <el-input-number v-model="scope.row.采购总数量" :min="0" size="mini" style="width: 100%"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="备注" align="center" width="120"> <el-table-column label="备注" align="center" min-width="120">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.备注 }} {{ scope.row.备注 }}
</template> </template>
@@ -301,7 +301,7 @@
</el-tooltip> </el-tooltip>
<el-tooltip :open-delay="1200" effect="dark" content="移出" placement="top"> <el-tooltip :open-delay="1200" effect="dark" content="移出" placement="top">
<div style="display: inline-block"> <div style="display: inline-block">
<el-button type="text" size="mini" icon="el-icon-delete" @click="MoveOut(scope.row)"/> <el-button type="text" size="mini" icon="el-icon-right" @click="MoveOut(scope.row)"/>
</div> </div>
</el-tooltip> </el-tooltip>
</template> </template>
@@ -325,17 +325,6 @@
readonly readonly
style="width:160px;"/> style="width:160px;"/>
</el-form-item> </el-form-item>
<el-form-item label="请购时间" prop="请购时间">
<el-date-picker
v-model="form.请购时间"
size="small"
type="date"
format="yyyy-MM-dd"
value-format="yyyy-MM-dd"
style="width: 160px"
placeholder="选择日期"/>
</el-form-item>
<el-form-item label="备注"> <el-form-item label="备注">
<el-input <el-input
v-model="form.Remarks" v-model="form.Remarks"
@@ -934,7 +923,7 @@ export default {
submitAdd(formName) { submitAdd(formName) {
this.$refs[formName].validate((valid) => { this.$refs[formName].validate((valid) => {
if (valid) { if (valid) {
addData(this.form.请购车间, this.name, this.id, this.form.请购时间, this.form.Remarks).then(response => { addData(this.form.请购车间, this.name, this.id, this.form.Remarks).then(response => {
if (response.data[0].result === '1') { if (response.data[0].result === '1') {
this.$message.success('增加成功') this.$message.success('增加成功')
this.dialogFormVisible = false this.dialogFormVisible = false
@@ -956,12 +945,11 @@ export default {
this.dialogFormVisible = true this.dialogFormVisible = true
this.RequisitionList = row.请购单流水号 this.RequisitionList = row.请购单流水号
this.form.请购车间 = row.请购车间 this.form.请购车间 = row.请购车间
this.form.请购时间 = row.请购时间
}, },
submitEdit(formName) { // 提交单据编辑 submitEdit(formName) { // 提交单据编辑
this.$refs[formName].validate((valid) => { this.$refs[formName].validate((valid) => {
if (valid) { if (valid) {
editData(this.RequisitionList, this.form.请购车间, this.form.请购时间).then(response => { editData(this.RequisitionList, this.form.请购车间).then(response => {
if (response.data[0].result === '1') { if (response.data[0].result === '1') {
this.$message.success('编辑成功') this.$message.success('编辑成功')
this.dialogFormVisible = false this.dialogFormVisible = false
@@ -990,6 +978,19 @@ export default {
this.$message.success('删除成功') this.$message.success('删除成功')
this.tableData6 = [] this.tableData6 = []
this.searchTable1() this.searchTable1()
if (this.PartType === '基本件') {
searchPart(this.groupFloatValue).then(response => {
this.tableData1 = response.data
})
} else if (this.PartType === '外购件') {
searchPart1(this.groupFloatValue, 2).then(response => {
this.tableData2 = response.data
})
} else if (this.PartType === '标准件') {
searchPart1(this.groupFloatValue, 1).then(response => {
this.tableData3 = response.data
})
}
} else { } else {
this.$message.error('删除失败') this.$message.error('删除失败')
} }

50
src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue
View File

@@ -1,6 +1,6 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-row style="width: 720px"> <el-row style="width: 895px">
<el-card style="margin-bottom: 5px"> <el-card style="margin-bottom: 5px">
<el-row> <el-row>
<el-input v-model="ManufacturerName" size="small" placeholder="外协厂家" clearable style="width:200px"/> <el-input v-model="ManufacturerName" size="small" placeholder="外协厂家" clearable style="width:200px"/>
@@ -15,31 +15,31 @@
style="width:250px;margin-left: 5px;margin-top: 10px;margin-bottom: 10px" style="width:250px;margin-left: 5px;margin-top: 10px;margin-bottom: 10px"
start-placeholder="开始日期" start-placeholder="开始日期"
end-placeholder="结束日期"/> end-placeholder="结束日期"/>
<el-button type="primary" class="el-icon-search" style="margin-left: 20px" size="small" plain @click="getParts()">查询</el-button> <el-button type="primary" class="el-icon-search" style="margin-left: 20px" size="small" plain @click="外协厂家流水号 = '';getParts()">查询</el-button>
<el-button type="success" plain class="el-icon-download" style="margin-left: 30px" size="small" @click="exportExcel">导出</el-button> <el-button type="success" plain class="el-icon-download" style="margin-left: 220px" size="small" @click="exportExcel">导出</el-button>
</el-row> </el-row>
<el-table v-loading="loading" :data="tableData" size="mini" highlight-current-row height="300" style="width: 690px;margin-bottom: 10px" border element-loading-text="拼命加载中" @row-click="rowClick"> <el-table v-loading="loading" :data="tableData" size="mini" highlight-current-row height="300" style="width: 870px;margin-bottom: 10px" border element-loading-text="拼命加载中" @row-click="rowClick">
<el-table-column label="厂家" prop="外协厂家名称" align="center" width="230px"> <el-table-column label="厂家" prop="外协厂家名称" align="center" width="255px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.外协厂家名称 }} {{ scope.row.外协厂家名称 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="外协金额(元)" prop="总价" align="center" width="110px"> <el-table-column label="外协金额(元)" prop="总价" align="center" width="150px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.总价 }} {{ scope.row.总价 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="到票金额(元)" align="center" width="110px" prop="开票金额"> <el-table-column label="到票金额(元)" align="center" width="150px" prop="开票金额">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.开票金额 }} {{ scope.row.开票金额 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="付款金额(元)" align="center" width="110px"> <el-table-column label="付款金额(元)" align="center" width="150px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.付款金额 }} {{ scope.row.付款金额 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="未付金额(元)" align="center" width="110px"> <el-table-column label="未付金额(元)" align="center" width="150px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.应付金额 }} {{ scope.row.应付金额 }}
</template> </template>
@@ -50,8 +50,8 @@
<el-col style="width: 520px"> <el-col style="width: 520px">
<el-card> <el-card>
<el-row> <el-row>
<span style="margin-top: 10px">开票明细:</span> <span style="margin-top: 10px">到票明细:</span>
<el-button type="distribution" size="small" icon="el-icon-circle-plus-outline" style="margin-left:10px" @click="handleAdd1('form1')">开票</el-button> <el-button type="distribution" size="small" icon="el-icon-circle-plus-outline" style="margin-left:10px" @click="handleAdd1('form1')">到票</el-button>
</el-row> </el-row>
<el-table v-loading="loading2" :data="tableData2" size="mini" stripe height="400" style="width: 100%" border element-loading-text="拼命加载中"> <el-table v-loading="loading2" :data="tableData2" size="mini" stripe height="400" style="width: 100%" border element-loading-text="拼命加载中">
<el-table-column label="发票号" prop="发票号" align="center" width="150px"> <el-table-column label="发票号" prop="发票号" align="center" width="150px">
@@ -64,15 +64,15 @@
{{ scope.row.开票金额 }} {{ scope.row.开票金额 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="开票日期" align="center" width="90px" prop="开票日期"> <el-table-column label="到票日期" align="center" width="90px" prop="开票日期">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.开票时间 }} {{ scope.row.开票时间 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="操作" fixed="right" width="130px"> <el-table-column align="center" label="操作" fixed="right" width="130px">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" size="mini" icon="el-icon-edit" @click="ChangeOpen1(scope.row)">编辑</el-button> <el-button type="text" size="mini" icon="el-icon-edit" @click="ChangeOpen1(scope.row)"/>
<el-button type="text" size="mini" icon="el-icon-delete" @click="handleDelete1(scope.row)">删除</el-button> <el-button type="text" size="mini" icon="el-icon-delete" @click="handleDelete1(scope.row)"/>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@@ -108,8 +108,8 @@
</el-table-column> </el-table-column>
<el-table-column align="center" label="操作" fixed="right" width="130px"> <el-table-column align="center" label="操作" fixed="right" width="130px">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" size="mini" icon="el-icon-edit" @click="ChangeOpen2(scope.row)">编辑</el-button> <el-button type="text" size="mini" icon="el-icon-edit" @click="ChangeOpen2(scope.row)"/>
<el-button type="text" size="mini" icon="el-icon-delete" @click="handleDelete2(scope.row)">删除</el-button> <el-button type="text" size="mini" icon="el-icon-delete" @click="handleDelete2(scope.row)"/>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@@ -136,7 +136,7 @@
</el-row> </el-row>
<el-row> <el-row>
<el-form-item label="开票金额(元)" prop="开票金额"> <el-form-item label="开票金额(元)" prop="开票金额">
<el-input v-positive="'float'" v-model="form1.开票金额" placeholder="开票金额" type="float" style="width:200px" clearable size="small"/> <el-input v-positive="'float'" v-model="form1.开票金额" placeholder="开票金额" type="float" style="width:200px" clearable size="small" @blur="checkNumber"/>
</el-form-item> </el-form-item>
</el-row> </el-row>
<el-row> <el-row>
@@ -163,7 +163,7 @@
<el-form ref="form2" :model="form2" :rules="rules" label-position="left" label-width="120px" class="demo-ruleForm"> <el-form ref="form2" :model="form2" :rules="rules" label-position="left" label-width="120px" class="demo-ruleForm">
<el-row> <el-row>
<el-form-item label="付款金额(元)" prop="付款金额"> <el-form-item label="付款金额(元)" prop="付款金额">
<el-input v-positive="'float'" v-model="form2.付款金额" placeholder="付款金额" type="float" style="width:200px" clearable size="small"/> <el-input v-positive="'float'" v-model="form2.付款金额" placeholder="付款金额" type="float" style="width:200px" clearable size="small" @blur="checkNumber"/>
</el-form-item> </el-form-item>
</el-row> </el-row>
<el-row> <el-row>
@@ -244,7 +244,6 @@ export default {
methods: { methods: {
// 获取表格1数据 // 获取表格1数据
getParts() { getParts() {
this.外协厂家流水号 = ''
this.loading = true this.loading = true
this.tableData = [] this.tableData = []
var check var check
@@ -258,6 +257,11 @@ export default {
} }
}) })
}, },
checkNumber() {
// content.withdrawAmount = (withdrawAmount.match(/^\d*(\.?\d{0,2})/g)[0]) || null
this.form1.开票金额 = Number(this.form1.开票金额).toFixed(2)
this.form2.付款金额 = Number(this.form2.付款金额).toFixed(2)
},
rowClick(row) { rowClick(row) {
this.外协厂家流水号 = row.外协厂家流水号 this.外协厂家流水号 = row.外协厂家流水号
this.外协厂家流水号_Select = row.外协厂家流水号 this.外协厂家流水号_Select = row.外协厂家流水号
@@ -286,7 +290,9 @@ export default {
getInvoice() { getInvoice() {
this.loading2 = true this.loading2 = true
this.tableData2 = [] this.tableData2 = []
getInvoice(this.外协厂家流水号_Select, this.pageCurrent2, this.pageSize2).then(response => { var check2
this.startTime ? check2 = 1 : (check2 = 0, this.startTime = '')
getInvoice(this.外协厂家流水号_Select, check2, this.startTime[0], this.startTime[1], this.pageCurrent2, this.pageSize2).then(response => {
this.loading2 = false this.loading2 = false
if (response.data.rows.length !== 0) { if (response.data.rows.length !== 0) {
this.tableData2 = response.data.rows this.tableData2 = response.data.rows
@@ -298,7 +304,9 @@ export default {
getPayment() { getPayment() {
this.loading3 = true this.loading3 = true
this.tableData3 = [] this.tableData3 = []
getPayment(this.外协厂家流水号_Select, this.pageCurrent2, this.pageSize2).then(response => { var check2
this.startTime ? check2 = 1 : (check2 = 0, this.startTime = '')
getPayment(this.外协厂家流水号_Select, check2, this.startTime[0], this.startTime[1], this.pageCurrent2, this.pageSize2).then(response => {
this.loading3 = false this.loading3 = false
if (response.data.rows.length !== 0) { if (response.data.rows.length !== 0) {
this.tableData3 = response.data.rows this.tableData3 = response.data.rows

26
src/views/Outsourcing/OutsourcingTaskExecution/index.vue
View File

@@ -1,7 +1,7 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-card> <el-card>
<el-input v-model="partNumber" size="small" placeholder="零件号" clearable style="width:160px;margin-top: 3px"/> <el-input v-model="partNumber" size="small" placeholder="零件号或零件名称" clearable style="width:160px;margin-top: 3px"/>
<el-button type="primary" size="mini" icon="el-icon-search" style="margin-left:20px" plain @click="getList()">查询</el-button> <el-button type="primary" size="mini" icon="el-icon-search" style="margin-left:20px" plain @click="getList()">查询</el-button>
<el-button type="danger" plain size="mini" icon="el-icon-caret-right" style="float: right;margin-right:10px" @click="getBack()">打回</el-button> <el-button type="danger" plain size="mini" icon="el-icon-caret-right" style="float: right;margin-right:10px" @click="getBack()">打回</el-button>
<el-table v-loading="loading1" ref="multipleTable" :data="List1" border size="mini" stripe highlight-current-row height="265" style="width: 100%;margin-top: 3px" @selection-change="handleSelectionChange"> <el-table v-loading="loading1" ref="multipleTable" :data="List1" border size="mini" stripe highlight-current-row height="265" style="width: 100%;margin-top: 3px" @selection-change="handleSelectionChange">
@@ -53,10 +53,10 @@
<el-table-column label="操作" align="center" min-width="100px"> <el-table-column label="操作" align="center" min-width="100px">
<template slot-scope="scope"> <template slot-scope="scope">
<div style="display: inline-block"> <div style="display: inline-block">
<el-button type="text" size="mini" icon="el-icon-edit" style="margin-left:10px" @click="handleEdit(scope.row)"/> <el-button type="text" size="mini" icon="el-icon-edit" @click="handleEdit(scope.row)"/>
</div> </div>
<div style="display: inline-block"> <div style="display: inline-block">
<el-button :disabled="scope.row.单据状态==='成交'" type="text" size="mini" icon="el-icon-delete" @click="handleDelete(scope.row)"/> <el-button :disabled="scope.row.单据状态==='成交'" type="text" size="mini" icon="el-icon-delete" style="margin-left:10px" @click="handleDelete(scope.row)"/>
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
@@ -96,7 +96,7 @@
</el-table-column> </el-table-column>
<el-table-column label="外协价格(元)" align="center" width="130px"> <el-table-column label="外协价格(元)" align="center" width="130px">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-positive="'float'" v-model="scope.row.加工价格_成交" class="editWorkTime" type="number" style="text-align: right" size="small" @change="saveAct(scope.row)"/> <el-input v-positive="'float'" v-model="scope.row.加工价格_成交" class="editWorkTime" type="number" style="text-align: right" size="small" @change="saveAct(scope.row)" @blur="filterNuber(scope.row.加工价格_成交, scope.$index, '加工价格_成交')"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="机加工开始时间" align="center" width="150px"> <el-table-column label="机加工开始时间" align="center" width="150px">
@@ -292,6 +292,22 @@ export default {
}) })
this.loading2 = false this.loading2 = false
}, },
filterNuber(val, index, date, row) {
console.log(index, 6666)
let value = '' + val
value = value
.replace(/[^\d.]/g, '') // 清除“数字”和“.”以外的字符
.replace(/\.{2,}/g, '.') // 只保留第一个. 清除多余的
.replace('.', '$#$')
.replace(/\./g, '')
.replace('$#$', '.')
.replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3') // 只能输入两个小数
if (value.indexOf('.') < 0 && value !== '') {
value = parseFloat(value).toFixed(2)
}
console.log(value)
this.List3[index][date] = value
},
// 表3合计 // 表3合计
getSummaries(param) { getSummaries(param) {
const { data } = param const { data } = param
@@ -303,7 +319,7 @@ export default {
for (let i = 0; i < data.length; i++) { for (let i = 0; i < data.length; i++) {
sums[4] += Math.round(parseFloat(data[i].加工价格_成交) * 100) / 100 sums[4] += Math.round(parseFloat(data[i].加工价格_成交) * 100) / 100
} }
sums[4] = Math.round(sums[4] * 100) / 100 + ' 元' sums[4] = sums[4].toFixed(2) + ' 元'
return sums return sums
}, },
// 查询未选入零件 // 查询未选入零件

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

@@ -3,16 +3,16 @@
<el-card> <el-card>
<div slot="header"> <div slot="header">
<!--<span>供应商:</span>--> <!--<span>供应商:</span>-->
<el-input v-model="supperiler" placeholder="供应商或发票号" size="small" clearable/> <el-input v-model="supperiler" placeholder="供应商或发票号" size="small" clearable @change="searchTable1()"/>
<!--<span>发票号:</span>--> <!--<span>发票号:</span>-->
<!--<el-input v-model="invoiceNum" placeholder="发票号" size="small" clearable/>--> <!--<el-input v-model="invoiceNum" placeholder="发票号" size="small" clearable/>-->
<el-button type="primary" size="small" icon="el-icon-search" plain style="margin-left:10px" @click="tableData2=[];total1=0;pageCurrent1=1;pageSize1=100000;searchTable1()">查询</el-button> <!-- <el-button type="primary" size="small" icon="el-icon-search" plain style="margin-left:10px" @click="tableData2=[];total1=0;pageCurrent1=1;pageSize1=100000;searchTable1()">查询</el-button>-->
<el-button type="warning" size="small" icon="el-icon-circle-plus-outline" plain style="margin-left:10px" @click="createOrder()">结算申请</el-button> <el-button type="warning" size="small" icon="el-icon-circle-plus-outline" plain style="margin-left:10px" @click="createOrder()">结算申请</el-button>
<el-button :disabled="disabled" type="warning" size="small" icon="el-icon-circle-plus-outline" plain style="margin-left:10px" @click="addInStoreRecord()">追加入库记录</el-button> <el-button :disabled="disabled" type="warning" size="small" icon="el-icon-circle-plus-outline" plain style="margin-left:10px" @click="addInStoreRecord()">追加入库记录</el-button>
</div> </div>
<h4 style="margin-top: 5px;margin-bottom: 0px">发票结算申请单</h4> <h4 style="margin-top: 5px;margin-bottom: 0px">发票结算申请单</h4>
<el-table id="expandTable" :data="tableData1" border stripe highlight-current-row style="width: 100%;max-height: 350px" size="mini" @row-click="searchTable2"> <el-table id="expandTable" :data="tableData1" border stripe highlight-current-row style="width: 100%;max-height: 350px" size="mini" @row-click="searchTable2">
<el-table-column type="expand"> <!-- <el-table-column type="expand">
<template slot-scope="scope"> <template slot-scope="scope">
<el-form label-position="left" inline class="demo-table-expand"> <el-form label-position="left" inline class="demo-table-expand">
<el-row> <el-row>
@@ -43,7 +43,7 @@
</el-row> </el-row>
</el-form> </el-form>
</template> </template>
</el-table-column> </el-table-column>-->
<el-table-column label="供应商" prop="供应商名称" align="center" min-width="200" show-overflow-tooltip> <el-table-column label="供应商" prop="供应商名称" align="center" min-width="200" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.供应商名称 }} {{ scope.row.供应商名称 }}
@@ -162,14 +162,16 @@
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" width="100"> <el-table-column label="操作" align="center" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tooltip v-show="true" :open-delay="100" content="删除" placement="right">
<el-button :disabled="disabled" type="text" size="mini" icon="el-icon-delete" @click="deleteTable2(scope.row)"/> <el-button :disabled="disabled" type="text" size="mini" icon="el-icon-delete" @click="deleteTable2(scope.row)"/>
</el-tooltip>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
</el-card> </el-card>
<el-dialog v-el-drag-dialog :title="title1" :visible.sync="dialogVisible1" center style="min-height: 300px" width="700px"> <el-dialog v-el-drag-dialog :title="title1" :visible.sync="dialogVisible1" center style="min-height: 300px" width="700px">
<el-form ref="form1" :model="form1" :rules="rules1" label-position="right" label-width="110px"> <el-form ref="form1" :model="form1" :rules="rules1" label-position="left" label-width="110px">
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="发票号" prop="invoiceNum"> <el-form-item label="发票号" prop="invoiceNum">
@@ -178,7 +180,7 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="发票金额(元)" prop="money"> <el-form-item label="发票金额(元)" prop="money">
<el-input v-positive="'float'" v-model="form1.money" class="editWorkTime" size="small" placeholder="发票金额" type="number"/> <el-input v-positive="'float'" v-model="form1.money" class="editWorkTime" size="small" placeholder="发票金额" type="number" @blur="changeToFixde"/>
<!--<el-input v-model="form1.money" size="small" placeholder="发票金额"/>--> <!--<el-input v-model="form1.money" size="small" placeholder="发票金额"/>-->
</el-form-item> </el-form-item>
</el-col> </el-col>
@@ -243,7 +245,7 @@
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button size="small" @click="dialogVisible1 = false">取消</el-button> <el-button size="small" @click="dialogVisible1 = false">取消</el-button>
<el-button v-if="title1 === '创建发票结算申请单'" size="small" type="primary" @click="submitAdd1()">确定</el-button> <el-button v-if="title1 === '发票结算申请'" size="small" type="primary" @click="submitAdd1()">确定</el-button>
<el-button v-else size="small" type="primary" @click="submitEdit()">确定</el-button> <el-button v-else size="small" type="primary" @click="submitEdit()">确定</el-button>
</div> </div>
</el-dialog> </el-dialog>
@@ -255,7 +257,7 @@
<el-radio label="采购合同" border/> <el-radio label="采购合同" border/>
<el-radio label="离线合同" border/> <el-radio label="离线合同" border/>
</el-radio-group> </el-radio-group>
<el-table :data="tableData01" border highlight-current-row style="width: 100%;max-height: 250px;" height="250px" size="mini" @row-click="searchTable02"> <el-table :data="tableData01" border highlight-current-row style="width: 100%;max-height: 250px;" height="200px" size="mini" @row-click="searchTable02">
<el-table-column label="供应商" align="center" min-width="200"> <el-table-column label="供应商" align="center" min-width="200">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.供应商名称 }} {{ scope.row.供应商名称 }}
@@ -273,7 +275,7 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-table ref="multipleTable" :data="tableData02" border style="width: 100%;max-height: 250px;" height="250px" size="mini" @selection-change="handleSelectionChange"> <el-table ref="multipleTable" :data="tableData02" border style="width: 100%;max-height: 250px;" height="250px" size="mini" @selection-change="handleSelectionChange">
<el-table-column :selectable="selectable" type="selection" align="center" width="35"/> <el-table-column :selectable="selectable" type="selection" align="center" width="45"/>
<el-table-column label="名称" align="center" width="100"> <el-table-column label="名称" align="center" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.物料名称 ? scope.row.物料名称 : scope.row.零件名称 }} {{ scope.row.物料名称 ? scope.row.物料名称 : scope.row.零件名称 }}
@@ -304,7 +306,7 @@
{{ scope.row.到票数量 }} {{ scope.row.到票数量 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="本次到票数量" align="center" width="100"> <el-table-column label="本次到票数量" align="center" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input-number v-model="scope.row.本次到票数量" :min="0" :max="(scope.row.已到货数量||scope.row.到货数量)-scope.row.到票数量" size="mini" controls-position="right" style="width: 100%;"/> <el-input-number v-model="scope.row.本次到票数量" :min="0" :max="(scope.row.已到货数量||scope.row.到货数量)-scope.row.到票数量" size="mini" controls-position="right" style="width: 100%;"/>
</template> </template>
@@ -398,6 +400,9 @@ export default {
} }
}) })
}, },
changeToFixde() {
this.form1.money = Number(this.form1.money).toFixed(2)
},
createOrder() { createOrder() {
if (this.$refs['form1'] !== undefined) { if (this.$refs['form1'] !== undefined) {
this.$refs['form1'].resetFields() this.$refs['form1'].resetFields()
@@ -410,7 +415,7 @@ export default {
this.form1.tax = '' this.form1.tax = ''
this.form1.isCost = '' this.form1.isCost = ''
this.form1.remark = '' this.form1.remark = ''
this.title1 = '创建发票结算申请单' this.title1 = '发票结算申请'
this.dialogVisible1 = true this.dialogVisible1 = true
}, },
searchTable1() { searchTable1() {
@@ -573,7 +578,7 @@ export default {
addInStoreRecord() { addInStoreRecord() {
if (this.applyOrderNum) { if (this.applyOrderNum) {
this.searchTable01() this.searchTable01()
this.title2 = '追加入库单' this.title2 = '追加入库'
this.dialogVisible2 = true this.dialogVisible2 = true
} else { } else {
this.$message.error('请选择发票！') this.$message.error('请选择发票！')
@@ -619,7 +624,7 @@ export default {
handleSelectionChange(val) { handleSelectionChange(val) {
this.group = val this.group = val
}, },
submitAdd2() { // 追加入库单 submitAdd2() { // 追加入库
if (this.group.length === 0) { if (this.group.length === 0) {
this.$message.warning('请选择零件或物料') this.$message.warning('请选择零件或物料')
} else { } else {

110
src/views/PurchasingCenter/MaterialMProcure/index.vue
View File

@@ -87,6 +87,18 @@
</el-row> </el-row>
<el-row> <el-row>
<el-input v-model="MaterialName" placeholder="物料名称/物料规格/物料型号" style="width: 220px" size="small" clearable/> <el-input v-model="MaterialName" placeholder="物料名称/物料规格/物料型号" style="width: 220px" size="small" clearable/>
<el-date-picker
v-model="dateRange"
:picker-options="pickerOptions"
size="small"
type="daterange"
align="center"
style="width: 240px;margin: 3px 0"
value-format="yyyy-MM-dd"
format="yyyy-MM-dd"
range-separator="～"
start-placeholder="开始申请日期"
end-placeholder="结束申请日期"/>
<!--<el-input v-model="MaterialSpecification" placeholder="物料规格" size="small" clearable/>--> <!--<el-input v-model="MaterialSpecification" placeholder="物料规格" size="small" clearable/>-->
<!--<el-input v-model="MaterialModel" placeholder="物料型号" size="small" clearable/>--> <!--<el-input v-model="MaterialModel" placeholder="物料型号" size="small" clearable/>-->
<el-button type="primary" icon="el-icon-search" size="small" plain style="margin-left: 10px" @click="pageCurrent=1;PageSize = 30;searchMaterial()">查询</el-button> <el-button type="primary" icon="el-icon-search" size="small" plain style="margin-left: 10px" @click="pageCurrent=1;PageSize = 30;searchMaterial()">查询</el-button>
@@ -98,7 +110,7 @@
<el-table <el-table
v-loading="loading" v-loading="loading"
:data="tableData" :data="tableData"
style="width: 945px;margin-top: 3px" style="width: 1200px;margin-top: 3px"
height="600" height="600"
size="mini" size="mini"
highlight-current-row highlight-current-row
@@ -124,6 +136,16 @@
{{ scope.row.供货商 }} {{ scope.row.供货商 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="申请时间" width="132px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.操作日期 ? scope.row.操作日期.split(' ')[0] : '-' }}
</template>
</el-table-column>
<el-table-column align="center" label="申请人" width="132px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.姓名 }}
</template>
</el-table-column>
<el-table-column align="center" label="审核状态" width="80px"> <el-table-column align="center" label="审核状态" width="80px">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag v-if="scope.row.是否通过===0" type="primary" size="small">未审核</el-tag> <el-tag v-if="scope.row.是否通过===0" type="primary" size="small">未审核</el-tag>
@@ -131,36 +153,36 @@
<el-tag v-if="scope.row.是否通过===2" type="danger" size="small">未通过</el-tag> <el-tag v-if="scope.row.是否通过===2" type="danger" size="small">未通过</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="打回原因" width="180px"> <el-table-column align="center" label="打回原因" width="130px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.打回原因 ? scope.row.打回原因 : '——' }} {{ scope.row.打回原因 ? scope.row.打回原因 : '——' }}
</template> </template>
</el-table-column> </el-table-column>
<!--<el-table-column label="操作" fixed="right" align="center" width="150">--> <el-table-column label="操作" fixed="right" align="center" width="60">
<!--<template slot-scope="scope">--> <template slot-scope="scope">
<!--<el-tooltip :open-delay="1000" effect="dark" content="编辑">--> <!-- <el-tooltip :open-delay="1000" effect="dark" content="编辑">-->
<!--<div style="display: inline-block">--> <!-- <div style="display: inline-block">-->
<!--<el-button--> <!-- <el-button-->
<!--:disabled="token !== 11 && token !== 36"--> <!-- :disabled="token !== 11 && token !== 36"-->
<!--size="mini"--> <!-- size="mini"-->
<!--type="text"--> <!-- type="text"-->
<!--icon="el-icon-edit-outline"--> <!-- icon="el-icon-edit-outline"-->
<!--@click="handleEdit(scope.row)"/>--> <!-- @click="handleEdit(scope.row)"/>-->
<!--</div>--> <!-- </div>-->
<!--</el-tooltip>--> <!-- </el-tooltip>-->
<!--<el-tooltip effect="dark" content="删除" placement="top">--> <el-tooltip effect="dark" content="删除" placement="top">
<!--<div style="display: inline-block">--> <div style="display: inline-block">
<!--<el-button--> <el-button
<!--:disabled="token !== 11 && token !== 36"--> :disabled="scope.row.是否通过 === 1"
<!--size="mini"--> size="mini"
<!--type="text"--> type="text"
<!--style="margin-left: 20px"--> style="margin-left: 20px"
<!--icon="el-icon-delete"--> icon="el-icon-delete"
<!--@click="handleDelete(scope.row)"/>--> @click="handleDelete(scope.row)"/>
<!--</div>--> </div>
<!--</el-tooltip>--> </el-tooltip>
<!--</template>--> </template>
<!--</el-table-column>--> </el-table-column>
</el-table> </el-table>
<div class="block" style="margin-top: 10px;"> <div class="block" style="margin-top: 10px;">
<el-pagination <el-pagination
@@ -323,6 +345,7 @@ import { mapGetters } from 'vuex'
export default { export default {
data() { data() {
return { return {
dateRange: '',
loading: false, loading: false,
Gonghuoshang: [], Gonghuoshang: [],
Gonghuoshang2: [], Gonghuoshang2: [],
@@ -388,6 +411,33 @@ export default {
check9: '', check9: '',
check10: '', check10: '',
title: '', title: '',
pickerOptions: {
shortcuts: [{
text: '上季度',
onClick(picker) {
const end = new Date()
const start = new Date()
start.setTime(end.getTime() - 3600 * 1000 * 24 * 30 * 3)
picker.$emit('pick', [start, end])
}
}, {
text: '过去半年',
onClick(picker) {
const end = new Date()
const start = new Date()
start.setTime(end.getTime() - 3600 * 1000 * 24 * 366 / 2)
picker.$emit('pick', [start, end])
}
}, {
text: '过去一年',
onClick(picker) {
const end = new Date()
const start = new Date()
start.setTime(end.getTime() - 3600 * 1000 * 24 * 365)
picker.$emit('pick', [start, end])
}
}]
},
form: { form: {
物料流水号: '', 物料流水号: '',
物料类别流水号: '', 物料类别流水号: '',
@@ -480,6 +530,7 @@ export default {
this.getSelect(initMaterialVariety, ['物料品种', '物料品种流水号'], 'MaterialVariety', this.MaterialCategoryValue) this.getSelect(initMaterialVariety, ['物料品种', '物料品种流水号'], 'MaterialVariety', this.MaterialCategoryValue)
}, },
searchMaterial() { // 物料查询 searchMaterial() { // 物料查询
let check
this.MaterialName !== '' ? this.check1 = 1 : this.check1 = 0 // 物料名称 this.MaterialName !== '' ? this.check1 = 1 : this.check1 = 0 // 物料名称
this.FullNameOfMaterial !== '' ? this.check2 = 1 : this.check2 = 0 // 物料全称 this.FullNameOfMaterial !== '' ? this.check2 = 1 : this.check2 = 0 // 物料全称
this.MaterialSpecification !== '' ? this.check3 = 1 : this.check3 = 0 // 物料规格 this.MaterialSpecification !== '' ? this.check3 = 1 : this.check3 = 0 // 物料规格
@@ -489,8 +540,9 @@ export default {
this.MeasurementUnitValue !== '' ? this.check7 = 1 : this.check7 = 0 // 计量单位 this.MeasurementUnitValue !== '' ? this.check7 = 1 : this.check7 = 0 // 计量单位
this.MaterialSourceValue !== '' ? this.check8 = 1 : this.check8 = 0 // 物料来源 this.MaterialSourceValue !== '' ? this.check8 = 1 : this.check8 = 0 // 物料来源
this.GonghuoshangValue !== '' ? this.check9 = 1 : this.check9 = 0 // 供货商 this.GonghuoshangValue !== '' ? this.check9 = 1 : this.check9 = 0 // 供货商
this.dateRange ? check = 1 : (check = 0, this.dateRange = '')
this.loading = true this.loading = true
searchmaterial(this.check1, this.MaterialName, this.check2, this.FullNameOfMaterial, this.check3, this.MaterialSpecification, this.check4, this.MaterialModel, this.pageCurrent, this.pageSize, this.check5, this.MaterialCategoryValue, this.check6, this.MaterialVarietyValue, this.check7, this.MeasurementUnitValue, this.check8, this.MaterialSourceValue, this.check9, this.GonghuoshangValue).then(response => { searchmaterial(this.check1, this.MaterialName, this.check2, this.FullNameOfMaterial, this.check3, this.MaterialSpecification, this.check4, this.MaterialModel, this.pageCurrent, this.pageSize, this.check5, this.MaterialCategoryValue, this.check6, this.MaterialVarietyValue, this.check7, this.MeasurementUnitValue, this.check8, this.MaterialSourceValue, this.check9, this.GonghuoshangValue, check, this.dateRange[0], this.dateRange[1]).then(response => {
this.tableData = response.data.result this.tableData = response.data.result
this.total = parseInt(response.data.output[0].ItemCount) this.total = parseInt(response.data.output[0].ItemCount)
this.loading = false this.loading = false
@@ -555,7 +607,7 @@ export default {
this.addForm('form', [this.dialogFormVisible1 = true, this.title = '新增物料申请']) this.addForm('form', [this.dialogFormVisible1 = true, this.title = '新增物料申请'])
}, },
submitAdd() { // 提交增加 submitAdd() { // 提交增加
this.addTable(addData, [this.form.物料品种流水号, this.form.物料名称, this.form.物料全名, this.form.物料规格, this.form.物料型号, this.form.计量单位流水号, this.form.物料来源流水号, this.form.GonghuoshangValue], 'form', function() { this.addTable(addData, [this.form.物料品种流水号, this.form.物料名称, this.form.物料全名, this.form.物料规格, this.form.物料型号, this.form.计量单位流水号, this.form.物料来源流水号, this.form.GonghuoshangValue, this.id], 'form', function() {
this.dialogFormVisible1 = false this.dialogFormVisible1 = false
this.searchMaterial() this.searchMaterial()
}) })

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

@@ -158,7 +158,7 @@
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="仓库" name="仓库"> <el-tab-pane label="仓库" name="仓库">
<el-row> <el-row>
<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-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-button type="primary" size="small" icon="el-icon-search" plain style="margin-left: 10px" @click="searchTable22()">查询</el-button> <el-button type="primary" size="small" icon="el-icon-search" plain style="margin-left: 10px" @click="searchTable22()">查询</el-button>
</el-row> </el-row>
<el-table <el-table
@@ -814,7 +814,7 @@ export default {
tabName: '标准件', tabName: '标准件',
total22: 0, total22: 0,
pageCurrent22: 1, pageCurrent22: 1,
pageSize22: 100000 pageSize22: 20
} }
}, },
computed: { computed: {

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

@@ -4,6 +4,18 @@
<div slot="header"> <div slot="header">
<el-row> <el-row>
<el-input v-model="supplierName" placeholder="供应商/合同编号" size="small" clearable style="width:180px;margin: 0px 10px"/> <el-input v-model="supplierName" placeholder="供应商/合同编号" size="small" clearable style="width:180px;margin: 0px 10px"/>
<el-date-picker
v-model="dateRange"
:picker-options="pickerOptions"
size="small"
type="daterange"
align="center"
style="width: 240px;margin: 3px 0"
value-format="yyyy-MM-dd"
format="yyyy-MM-dd"
range-separator="～"
start-placeholder="开始日期"
end-placeholder="结束日期"/>
<!--<el-input v-model="contractNumber" placeholder="合同编号" size="small" clearable style="width:180px;margin: 0px 10px"/>--> <!--<el-input v-model="contractNumber" placeholder="合同编号" size="small" clearable style="width:180px;margin: 0px 10px"/>-->
<el-button <el-button
type="primary" type="primary"
@@ -11,7 +23,7 @@
icon="el-icon-search" icon="el-icon-search"
plain plain
style="margin-left:10px" style="margin-left:10px"
@click="total1=0;pageCurrent1=1;pageSize1=10;searchTable1()">查询</el-button> @click="total1=0;pageCurrent1=1;pageSize1=30;searchTable1()">查询</el-button>
<el-tooltip :open-delay="200" effect="dark" content="打回重新编制" placement="top"> <el-tooltip :open-delay="200" effect="dark" content="打回重新编制" placement="top">
<div style="display: inline-block"> <div style="display: inline-block">
<el-button <el-button
@@ -27,7 +39,7 @@
</div> </div>
</el-card> </el-card>
<el-row> <el-row>
<el-card style="width: 40%; float: left"> <el-card style="width: 42%; float: left">
<el-table <el-table
v-loading="loading1" v-loading="loading1"
id="expandTable" id="expandTable"
@@ -38,8 +50,9 @@
style="width: 100%" style="width: 100%"
height="700px" height="700px"
highlight-current-row highlight-current-row
@sort-change="sortChange"
@row-click="searchTable2"> @row-click="searchTable2">
<el-table-column label="供应商" align="center" min-width="200"> <el-table-column label="供应商" align="center" prop="供应商名称" min-width="200" sortable="custom" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.供应商名称 }} {{ scope.row.供应商名称 }}
</template> </template>
@@ -49,7 +62,7 @@
<!-- {{ scope.row.离线合同名称 }}--> <!-- {{ scope.row.离线合同名称 }}-->
<!-- </template>--> <!-- </template>-->
<!-- </el-table-column>--> <!-- </el-table-column>-->
<el-table-column label="离线合同编号" align="center" min-width="120"> <el-table-column label="离线合同编号" align="center" prop="离线合同编号" min-width="120" sortable="custom" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.离线合同编号 }} {{ scope.row.离线合同编号 }}
</template> </template>
@@ -59,11 +72,16 @@
<!-- {{ scope.row.采购员 }}--> <!-- {{ scope.row.采购员 }}-->
<!-- </template>--> <!-- </template>-->
<!-- </el-table-column>--> <!-- </el-table-column>-->
<el-table-column label="总金额(元)" align="center" min-width="75"> <el-table-column label="总金额(元)" align="center" min-width="90">
<template slot-scope="scope"> <template slot-scope="scope">
{{ Number(scope.row.合同总额).toFixed(2) }} {{ Number(scope.row.合同总额).toFixed(2) }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="创建日期" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.创建日期.split(' ')[0] }}
</template>
</el-table-column>
</el-table> </el-table>
<div class="block" style="margin-top: 10px;"> <div class="block" style="margin-top: 10px;">
<el-pagination <el-pagination
@@ -129,28 +147,73 @@ export default {
name: 'OfflineContractSearch', name: 'OfflineContractSearch',
data() { data() {
return { return {
dateRange: '',
contractNumber: '', contractNumber: '',
supplierName: '', supplierName: '',
total1: 0, total1: 0,
number: '', number: '',
pageCurrent1: 1, pageCurrent1: 1,
pageSize1: 20, pageSize1: 30,
tableData1: [], tableData1: [],
loading1: false, loading1: false,
contractDetail: [] contractDetail: [],
pickerOptions: {
shortcuts: [{
text: '上季度',
onClick(picker) {
const end = new Date()
const start = new Date()
start.setTime(end.getTime() - 3600 * 1000 * 24 * 30 * 3)
picker.$emit('pick', [start, end])
}
}, {
text: '过去半年',
onClick(picker) {
const end = new Date()
const start = new Date()
start.setTime(end.getTime() - 3600 * 1000 * 24 * 366 / 2)
picker.$emit('pick', [start, end])
}
}, {
text: '过去一年',
onClick(picker) {
const end = new Date()
const start = new Date()
start.setTime(end.getTime() - 3600 * 1000 * 24 * 365)
picker.$emit('pick', [start, end])
}
}]
}
} }
}, },
created() { created() {
this.searchTable1() // this.searchTable1()
}, },
methods: { methods: {
sortChange(column, prop, order) {
console.log(column + '-' + column.prop + '-' + column.order, 11111)
if (column.prop === '供应商名称') {
this.partName = 1
} else if (column.prop === '离线合同编号') { this.partName = 2 } else {
this.partName = ''
}
console.log(this.ordername, 9990999)
if (column.order === 'ascending') {
this.order = 1
} else if (column.order === 'descending') { this.order = 2 } else {
this.order = ''
}
this.searchTable1()
},
// 查合同列表 // 查合同列表
searchTable1() { searchTable1() {
let check1, check2 let check1, check2, check3
this.contractNumber ? check1 = 1 : check1 = 0 this.contractNumber ? check1 = 1 : check1 = 0
this.supplierName ? check2 = 1 : check2 = 0 this.supplierName ? check2 = 1 : check2 = 0
this.dateRange ? check3 = 1 : (check3 = 0, this.dateRange = '')
this.loading1 = true this.loading1 = true
searchOfflineContract(this.pageCurrent1, this.pageSize1, check1, this.contractNumber, check2, this.supplierName).then(response => { console.log(this.dateRange, 'dateRange')
searchOfflineContract(this.pageCurrent1, this.pageSize1, check1, this.contractNumber, check2, this.supplierName, this.order, this.partName, check3, this.dateRange[0], this.dateRange[1]).then(response => {
this.tableData1 = response.data.rows this.tableData1 = response.data.rows
this.total1 = response.data.total this.total1 = response.data.total
this.loading1 = false this.loading1 = false
@@ -217,7 +280,7 @@ export default {
document.getElementsByClassName('tableData')[j].children[2].innerHTML = this.contractDetail[j].物料规格 document.getElementsByClassName('tableData')[j].children[2].innerHTML = this.contractDetail[j].物料规格
document.getElementsByClassName('tableData')[j].children[3].innerHTML = this.contractDetail[j].物料型号 document.getElementsByClassName('tableData')[j].children[3].innerHTML = this.contractDetail[j].物料型号
document.getElementsByClassName('tableData')[j].children[4].innerHTML = this.contractDetail[j].数量 document.getElementsByClassName('tableData')[j].children[4].innerHTML = this.contractDetail[j].数量
document.getElementsByClassName('tableData')[j].children[5].innerHTML = this.contractDetail[j].单价 document.getElementsByClassName('tableData')[j].children[5].innerHTML = Number(this.contractDetail[j].单价).toFixed(2)
document.getElementsByClassName('tableData')[j].children[6].innerHTML = (this.contractDetail[j].数量 * this.contractDetail[j].单价).toFixed(2) document.getElementsByClassName('tableData')[j].children[6].innerHTML = (this.contractDetail[j].数量 * this.contractDetail[j].单价).toFixed(2)
document.getElementsByClassName('tableData')[j].children[7].innerHTML = this.contractDetail[j].交货期要求 document.getElementsByClassName('tableData')[j].children[7].innerHTML = this.contractDetail[j].交货期要求
document.getElementsByClassName('tableData')[j].children[8].innerHTML = this.contractDetail[j].备注 document.getElementsByClassName('tableData')[j].children[8].innerHTML = this.contractDetail[j].备注

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

@@ -218,6 +218,7 @@
<el-table-column align="center" label="到货状态" width="90px"> <el-table-column align="center" label="到货状态" width="90px">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="Number(scope.row.到货数量) >= Number(scope.row.采购数量)">已到货</span> <span v-if="Number(scope.row.到货数量) >= Number(scope.row.采购数量)">已到货</span>
<span v-else-if="0 < Number(scope.row.到货数量) < Number(scope.row.采购数量)">部分到货</span>
<span v-else>未到货</span> <span v-else>未到货</span>
</template> </template>
</el-table-column> </el-table-column>
@@ -649,6 +650,7 @@ export default {
for (let i = 0; i < response.data.result.length; i++) { for (let i = 0; i < response.data.result.length; i++) {
this.tableData0.push({ this.tableData0.push({
人员编号: response.data.result[i].人员编号, 人员编号: response.data.result[i].人员编号,
姓名: response.data.result[i].姓名,
询价状态编号: response.data.result[i].询价状态编号, 询价状态编号: response.data.result[i].询价状态编号,
采购状态编号: response.data.result[i].采购状态编号, 采购状态编号: response.data.result[i].采购状态编号,
机床图号: response.data.result[i].机床图号, 机床图号: response.data.result[i].机床图号,
@@ -720,6 +722,7 @@ export default {
for (let i = 0; i < response.data.result.length; i++) { for (let i = 0; i < response.data.result.length; i++) {
this.tableData1.push({ this.tableData1.push({
人员编号: response.data.result[i].人员编号, 人员编号: response.data.result[i].人员编号,
姓名: response.data.result[i].姓名,
询价状态编号: response.data.result[i].询价状态编号, 询价状态编号: response.data.result[i].询价状态编号,
采购状态编号: response.data.result[i].采购状态编号, 采购状态编号: response.data.result[i].采购状态编号,
机床图号: response.data.result[i].机床图号, 机床图号: response.data.result[i].机床图号,

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

@@ -134,6 +134,7 @@ export default {
this.update(row) this.update(row)
}, },
searchTable() { searchTable() {
if (this.contractNumValue) {
this.loading = true this.loading = true
this.tableData = [] this.tableData = []
this.contractNumValue ? this.check1 = 1 : this.check1 = 0 this.contractNumValue ? this.check1 = 1 : this.check1 = 0
@@ -162,6 +163,9 @@ export default {
console.log(response, 90) console.log(response, 90)
this.total = response.data.total this.total = response.data.total
}) })
} else {
this.tableData = []
}
}, },
update(row) { update(row) {
console.log(row, 12) console.log(row, 12)

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

@@ -15,7 +15,7 @@
<el-card> <el-card>
<el-table v-loading="" :data="tableData" stripe border style="width: 100%;max-height: 600px;margin-top: 10px" height="600px" size="mini"> <el-table v-loading="" :data="tableData" stripe border style="width: 100%;max-height: 600px;margin-top: 10px" height="600px" size="mini">
<el-table-column label="采购合同编号" align="center" width="120"> <el-table-column label="采购合同编号" align="center" width="140">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.采购合同编号 }} {{ scope.row.采购合同编号 }}
</template> </template>

18
src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue
View File

@@ -107,7 +107,7 @@
{{ scope.row.规格或材料 }} {{ scope.row.规格或材料 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="订货数量" align="center" width="70"> <el-table-column label="订货数量" align="center" width="80">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.零件数量 }} {{ scope.row.零件数量 }}
</template> </template>
@@ -146,10 +146,10 @@
<!-- size="small"--> <!-- size="small"-->
<!-- style="margin-top:10px"--> <!-- style="margin-top:10px"-->
<!-- @click="calculateContractSum">计算合同总额</el-button>--> <!-- @click="calculateContractSum">计算合同总额</el-button>-->
<span>合同总额(未税):</span> <span>合同金额(未税):</span>
<el-input v-model="contractSum2" size="small"/> <el-input v-model="contractSum2" size="small"/>
<span style="margin-left: -10px;">元</span> <span style="margin-left: -10px;">元</span>
<span>合同总额(含税):</span> <span>合同金额(含税):</span>
<el-input v-model="contractSum" size="small" /> <el-input v-model="contractSum" size="small" />
<span style="margin-left: -10px;">元</span> <span style="margin-left: -10px;">元</span>
</el-card> </el-card>
@@ -480,7 +480,7 @@ export default {
} }
console.log(value) console.log(value)
this.tableData4[index][date] = value this.tableData4[index][date] = value
this.calculateContractSum(row) this.calculateContractSum()
}, },
filterNuber1(val, index, date, row) { filterNuber1(val, index, date, row) {
let value = '' + val let value = '' + val
@@ -497,12 +497,14 @@ export default {
console.log(value) console.log(value)
this.tableData5[index][date] = value this.tableData5[index][date] = value
this.update1(row) this.update1(row)
this.calculateContractSum()
}, },
handleSelectionChange(val) { handleSelectionChange(val) {
this.multipleSelection = val this.multipleSelection = val
for (let i = 0; i < this.multipleSelection.length; i++) { for (let i = 0; i < this.multipleSelection.length; i++) {
this.Selection.push(Number(this.multipleSelection[i].请购单明细流水号)) this.Selection.push(Number(this.multipleSelection[i].请购单明细流水号))
} }
this.calculateContractSum()
}, },
submitGroup() { submitGroup() {
submitGroup(this.contractNumValue, this.form3.groupNumValue).then(response => { submitGroup(this.contractNumValue, this.form3.groupNumValue).then(response => {
@@ -637,11 +639,11 @@ export default {
this.costAccount = 0 this.costAccount = 0
this.riseFallPoint = 0 this.riseFallPoint = 0
// this.tableData4 = [] // this.tableData4 = []
for (let i = 0; i < this.tableData4.length; i++) { for (let i = 0; i < this.multipleSelection.length; i++) {
if (this.tableData4[i].单价 === '') { if (this.multipleSelection[i].单价 === '') {
this.tableData4[i].单价 = 0.00 this.multipleSelection[i].单价 = 0.00
} }
this.tableData4[i].金额 = parseFloat(this.tableData4[i].单价) * parseFloat(this.tableData4[i].零件数量) this.tableData4[i].金额 = parseFloat(this.multipleSelection[i].单价) * parseFloat(this.multipleSelection[i].零件数量)
this.contractSum1 += parseFloat(this.tableData4[i].金额) this.contractSum1 += parseFloat(this.tableData4[i].金额)
// this.tableData4.push(this.groupNum2[i]) // this.tableData4.push(this.groupNum2[i])
} }

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

@@ -1,115 +1,104 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-card> <el-card>
<!-- <span>发票号:</span>--> <span>申请时间:</span>
<el-input v-model="invoiceNum" placeholder="发票号\供应商" size="small" clearable/> <el-date-picker v-model="date1" size="small" type="date" format="yyyy-MM-dd" value-format="yyyy-MM-dd" placeholder="选择开始日期"/>&nbsp;~
<el-button type="primary" size="small" plain icon="el-icon-search" style="margin-left:10px" @click="tableData2=[];total1=0;pageCurrent1=1;pageSize1=10;searchTable1()">查询</el-button> <el-date-picker v-model="date2" size="small" type="date" format="yyyy-MM-dd" value-format="yyyy-MM-dd" placeholder="选择结束日期"/>
<el-button type="distribution" size="small" icon="el-icon-circle-plus-outline" style="margin-left:10px" @click="createOrder()">到票</el-button> <el-button type="success" size="small" icon="el-icon-search" style="margin-left:10px" @click="total1=0;pageCurrent1=1;pageSize1=10;searchTable1()">查询</el-button>
</el-card> </el-card>
<el-card> <el-card>
<h4 style="margin: 5px">到票结算申请单</h4> <h4 style="margin-top: 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 highlight-current-row style="width: 100%" height="330" size="mini" @row-click="searchTable2">
<!--<el-table-column label="详情" type="expand">--> <el-table-column label="展开" align="center" type="expand" >
<!--<template slot-scope="scope">--> <template slot-scope="scope">
<!--<el-form label-position="left" inline class="demo-table-expand">--> <el-form label-position="left" inline class="demo-table-expand">
<!--<el-row>--> <el-row>
<!--<el-col :span="6">--> <el-col :span="6">
<!--<viewer>--> <viewer>
<!--<img :src="scope.row.scanSrc" alt="发票扫描件" height="120px">--> <img :src="scope.row.scanSrc" alt="发票扫描件" height="120px">
<!--</viewer>--> </viewer>
<!--</el-col>--> </el-col>
<!--<el-col :span="6">--> <el-col :span="6">
<!--<el-form-item label="已付款项">--> <el-form-item label="已付款项">
<!--<span>{{ scope.row.已付款项 }}</span>--> <span>{{ scope.row.已付款项 }}</span>
<!--</el-form-item><br>--> </el-form-item><br>
<!--<el-form-item label="尚欠金额">--> <el-form-item label="尚欠金额">
<!--<span>{{ scope.row.尚欠金额 }}</span>--> <span>{{ scope.row.尚欠金额 }}</span>
<!--</el-form-item><br>--> </el-form-item><br>
<!--<el-form-item label="备注">--> <el-form-item label="备注">
<!--<span>{{ scope.row.备注 }}</span>--> <span>{{ scope.row.备注 }}</span>
<!--</el-form-item><br>--> </el-form-item><br>
<!--</el-col>--> </el-col>
<!--<el-col :span="6">--> <el-col :span="6">
<!--<el-form-item label="是否费用类发票">--> <el-form-item label="是否费用类发票">
<!--<span>{{ scope.row.是否费用类 }}</span>--> <span>{{ scope.row.是否费用类 }}</span>
<!--</el-form-item><br>--> </el-form-item><br>
<!--<el-form-item label="税额">--> <el-form-item label="税额">
<!--<span>{{ scope.row.税额 }}</span>--> <span>{{ scope.row.税额 }}</span>
<!--</el-form-item>--> </el-form-item>
<!--</el-col>--> </el-col>
<!--</el-row>--> </el-row>
<!--</el-form>--> </el-form>
<!--</template>--> </template>
<!--</el-table-column>--> </el-table-column>
<el-table-column label="供应商" prop="供应商名称" align="center" width="170" show-overflow-tooltip> <el-table-column label="供应商" align="center" min-width="200">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.供应商名称 }} {{ scope.row.供应商名称 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="发票号" prop="发票号" align="center" width="120"> <el-table-column label="发票号" align="center" min-width="118">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.发票号 }} {{ scope.row.发票号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="发票金额(元)" align="center" min-width="110"> <el-table-column label="发票金额" align="center" min-width="70">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.发票金额 }} {{ scope.row.发票金额 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="申请人" prop="申请人姓名" align="center" width="90"> <el-table-column label="申请人" align="center" min-width="85">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.申请人姓名 ? scope.row.申请人姓名 : '未提交' }} {{ scope.row.申请人姓名 ? scope.row.申请人姓名 : '未提交' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="申请时间" prop="申请时间" align="center" width="80"> <el-table-column label="申请时间" align="center" min-width="140">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.申请时间 ? scope.row.申请时间.split(' ')[0] : '—' }} {{ scope.row.申请时间 ? scope.row.申请时间 : '—' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="采购审批" prop="审批人1姓名" align="center" width="100"> <el-table-column label="采购审批" align="center" min-width="60">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.审批人1姓名 ? scope.row.审批人1姓名 : '未审批' }} {{ scope.row.审批人1姓名 ? scope.row.审批人1姓名 : '未审批' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="审批时间" align="center" min-width="80"> <el-table-column label="审批时间" align="center" min-width="110">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.审批1时间 ? scope.row.审批1时间.split(' ')[0] : '—' }} {{ scope.row.审批1时间 ? scope.row.审批1时间 : '—' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="财务审批" prop="审批人2姓名" align="center" width="100"> <el-table-column label="财务审批" align="center" min-width="60">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.审批人2姓名 ? scope.row.审批人2姓名 : '未审批' }} {{ scope.row.审批人2姓名 ? scope.row.审批人2姓名 : '未审批' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="审批时间" align="center" min-width="80"> <el-table-column label="审批时间" align="center" min-width="110">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.审批2时间 ? scope.row.审批2时间.split(' ')[0] : '—' }} {{ scope.row.审批2时间 ? scope.row.审批2时间 : '—' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="总经理审批" prop="审批人3姓名" align="center" width="120"> <el-table-column label="总经理审批" align="center" min-width="70">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.审批人3姓名 ? scope.row.审批人3姓名 : '未审批' }} {{ scope.row.审批人3姓名 ? scope.row.审批人3姓名 : '未审批' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="审批时间" align="center" min-width="80"> <el-table-column label="审批时间" align="center" min-width="110">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.审批3时间 ? scope.row.审批3时间.split(' ')[0] : '—' }} {{ scope.row.审批3时间 ? scope.row.审批3时间 : '—' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" width="160" fixed="right"> <el-table-column label="操作" align="center" width="100" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tooltip :open-delay="1000" effect="dark" content="编辑" placement="top"> <el-button :disabled="false" type="primary" size="mini" plain @click="excuteApprove(scope.row)">审批</el-button>
<div style="display: inline-block">
<el-button :disabled="Number(scope.row.是否提交申请)===1" type="text" icon="el-icon-edit-outline" size="mini" style="margin-left:10px" @click="handleEdit(scope.row)"/>
</div>
</el-tooltip>
<el-tooltip :open-delay="1000" effect="dark" content="删除" placement="top">
<div style="display: inline-block">
<el-button :disabled="Number(scope.row.是否提交申请)===1" type="text" icon="el-icon-delete" size="mini" style="margin-left:10px" @click="handleDelete(scope.row)"/>
</div>
</el-tooltip>
<el-button :disabled="Number(scope.row.是否提交申请)===1" type="text" icon="el-icon-circle-check" size="mini" style="margin-left:10px" @click="submitApply(scope.row)">提交申请</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@@ -127,301 +116,73 @@
</el-card> </el-card>
<el-card> <el-card>
<h4 style="margin: 5px;display: inline-block;width: 150px;">到票结算申请单明</h4> <h4 style="margin-top: 5px;display: inline-block;width: 150px;">发票结算申请单明细</h4>
<span>发票号：</span> <span>发票号：</span>
<el-input v-model="invoiceNumber" size="small" placeholder="请选择发票结算申请单" readonly/> <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: 250px;" height="250px" size="mini">
<el-table-column label="名称" align="center" width="150"> <el-table-column label="名称" align="center" min-width="100">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.采购物料名称 || scope.row.离线物料名称 || scope.row.采购零件名称 }} {{ scope.row.采购物料名称 || scope.row.离线物料名称 || scope.row.采购零件名称 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="图号或型号" align="center" min-width="100" show-overflow-tooltip> <el-table-column label="图号或型号" align="center" min-width="180">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.采购物料型号 || scope.row.离线物料型号 || scope.row.采购零件图号 }} {{ scope.row.采购物料型号 || scope.row.离线物料型号 || scope.row.采购零件图号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="规格" align="center" min-width="150"> <el-table-column label="规格" align="center" min-width="100">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.采购物料规格 || scope.row.离线物料规格 || scope.row.采购零件规格 }} {{ scope.row.采购物料规格 || scope.row.离线物料规格 || scope.row.采购零件规格 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="备注" align="center" min-width="150"> <el-table-column label="供应商" align="center" min-width="150">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.备注 }} {{ scope.row.供应商名称 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="合同编号" align="center" width="120"> <el-table-column label="合同编号" align="center" min-width="100">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.采购合同编号 || scope.row.离线合同编号 }} {{ scope.row.采购合同编号 || scope.row.离线合同编号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="合同名称" align="center" min-width="100">
<template slot-scope="scope">
{{ scope.row.采购合同名称 || scope.row.离线合同名称 }}
</template>
</el-table-column>
<el-table-column label="到票数量" align="center" width="100"> <el-table-column label="到票数量" align="center" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.到票数量 }} {{ scope.row.到票数量 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" width="100">
<template slot-scope="scope">
<el-tooltip :open-delay="1000" effect="dark" content="删除" placement="top">
<div style="display: inline-block">
<el-button :disabled="disabled" type="text" size="mini" icon="el-icon-delete" @click="deleteTable2(scope.row)"/>
</div>
</el-tooltip>
</template>
</el-table-column>
</el-table> </el-table>
</el-card> </el-card>
<el-dialog v-el-drag-dialog :title="title1" :visible.sync="dialogVisible1" center style="min-height: 300px" width="680px">
<el-form ref="form1" :model="form1" :rules="rules1" label-position="right" label-width="110px">
<el-row>
<el-col :span="12">
<el-form-item label="发票号" prop="invoiceNum">
<el-input v-model="form1.invoiceNum" size="small" placeholder="发票号"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="发票金额(元)" prop="money">
<el-input v-positive="'float'" v-model="form1.money" type="float" size="small" placeholder="发票金额"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="供应商" prop="supplierValue">
<el-select v-model="form1.supplierValue" :disabled="title1 === '编辑发票结算申请单'" placeholder="供应商" filterable size="small">
<el-option
v-for="item in supplier"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="尚欠金额(元)">
<el-input v-model="form1.unpaid" size="small" placeholder="尚欠金额"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="税额(元)">
<el-input v-model="form1.tax" size="small" placeholder="税额"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item 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-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>
</el-col>
<!--<b v-show="title1 === '创建发票结算申请单'" style="float:left;color: #f56c6c;margin-top: 13px">* </b>-->
<!--<el-form-item v-show="title1 === '创建发票结算申请单'" label="发票扫描件" style="display: inline-block">-->
<!--<el-upload-->
<!--id="invoiceScan"-->
<!--ref="upload"-->
<!--:auto-upload="false"-->
<!--:on-success="uploadSuccess"-->
<!--:before-upload="beforeUpload"-->
<!--:on-exceed="warningExceed"-->
<!--:limit="limit"-->
<!--:action="upload+'?invoiceNum='+form1.invoiceNum+'&money='+form1.money+'&supplierValue='+form1.supplierValue+'&paid='+form1.paid+'&unpaid='+form1.unpaid+'&tax='+form1.tax+'&isCost='+form1.isCost+'&remark='+form1.remark+'&personId='+id"-->
<!--list-type="picture-card">-->
<!--<i class="el-icon-plus"/>-->
<!--</el-upload>-->
<!--</el-form-item>-->
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button size="small" @click="dialogVisible1 = false">取消</el-button>
<el-button v-if="title1 === '创建发票结算申请单'" size="small" type="primary" @click="submitAdd1()">确定</el-button>
<el-button v-else size="small" type="primary" @click="submitEdit()">确定</el-button>
</div>
</el-dialog>
<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-show="false" v-model="contractType" size="small" @change="searchTable01()">
<el-radio label="采购合同" border/>
<el-radio label="离线合同" border/>
</el-radio-group>
<el-table :data="tableData01" border highlight-current-row style="width: 100%;max-height: 250px;" height="250px" size="mini" @row-click="searchTable02">
<el-table-column label="供应商" align="center" min-width="200">
<template slot-scope="scope">
{{ scope.row.供应商名称 }}
</template>
</el-table-column>
<el-table-column label="合同编号" align="center" min-width="100">
<template slot-scope="scope">
{{ scope.row.采购合同编号 ? scope.row.采购合同编号 : scope.row.离线合同编号 }}
</template>
</el-table-column>
<el-table-column label="合同名称" align="center" min-width="100">
<template slot-scope="scope">
{{ scope.row.采购合同名称 ? scope.row.采购合同名称 : scope.row.离线合同名称 }}
</template>
</el-table-column>
</el-table>
<el-table v-show="type!==4" ref="multipleTable" :data="tableData03" border style="width: 100%;max-height: 250px;" height="250px" size="mini" @selection-change="handleSelectionChange">
<el-table-column :selectable="selectable" type="selection" align="center" width="45"/>
<el-table-column label="名称" align="center" width="100">
<template slot-scope="scope">
{{ scope.row.物料名称 ? scope.row.物料名称 : scope.row.零件名称 }}
</template>
</el-table-column>
<el-table-column label="图号或型号" align="center" min-width="150">
<template slot-scope="scope">
{{ scope.row.物料型号 ? scope.row.物料型号 : scope.row.零件图号 }}
</template>
</el-table-column>
<el-table-column label="规格" align="center" min-width="150">
<template slot-scope="scope">
{{ scope.row.物料规格 ? scope.row.物料规格 : scope.row.规格 }}
</template>
</el-table-column>
<el-table-column label="采购数量" align="center" width="80">
<template slot-scope="scope">
{{ scope.row.数量 }}
</template>
</el-table-column>
<el-table-column label="已到货数量" align="center" width="90">
<template slot-scope="scope">
{{ scope.row.已到货数量 }}
</template>
</el-table-column>
<el-table-column label="已到票数量" align="center" width="90">
<template slot-scope="scope">
{{ scope.row.到票数量 }}
</template>
</el-table-column>
<el-table-column label="本次到票数量" align="center" width="100">
<template slot-scope="scope">
<el-input-number v-model="scope.row.本次到票数量" :min="0" :max="(scope.row.已到货数量||scope.row.到货数量)-scope.row.到票数量" size="mini" controls-position="right" style="width: 100%;"/>
</template>
</el-table-column>
</el-table>
<el-table v-show="type===4" ref="multipleTable" :data="tableData03" border style="width: 100%;max-height: 250px;" height="250px" size="mini" @selection-change="handleSelectionChange">
<el-table-column :selectable="selectable" type="selection" align="center" width="45"/>
<el-table-column label="名称" align="center" min-width="150">
<template slot-scope="scope">
{{ scope.row.组件名称 }}
</template>
</el-table-column>
<el-table-column label="组号" align="center" width="100">
<template slot-scope="scope">
{{ scope.row.组号 }}
</template>
</el-table-column>
<el-table-column label="备注" align="center" min-width="150">
<template slot-scope="scope">
{{ scope.row.备注 }}
</template>
</el-table-column>
<el-table-column label="采购数量" align="center" width="80">
<template slot-scope="scope">
{{ scope.row.数量 }}
</template>
</el-table-column>
<el-table-column label="已到货数量" align="center" width="90">
<template slot-scope="scope">
{{ scope.row.已到货数量 }}
</template>
</el-table-column>
<el-table-column label="已到票数量" align="center" width="90">
<template slot-scope="scope">
{{ scope.row.到票数量 }}
</template>
</el-table-column>
<el-table-column label="本次到票数量" align="center" width="100">
<template slot-scope="scope">
<el-input-number v-model="scope.row.本次到票数量" :min="0" :max="(scope.row.已到货数量||scope.row.到货数量)-scope.row.到票数量" size="mini" controls-position="right" style="width: 100%;"/>
</template>
</el-table-column>
</el-table>
<div slot="footer" class="dialog-footer">
<el-button size="small" @click="dialogVisible2 = false">取消</el-button>
<el-button :disabled="group.length===0" size="small" type="primary" @click="submitAdd2()">确定</el-button>
</div>
</el-dialog>
</div> </div>
</template> </template>
<script> <script>
import { insertInto, searchSupplier, searchTable1, submitEdit, submitDelete, submitApply, searchTable2, searchPurchase, searchOffline, searchPurchaseDetail, searchOfflineDetail, searchPurchaseDetail1, import { searchTable1, searchTable2, excuteApprove } from '@/api/WorkshopProcurement/InvoiceSettlementApprove1'
addTable2, deleteTable2 } from '@/api/WorkshopProcurement/InvoiceSettlementApplication1'
import { mapGetters } from 'vuex' import { mapGetters } from 'vuex'
import { uploadInvoiceScan1 } from '@/utils/request' import { readFile } from '@/utils/request'
import request from '@/utils/request'
export default { export default {
name: '', // 发票结算申请 name: '', // 发票结算审批
data() { data() {
return { return {
disabled: false, date1: '',
contractType: '采购合同', date2: '',
invoiceNum: '', tableData1: [],
total1: 0, total1: 0,
pageCurrent1: 1, pageCurrent1: 1,
pageSize1: 10, pageSize1: 10,
tableData1: [],
applyOrderNum: '',
invoiceNumber: '', invoiceNumber: '',
title2: '',
dialogVisible2: false,
tableData2: [], tableData2: [],
dialogVisible1: false, tableData3: []
title1: '',
type: '',
supplier: [],
supplierName: '',
supplierValue: '',
form1: {
invoiceNum: '',
money: '',
supplierValue: '',
paid: '',
unpaid: '',
tax: '',
isCost: '',
remark: '',
applyOrderNum: ''
},
rules1: {
invoiceNum: [
{ required: true, message: '请输入发票号' }
],
money: [
{ required: true, message: '请输入开票金额' }
],
supplierValue: [
{ required: true, message: '请选择供应商' }
]
},
upload: uploadInvoiceScan1,
limit: 1,
tableData01: [],
tableData02: [],
tableData03: [],
inboundCardNumber: '', // 入库单号
group: [] // 发票结算申请单明细流水号组
} }
}, },
computed: { computed: {
...mapGetters([ ...mapGetters([
'token',
'sidebar', 'sidebar',
'name', 'name',
'id' // 人员编号 'id' // 人员编号
@@ -433,35 +194,11 @@ export default {
}, },
methods: { methods: {
fetchData() { fetchData() {
this.supplier = [] console.log(this.token)
searchSupplier().then(response => {
for (let i = 0; i < response.data.length; i++) {
this.supplier.push({
label: response.data[i].供应商名称,
value: response.data[i].供应商流水号
})
}
})
},
createOrder() {
if (this.$refs['form1'] !== undefined) {
this.$refs['form1'].resetFields()
}
this.form1.invoiceNum = ''
this.form1.money = ''
this.form1.supplierValue = ''
this.form1.paid = ''
this.form1.unpaid = ''
this.form1.tax = ''
this.form1.isCost = ''
this.form1.remark = ''
this.title1 = '创建发票结算申请单'
this.dialogVisible1 = true
}, },
searchTable1() { searchTable1() {
let check1 this.date1 && this.date2 ? this.check1 = 1 : (this.check1 = 0, this.date1 = '', this.date2 = '')
this.invoiceNum ? check1 = 1 : check1 = 0 searchTable1(this.check1, this.date1, this.date2, this.pageCurrent1, this.pageSize1).then(response => {
searchTable1(check1, this.invoiceNum, this.pageCurrent1, this.pageSize1).then(response => {
this.tableData1 = response.data.rows this.tableData1 = response.data.rows
this.tableData1.map(v => { this.tableData1.map(v => {
this.$set(v, 'scanSrc', '') this.$set(v, 'scanSrc', '')
@@ -473,102 +210,16 @@ export default {
this.total1 = response.data.total this.total1 = response.data.total
}) })
}, },
submitAdd1() { // 提交新增
this.$refs['form1'].validate((valid) => {
if (valid) {
insertInto(this.form1.invoiceNum, this.form1.money, this.form1.supplierValue, this.form1.paid, this.form1.unpaid, this.form1.tax, this.form1.isCost, this.form1.remark).then(response => {
if (response.data[0].result === '1') {
this.$message.success('增加成功')
this.dialogVisible1 = false
this.searchTable1()
} else {
this.$message.error('增加失败')
}
})
} else {
return false
}
})
},
submitEdit() { // 提交编辑
this.$refs['form1'].validate((valid) => {
if (valid) {
submitEdit(this.form1.invoiceNum, this.form1.money, this.form1.paid, this.form1.unpaid, this.form1.tax, this.form1.isCost, this.form1.remark, this.form1.applyOrderNum).then(response => {
if (response.data[0].result === '修改成功') {
this.$message.success('编辑成功')
this.dialogVisible1 = false
this.searchTable1()
} else if (response.data[0].result === '修改失败') {
this.$message.error('已提交申请，编辑失败')
} else { this.$message.error('编辑失败') }
})
} else {
return false
}
})
},
handleEdit(row) {
if (this.$refs['form1'] !== undefined) {
this.$refs['form1'].resetFields()
}
this.form1.invoiceNum = row.发票号
this.form1.money = row.发票金额
this.form1.supplierValue = Number(row.供应商流水号)
this.form1.paid = row.已付款项
this.form1.unpaid = row.尚欠金额
this.form1.tax = row.税额
this.form1.isCost = row.是否费用类
this.form1.remark = row.备注
this.form1.applyOrderNum = row.发票结算申请单流水号
this.title1 = '编辑发票结算申请单'
this.dialogVisible1 = true
},
handleDelete(row) {
this.$confirm('确认删除吗?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
submitDelete(row.发票结算申请单流水号).then(response => {
if (response.data[0].result === '删除成功') {
this.$message.success('删除成功')
this.searchTable1()
} else if (response.data[0].result === '删除失败') {
this.$message.error('已提交申请，删除失败')
} else { this.$message.error('删除失败') }
})
}).catch(() => {
this.$message({
type: 'info',
message: '已取消操作'
})
})
},
async searchPic(row, i) { async searchPic(row, i) {
}, const { data } = await request({
warningExceed() { url: '',
this.$message.error('仅可上传一张发票') method: 'post',
}, data: {
beforeUpload(file) { // 上传前检测 type: '3',
const isJPG = /^image\/.*/.test(file.type) name: `select * from 车间采购管理_采购发票_附件 where 是否启用 = 1 and 发票交接流水号 = ${row.发票结算申请单流水号}`
const isLt4M = file.size / 1024 / 1024 < 4
if (!isJPG) {
this.$message.error('只能上传图片。。')
}
if (!isLt4M) {
this.$message.error('上传头像图片大小不能超过 4MB!')
}
return isJPG && isLt4M
},
uploadSuccess(res) { // 上传成功回调
if (res[0].result === '1') {
this.$message.success('增加成功')
this.dialogVisible1 = false
this.searchTable1()
this.$refs.upload.clearFiles()
} else {
this.$message.error('增加失败')
} }
})
this.tableData1[i].scanSrc = readFile + data[0].文件标识 + '.' + data[0].文件后缀
}, },
handleSizeChange1(val) { handleSizeChange1(val) {
this.pageCurrent1 = 1 this.pageCurrent1 = 1
@@ -579,169 +230,41 @@ export default {
this.pageCurrent1 = val this.pageCurrent1 = val
this.searchTable1() this.searchTable1()
}, },
submitApply(row) { excuteApprove(row) {
if (this.tableData2.length === 0) { this.$confirm('确认审批签字?', '提示', {
this.$message.warning('发票结算申请明细为空！')
} else {
this.$confirm('确认提交申请吗?', '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
submitApply(row.发票结算申请单流水号, this.id).then(response => { excuteApprove(row.发票结算申请单流水号, this.id, this.token).then(response => {
if (response.data[0].result === '1') { if (response.data[0].result === '审批成功') {
this.$message.success('提交成功') this.$message.success('审批成功')
this.searchTable1() this.searchTable1()
this.tableData2 = [] } else if (response.data[0].result === '已完成审批') {
} else { this.$message.error('提交失败') } this.$message.warning('已完成审批，不可重复审批')
} else { this.$message.error('审批失败') }
}) })
}).catch(() => { }).catch(() => {
this.$message({ this.$message({
type: 'info', type: 'info',
message: '已取消操作' message: '已取消审批'
}) })
}) })
}
}, },
searchTable2(row) { searchTable2(row) {
this.applyOrderNum = row.发票结算申请单流水号
this.invoiceNumber = row.发票号 this.invoiceNumber = row.发票号
this.supplierName = row.供应商名称
this.supplierValue = row.供应商流水号
Number(row.是否提交申请) === 1 ? this.disabled = true : this.disabled = false
searchTable2(row.发票结算申请单流水号).then(response => { searchTable2(row.发票结算申请单流水号).then(response => {
this.tableData2 = response.data this.tableData2 = response.data
}) })
},
addInStoreRecord() {
if (this.applyOrderNum) {
this.searchTable01()
this.title2 = '追加入库单'
this.dialogVisible2 = true
} else {
this.$message.error('请选择发票！')
}
},
searchTable01() {
this.tableData01 = []
this.tableData02 = []
this.tableData03 = []
if (this.contractType === '采购合同') {
searchPurchase(this.supplierValue).then(response => {
this.tableData01 = response.data
})
} else if (this.contractType === '离线合同') {
searchOffline(this.supplierValue).then(response => {
response.data.map(data => {
if (Number(data.离线合同状态) === 2) {
this.tableData01.push(data)
}
})
})
this.type = ''
}
},
searchTable02(row) {
this.tableData02 = []
this.tableData03 = []
if (this.contractType === '采购合同') {
if (row.模板类型 === 4) {
this.type = row.模板类型
searchPurchaseDetail1(row.采购合同流水号).then(response => {
response.data.map(data => {
this.$set(data, '本次到票数量', 0)
data.本次到票数量 = data.已到货数量 - data.到票数量
this.tableData03.push(data)
})
})
} else {
searchPurchaseDetail(row.采购合同流水号).then(response => {
response.data.map(data => {
this.$set(data, '本次到票数量', 0)
data.本次到票数量 = data.已到货数量 - data.到票数量
this.tableData02.push(data)
})
})
}
} else if (this.contractType === '离线合同') {
searchOfflineDetail(row.离线合同流水号).then(response => {
response.data.map(data => {
this.$set(data, '本次到票数量', 0)
data.本次到票数量 = data.到货数量 - data.到票数量
this.tableData02.push(data)
})
})
}
},
handleSelectionChange(val) {
this.group = val
},
submitAdd2() { // 追加入库单
if (this.group.length === 0) {
this.$message.warning('请选择零件或物料')
} else {
const group1 = []
const group2 = []
if (this.contractType === '采购合同') {
for (let i = 0; i < this.group.length; i++) {
group1.push(this.group[i].采购合同明细流水号)
group2.push(this.group[i].本次到票数量)
}
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
})
} else { this.$message.error('追加失败') }
})
} else if (this.contractType === '离线合同') {
for (let i = 0; i < this.group.length; i++) {
group1.push(this.group[i].离线合同明细流水号)
group2.push(this.group[i].本次到票数量)
}
addTable2(this.applyOrderNum, group1, group2, 2).then(response => {
if (response.data[0].result === '1') {
this.$message.success('追加成功')
this.dialogVisible2 = false
searchTable2(this.applyOrderNum).then(response => {
this.tableData2 = response.data
})
} else { this.$message.error('追加失败') }
})
}
}
},
deleteTable2(row) {
this.$confirm('确认删除吗?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
deleteTable2(row.发票结算申请单明细流水号).then(response => {
if (response.data[0].result === '1') {
this.$message.success('删除成功')
searchTable2(this.applyOrderNum).then(response => {
this.tableData2 = response.data
})
} else { this.$message.error('删除失败') }
})
}).catch(() => {
this.$message({
type: 'info',
message: '已取消操作'
})
})
},
selectable(row) {
return Number(row.本次到票数量) > 0
} }
} }
} }
</script> </script>
<style scoped> <style scoped>
.el-card{
margin-bottom: 0px;
}
.el-select{ .el-select{
width:200px width:200px
} }
@@ -755,4 +278,3 @@ export default {
margin: 0; margin: 0;
} }
</style> </style>

10
src/views/WorkshopProcurement/NewArrivalList/index.vue
View File

@@ -116,12 +116,12 @@
<template slot-scope="scope"> <template slot-scope="scope">
<el-tooltip :open-delay="1200" effect="dark" content="关联备料材料" placement="top"> <el-tooltip :open-delay="1200" effect="dark" content="关联备料材料" placement="top">
<div style="display: inline-block"> <div style="display: inline-block">
<el-button :disabled="disable === '1' || totalWight1 === 数量" type="text" size="mini" icon="el-icon-circle-plus-outline" @click="addArrivalCL(scope.row)">备料材料</el-button> <el-button :disabled="Number(disable) === 1 || totalWight1 === 数量" type="text" size="mini" icon="el-icon-circle-plus-outline" @click="addArrivalCL(scope.row)">备料材料</el-button>
</div> </div>
</el-tooltip> </el-tooltip>
<el-tooltip :open-delay="200" effect="dark" content="取消关联" placement="top"> <el-tooltip :open-delay="200" effect="dark" content="取消关联" placement="top">
<div style="display: inline-block"> <div style="display: inline-block">
<el-button :disabled="disable === '1'" type="text" size="mini" style="margin-left: 20px" icon="el-icon-top" @click="deleteArrivalMX(scope.row)"/> <el-button :disabled="Number(disable) === 1" type="text" size="mini" style="margin-left: 20px" icon="el-icon-top" @click="deleteArrivalMX(scope.row)"/>
</div> </div>
</el-tooltip> </el-tooltip>
</template> </template>
@@ -188,7 +188,7 @@
<template slot-scope="scope"> <template slot-scope="scope">
<el-tooltip effect="dark" content="取消关联" placement="top"> <el-tooltip effect="dark" content="取消关联" placement="top">
<div style="display: inline-block"> <div style="display: inline-block">
<el-button :disabled="disable === '1'" type="text" icon="el-icon-top" size="mini" @click="deleteMateriel(scope.row)"/> <el-button :disabled="Number(disable) === 1" type="text" icon="el-icon-top" size="mini" @click="deleteMateriel(scope.row)"/>
</div> </div>
</el-tooltip> </el-tooltip>
</template> </template>
@@ -431,6 +431,7 @@
<span>零件图号</span> <span>零件图号</span>
<el-input v-model="零件图号" style="width: 150px" size="small" clearable/> <el-input v-model="零件图号" style="width: 150px" size="small" clearable/>
<el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px" @click="searchTable20()">查询</el-button> <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px" @click="searchTable20()">查询</el-button>
<span style="margin-left: 20px">未绑定重量：{{ 未绑定数量 }}KG</span>
<el-table <el-table
ref="multipleTable" ref="multipleTable"
:row-key="getRowKeys" :row-key="getRowKeys"
@@ -1191,6 +1192,9 @@ export default {
if (response.data.length !== 0) { if (response.data.length !== 0) {
this.中间变量 = response.data[0].单件重量 this.中间变量 = response.data[0].单件重量
this.未绑定数量 = response.data[0].未绑定数量 this.未绑定数量 = response.data[0].未绑定数量
console.log(this.未绑定数量, 111)
} else {
this.未绑定数量 = row.数量
} }
}) })
}, },

10
src/views/WorkshopProcurement/ProcurementContractEnquiry/index.vue
View File

@@ -3,7 +3,7 @@
<el-card> <el-card>
<el-row> <el-row>
<!--<span>合 &nbsp;同 &nbsp;号:</span>--> <!--<span>合 &nbsp;同 &nbsp;号:</span>-->
<el-select v-model="contractNumValue" placeholder="合同号" size="small" filterable clearable> <el-select v-model="contractNumValue" placeholder="合同号" size="small" style="width: 170px" filterable clearable>
<el-option <el-option
v-for="item in contractNum" v-for="item in contractNum"
:key="item.value" :key="item.value"
@@ -60,7 +60,7 @@
height="500px" height="500px"
highlight-current-row highlight-current-row
@row-click="searchTable2"> @row-click="searchTable2">
<el-table-column label="采购合同号" align="center"> <el-table-column label="采购合同号" align="center" width="170px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.采购合同编号 }} {{ scope.row.采购合同编号 }}
</template> </template>
@@ -112,8 +112,8 @@
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" min-width="100px"> <el-table-column label="操作" align="center" min-width="100px">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" plain size="mini" icon="el-icon-printer" @click="exportTable()">打印</el-button> <el-button type="text" size="mini" icon="el-icon-printer" @click="exportTable()">打印</el-button>
<el-button :disabled="scope.row.审批情况内容==='通过审批'" type="text" plain size="mini" icon="el-icon-back" @click="Disable(scope.row)">打回</el-button> <el-button :disabled="scope.row.审批情况内容==='通过审批'" type="text" size="mini" icon="el-icon-back" @click="Disable(scope.row)">打回</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@@ -543,7 +543,7 @@ export default {
} }
}, },
Disable(row) { Disable(row) {
this.$confirm('此操作将永久禁用该行, 是否继续?', '提示', { this.$confirm('将合同打回到请购单, 是否继续?', '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning' type: 'warning'

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

@@ -135,14 +135,13 @@
</el-row> </el-row>
<el-dialog :visible.sync="dialogVisible2" title="采购合同请款" center style="min-height: 300px" width="1200px"> <el-dialog :visible.sync="dialogVisible2" title="采购合同请款" center style="min-height: 300px" width="1200px">
<span>供应商：</span> <span>供应商：</span>
<el-select v-model="supplierValue" placeholder="供应商" filterable clearable size="small"> <el-select v-model="supplierValue" placeholder="供应商" filterable clearable size="small" @change="searchTable01()">
<el-option <el-option
v-for="item in supplier" v-for="item in supplier"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value"/> :value="item.value"/>
</el-select> </el-select>
<el-button type="success" size="small" icon="el-icon-search" style="margin: 0 10px 10px 10px" @click="searchTable01()">查询</el-button>
<el-table v-loading="" :data="tableData01" border style="max-height: 300px;" height="300px" size="mini" @selection-change="handleSelectionChange"> <el-table v-loading="" :data="tableData01" border style="max-height: 300px;" height="300px" size="mini" @selection-change="handleSelectionChange">
<el-table-column :selectable="selectable" type="selection" align="center" width="50"/> <el-table-column :selectable="selectable" type="selection" align="center" width="50"/>
<el-table-column label="采购合同编号" align="center" min-width="120"> <el-table-column label="采购合同编号" align="center" min-width="120">
@@ -343,6 +342,7 @@ export default {
this.tableData01 = response.data this.tableData01 = response.data
}) })
} else { } else {
this.tableData01 = []
this.$message.error('请选择供应商') this.$message.error('请选择供应商')
} }
}, },

2
src/views/WorkshopProcurement/RequestOutsourcingMaterials/index.vue
View File

@@ -136,7 +136,7 @@
{{ scope.row.开票时间 ? scope.row.开票时间.split(' ')[0] : '' }} {{ scope.row.开票时间 ? scope.row.开票时间.split(' ')[0] : '' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="开票金额" width="100px" prop="到票金额"> <el-table-column align="center" label="到票金额" width="100px" prop="到票金额">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.开票金额.toFixed(2) }} {{ scope.row.开票金额.toFixed(2) }}
</template> </template>

2
src/views/WorkshopProcurement/manufacturingPurchaseArrival/index.vue
View File

@@ -17,7 +17,7 @@
:label="item.label" :label="item.label"
:value="item.value"/> :value="item.value"/>
</el-select> </el-select>
<el-button type="primary" plain size="small" icon="el-icon-search" style="margin-left: 10px" @click="searchContractDetail">查询明细</el-button> <!--<el-button type="primary" plain size="small" icon="el-icon-search" style="margin-left: 10px" @click="searchContractDetail">查询明细</el-button>-->
<el-button type="distribution" style="margin: 10px" size="small" icon="el-icon-circle-check" @click="submitInStorage">确认到货</el-button> <el-button type="distribution" style="margin: 10px" size="small" icon="el-icon-circle-check" @click="submitInStorage">确认到货</el-button>
</el-card> </el-card>
<el-card> <el-card>