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

Merge branch 'master' of ssh://123.56.95.229:29418/高精

Browse Source
This commit is contained in:
jiangfuzhuang
2020-02-06 16:56:29 +08:00
parent 1aef5b7d2e 0985586eff
commit 76db4ae54a
13 changed files with 98 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/api/WorkshopProcurement/OfflineProcurement.js
View File

@@ -109,14 +109,14 @@ export function getGroups(stepNumber) {
}) })
} }
export function getTable(checkbox_Machine, Machine, checkbox_Group, Group, checkbox_number, number, k, m, pageCurrent, pageSize) { export function getTable(checkbox_Machine, Machine, checkbox_Group, Group, checkbox_number, number, k, m, pageCurrent, pageSize, ordername, order) {
return request({ return request({
url: '', url: '',
method: 'post', method: 'post',
data: { data: {
type: '1', type: '1',
name: '车间生产管理工艺_零件工序_查询数据_已编制工序的全部零件及工序_横向赋值新建存储过程_新', name: '车间生产管理工艺_零件工序_查询数据_已编制工序的全部零件及工序_横向赋值新建存储过程_新',
param: '项目流水号_check=0=string&机床流水号_check=' + checkbox_Machine + '=string&机床流水号=' + Machine + '=string&组件流水号_check=' + checkbox_Group + '=string&组件流水号=' + Group + '=string&零件图号_check=' + checkbox_number + '=string&零件图号=' + number + '=string&是否查询全部数据=1=string&单件是否外协=1=string&考核状态=6=int&开始时间_check=0&开始时间=' + k + '&结束时间_check=0&结束时间=' + m, param: '项目流水号_check=0=string&机床流水号_check=' + checkbox_Machine + '=string&机床流水号=' + Machine + '=string&组件流水号_check=' + checkbox_Group + '=string&组件流水号=' + Group + '=string&零件图号_check=' + checkbox_number + '=string&零件图号=' + number + '=string&是否查询全部数据=1=string&单件是否外协=1=string&考核状态=6=int&开始时间_check=0&开始时间=' + k + '&结束时间_check=0&结束时间=' + m + '&排序名称=' + ordername + '&排序方式=' + order,
Pagination: pageCurrent + '&' + pageSize Pagination: pageCurrent + '&' + pageSize
} }
}) })

2
src/utils/request.js
View File

@@ -20,7 +20,7 @@ export const uploadPerson = `http://123.56.95.229:8010/submit/uploadPerson.ashx`
export const uploadOP = `http://123.56.95.229:8010/submit/uploadOP.ashx` export const uploadOP = `http://123.56.95.229:8010/submit/uploadOP.ashx`
export const url = `http://123.56.95.229:8010/submit/MESCommonBase.ashx` // 采购件入库、离线件入库 export const url = `http://123.56.95.229:8010/submit/MESCommonBase.ashx` // 采购件入库、离线件入库
export const ExcelDownLoad = 'http://123.56.95.229:8010/submit/downloadFile.ashx' // 导出excel export const ExcelDownLoad = 'http://123.56.95.229:8010/submit/downloadFile.ashx' // 导出excel
export const ExcelWaiGou = 'http://123.56.95.229:8010/submit/excel.ashx' // 导出excel export const ExcelWaiGou = 'http://192.168.0.106:8045/submit/excel.ashx' // 导出excel
// 技术中心程序发布时要更改下面所有的IP到0段 // 技术中心程序发布时要更改下面所有的IP到0段
export const ServerIP = `http://123.56.95.229:8010/webpage/file/` export const ServerIP = `http://123.56.95.229:8010/webpage/file/`
export const uploadFileMachine = `http://123.56.95.229:8010/submit/uploadFileMachine.ashx` // 机床总图 发布时改成0.231 export const uploadFileMachine = `http://123.56.95.229:8010/submit/uploadFileMachine.ashx` // 机床总图 发布时改成0.231

3
src/views/Assembly/SparePartsOutStockRecord/index.vue
View File

@@ -127,12 +127,13 @@ export default {
} else { } else {
this.ordername = '' this.ordername = ''
} }
console.log(this.ordername, 9990999)
if (column.order === 'ascending') { if (column.order === 'ascending') {
this.order = 1 this.order = 1
} else if (column.order === 'descending') { this.order = 2 } else { } else if (column.order === 'descending') { this.order = 2 } else {
this.order = '' this.order = ''
} }
console.log(this.ordername, 9990999, this.order)
this.selecttable() this.selecttable()
}, },
initProject() { initProject() {

8
src/views/Inventory/InventoryManagement/index.vue
View File

@@ -421,14 +421,18 @@ export default {
// 编辑 // 编辑
handleEdit(index, row, formName) { handleEdit(index, row, formName) {
this.temp = 2 this.temp = 2
this.dialogFormVisible = true
this.form.WarehouseNumber = row.仓库编号 this.form.WarehouseNumber = row.仓库编号
this.form.WarehouseName = row.仓库名称 this.form.WarehouseName = row.仓库名称
this.form.WarehouseDescription = row.仓库描述 this.form.WarehouseDescription = row.仓库描述
this.form.Address = row.地址 this.form.Address = row.地址
this.form.ContactpeopleValue = row.人员编号 if (this.role !== '15') {
this.form.ContactpeopleValue = this.Contactpeople[0].value
} else {
this.form.ContactpeopleValue = parseInt(row.人员编号)
}
this.form.Note = row.备注 this.form.Note = row.备注
this.HouseNumber = row.仓库流水号 this.HouseNumber = row.仓库流水号
this.dialogFormVisible = true
}, },
// 执行修改 // 执行修改
chaEdit() { chaEdit() {

40
src/views/ManufacturingCenter/InitialProduction/index.vue
View File

@@ -458,27 +458,27 @@ export default {
'id' 'id'
]) ])
}, },
watch: { // watch: {
// 如果路由有变化，会再次执行该方法 // // 如果路由有变化，会再次执行该方法
'$route'(to) { // '$route'(to) {
const _this = this // const _this = this
console.log(to, 2222) // console.log(to, 2222)
if (to.name === 'InitialProduction') { // if (to.name === 'InitialProduction') {
_this.typeChange() // _this.typeChange()
} // }
} // }
// '$route': { // // '$route': {
// handler(route) { // // handler(route) {
// const _this = this // // const _this = this
// console.log(route.name) // // console.log(route.name)
// if (route.name === 'InitialProduction') { // // if (route.name === 'InitialProduction') {
// _this.typeChange() // // _this.typeChange()
// } // // }
// } // // }
// } // // }
}, // },
created() { created() {
// this.typeChange() this.typeChange()
this.getCurrentTime() this.getCurrentTime()
this.getNowTime() this.getNowTime()
}, },

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

@@ -20,7 +20,7 @@
</el-select> </el-select>
<el-input v-model="Partpaint" placeholder="零件号" clearable size="small" style="width: 180px;margin:0px 10px;"/> <el-input v-model="Partpaint" placeholder="零件号" clearable size="small" style="width: 180px;margin:0px 10px;"/>
<el-button type="success" class="el-icon-search" size="small" style="margin: 0px 10px;" @click="pageCurrent = 1;pageSize = 50;getTableData()">查询</el-button> <el-button type="success" class="el-icon-search" size="small" style="margin: 0px 10px;" @click="pageCurrent = 1;pageSize = 50;getTableData()">查询</el-button>
<el-button :disabled="Name===1" type="success" class="el-icon-finished" size="small" style="margin-left: 220px;background-color: green" @click="submit">完成</el-button> <el-button :disabled="Name===1" type="baocun" class="el-icon-finished" size="small" style="margin-left: 220px" @click="submit">完成</el-button>
</el-card> </el-card>
<el-row> <el-row>
<el-card style="width: 50%; float: left"> <el-card style="width: 50%; float: left">

1
src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue
View File

@@ -36,7 +36,6 @@
height="750" height="750"
highlight-current-row highlight-current-row
border border
stripe
@selection-change="handleSelectionChange"> @selection-change="handleSelectionChange">
<el-table-column align="center" type="selection"/> <el-table-column align="center" type="selection"/>
<el-table-column align="center" label="零件号" prop="零件号" width="160"> <el-table-column align="center" label="零件号" prop="零件号" width="160">

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

@@ -149,13 +149,13 @@
</el-tooltip> </el-tooltip>
<hr> <hr>
<!--html代码--> <!--html代码-->
<div v-show="false">{{ content }}</div> <!--<div v-show="false">{{ content }}</div>-->
<!--富文本编辑器--> <!--富文本编辑器-->
<div v-show="!preview" id="tinymce" style="height:850px;"> <!--<div v-show="!preview" id="tinymce" style="height:850px;">-->
<tinymce ref="tinymce" :height="700" v-model="contentNew" style="width:800px;margin: 0 auto;"/> <!--<tinymce ref="tinymce" :height="700" v-model="contentNew" style="width:800px;margin: 0 auto;"/>-->
</div> <!--</div>-->
<!--网页预览--> <!--网页预览-->
<div v-show="preview" class="editor-content" style="min-height:500px;margin: 0px auto;width:800px;border:1px solid black" v-html="content"/> <div v-show="!preview" class="editor-content" style="min-height:500px;margin: 0px auto;width:800px;border:1px solid black" v-html="content"/>
</el-card> </el-card>
</div> </div>
</template> </template>
@@ -421,7 +421,7 @@ export default {
}, },
submitTotal() { // 确定合同总额 submitTotal() { // 确定合同总额
// this.$refs.tinymce.destroyTinymce() // this.$refs.tinymce.destroyTinymce()
this.$refs.tinymce.initTinymce() // this.$refs.tinymce.initTinymce()
document.getElementsByClassName('actualTotal')[0].innerHTML = this.actualTotal document.getElementsByClassName('actualTotal')[0].innerHTML = this.actualTotal
document.getElementsByClassName('actualTotal')[1].innerHTML = this.actualTotal document.getElementsByClassName('actualTotal')[1].innerHTML = this.actualTotal
document.getElementById('actualTotal_zh').innerHTML = convertCurrency(this.actualTotal) document.getElementById('actualTotal_zh').innerHTML = convertCurrency(this.actualTotal)
@@ -778,7 +778,7 @@ export default {
document.getElementsByClassName('actualTotal')[1].innerHTML = this.actualTotal document.getElementsByClassName('actualTotal')[1].innerHTML = this.actualTotal
document.getElementById('actualTotal_zh').innerHTML = convertCurrency(this.actualTotal) document.getElementById('actualTotal_zh').innerHTML = convertCurrency(this.actualTotal)
this.contentNew = document.getElementsByClassName('editor-content')[0].innerHTML this.contentNew = document.getElementsByClassName('editor-content')[0].innerHTML
this.$refs.tinymce.initTinymce() // this.$refs.tinymce.initTinymce()
setTimeout(() => { setTimeout(() => {
this.$refs.tinymce.setContent(this.contentNew) this.$refs.tinymce.setContent(this.contentNew)
}, 1000) }, 1000)

4
src/views/TechnologyCenter/QueryParts/index.vue
View File

@@ -245,7 +245,7 @@
<el-button <el-button
:disabled="Number(id)!==0" :disabled="Number(id)!==0"
size="mini" size="mini"
plsin plain
type="danger" type="danger"
icon="el-icon-delete" icon="el-icon-delete"
@click="handleDelete(scope.row)">删除</el-button> @click="handleDelete(scope.row)">删除</el-button>
@@ -290,7 +290,7 @@
<el-input v-model="form.零件名称" placeholder="零件名称" size="small" style="width:200px" clearable/> <el-input v-model="form.零件名称" placeholder="零件名称" size="small" style="width:200px" clearable/>
</el-form-item> </el-form-item>
<el-form-item label="零件数量" prop="零件数量" style="margin-left: 70px"> <el-form-item label="零件数量" prop="零件数量" style="margin-left: 70px">
<el-input v-model="form.零件数量" placeholder="零件数量" size="small" style="width:200px" clearable/> <el-input-number v-model="form.零件数量" :step="1" :min="0" size="mini" style="width:200px"/>
</el-form-item> </el-form-item>
<el-form-item label="零件备注" prop="零件备注" style="margin-left: 70px"> <el-form-item label="零件备注" prop="零件备注" style="margin-left: 70px">
<el-input v-model="form.零件备注" placeholder="零件备注" size="small" style="width:200px" clearable/> <el-input v-model="form.零件备注" placeholder="零件备注" size="small" style="width:200px" clearable/>

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

@@ -228,7 +228,7 @@
</el-table> </el-table>
</el-card> </el-card>
<el-dialog v-el-drag-dialog :title="title2" :visible.sync="dialogVisible2" center style="min-height: 300px" width="750px"> <el-dialog v-el-drag-dialog :title="title2" :visible.sync="dialogVisible2" center style="min-height: 300px" width="750px" @close="closedialog()">
<el-form ref="form2" :model="form2" :rules="rules2" label-position="right" label-width="120px"> <el-form ref="form2" :model="form2" :rules="rules2" label-position="right" label-width="120px">
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
@@ -610,6 +610,14 @@ export default {
this.form2.计划完成日期 = '' this.form2.计划完成日期 = ''
this.dialogVisible2 = true this.dialogVisible2 = true
}, },
closedialog() {
this.form2.采购计划流水号 = ''
this.form2.采购单名称 = ''
this.form2.supplierNameValue = ''
this.form2.计划完成日期 = ''
this.form2.供应商名称 = ''
this.form2.计划完成日期 = ''
},
submitAddPurchaseOrder() { // 新建采购单 submitAddPurchaseOrder() { // 新建采购单
this.$refs['form2'].validate((valid) => { this.$refs['form2'].validate((valid) => {
if (valid) { if (valid) {

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

@@ -36,7 +36,7 @@
<el-tag v-else type="primary" size="mini">未结算</el-tag> <el-tag v-else type="primary" size="mini">未结算</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="供应商" prop="供应商名称" align="center" width="200"> <el-table-column label="供应商" prop="供应商名称" align="center" width="260" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.供应商名称 }} {{ scope.row.供应商名称 }}
</template> </template>
@@ -46,12 +46,12 @@
{{ scope.row.日期.split(' ')[0] }} {{ scope.row.日期.split(' ')[0] }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="到货单号" align="center" width="150"> <el-table-column label="到货单号" align="center" width="110">
<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="200" fixed="right"> <el-table-column label="操作" align="center" width="170" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button :disabled="Number(scope.row.是否关联) === 1" type="text" size="mini" style="margin-left: 10px" icon="el-icon-circle-plus-outline" @click="addArrivalOrderMX(scope.row)">到货明细</el-button> <el-button :disabled="Number(scope.row.是否关联) === 1" type="text" size="mini" style="margin-left: 10px" icon="el-icon-circle-plus-outline" @click="addArrivalOrderMX(scope.row)">到货明细</el-button>
<el-button :disabled="Number(scope.row.是否关联) === 1" type="text" size="mini" style="margin-left: 20px" icon="el-icon-delete" @click="deleteArrivalOrder(scope.row)">删除</el-button> <el-button :disabled="Number(scope.row.是否关联) === 1" type="text" size="mini" style="margin-left: 20px" icon="el-icon-delete" @click="deleteArrivalOrder(scope.row)">删除</el-button>
@@ -550,11 +550,11 @@ export default {
planTypes: [ planTypes: [
{ {
value: 0, value: 0,
label: '采购计划' label: '备料采购计划'
}, },
{ {
value: 1, value: 1,
label: '离线采购计划' label: '备料（离线）采购计划'
} }
], ],
arrest: [], arrest: [],
@@ -761,6 +761,9 @@ export default {
} else { } else {
sums[index] = 'N/A' sums[index] = 'N/A'
} }
} else if (index === 3) {
sums[index] = 'KG'
return
} else if (index === 4) { } else if (index === 4) {
sums[index] = '总金额：' sums[index] = '总金额：'
return return

41
src/views/WorkshopProcurement/OfflineProcurement/index.vue
View File

@@ -25,19 +25,19 @@
<el-button type="success" class="el-icon-search" size="small" style="margin: 0px 10px;" @click="pageCurrent10 = 1;pageSize10 = 10;getTableData()">查询</el-button> <el-button type="success" class="el-icon-search" size="small" style="margin: 0px 10px;" @click="pageCurrent10 = 1;pageSize10 = 10;getTableData()">查询</el-button>
</el-card> </el-card>
<el-card style="width: 1137px"> <el-card style="width: 1137px">
<el-table v-loading="" :data="tableData10" stripe highlight-current-row border style="width: 100%;max-height: 315px;margin-top: 10px" height="315px" size="mini" @selection-change="handleSelectionChange"> <el-table v-loading="" :data="tableData10" stripe highlight-current-row border style="width: 100%;max-height: 315px;margin-top: 10px" height="315px" size="mini" @sort-change="sortChange" @selection-change="handleSelectionChange">
<el-table-column type="selection" align="center" width="55"/> <el-table-column type="selection" align="center" width="55"/>
<el-table-column label="机床图号" prop="机床图号" min-width="180" align="center"> <el-table-column label="机床图号" prop="机床图号" min-width="180" align="center">
<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="组号" width="120" align="center"> <el-table-column label="组号" prop="组号" width="120" sortable="custom" align="center">
<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="220"> <el-table-column label="零件图号" prop="零件图号" align="center" sortable="custom" width="220">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.零件图号 }} {{ scope.row.零件图号 }}
</template> </template>
@@ -52,7 +52,7 @@
{{ scope.row.批次数量 }} {{ scope.row.批次数量 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="材料" align="center" min-width="160"> <el-table-column label="材料" prop="材料" align="center" sortable="custom" min-width="160">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.材料 }} {{ scope.row.材料 }}
</template> </template>
@@ -71,8 +71,8 @@
</div> </div>
</el-card> </el-card>
<el-card style="width: 1137px"> <el-card style="width: 1137px">
<span>离线采购计划编号:</span> <span>离线备料单号:</span>
<el-input v-model="purchasingOrder" placeholder="离线采购计划编号" size="small" style="width: 160px" clearable/> <el-input v-model="purchasingOrder" placeholder="离线备料单号" size="small" style="width: 160px" clearable/>
<span style="margin-left: 10px">供应商:</span> <span style="margin-left: 10px">供应商:</span>
<el-select v-model="supplierName" placeholder="供应商" size="small" style="width: 150px" filterable clearable> <el-select v-model="supplierName" placeholder="供应商" size="small" style="width: 150px" filterable clearable>
<el-option <el-option
@@ -346,7 +346,7 @@ export default {
}, },
created() { created() {
this.searchRawMaterial() this.searchRawMaterial()
this.searchTable() // this.searchTable()
this.getMachine() this.getMachine()
}, },
methods: { methods: {
@@ -377,7 +377,7 @@ export default {
if (Cookie.get('group') !== undefined) { if (Cookie.get('group') !== undefined) {
this.Machine = parseInt(Cookie.get('machineValue')) this.Machine = parseInt(Cookie.get('machineValue'))
this.getGroup() this.getGroup()
this.getTableData() // this.getTableData()
this.Group = parseInt(Cookie.get('group')) this.Group = parseInt(Cookie.get('group'))
// this.getTableData() // this.getTableData()
Cookie.remove('machineValue') Cookie.remove('machineValue')
@@ -418,7 +418,28 @@ export default {
this.Group = response.data[0].组件流水号 this.Group = response.data[0].组件流水号
}) })
this.getTableData() this.getTableData()
}, // 按条件查询 },
// 按零件图号 组号 材料排序
sortChange(column) {
console.log(column + '-' + column.prop + '-' + column.order, 11111)
if (column.prop === '组号') {
this.ordername = 1
} else if (column.prop === '零件图号') {
this.ordername = 2
} else if (column.prop === '材料') {
this.ordername = 3
} else {
this.ordername = ''
}
console.log(this.ordername, 9990999)
if (column.order === 'ascending') {
this.order = 1
} else if (column.order === 'descending') { this.order = 2 } else {
this.order = ''
}
this.getTableData()
},
// 按条件查询
getTableData() { getTableData() {
this.tableData10 = [] this.tableData10 = []
if (this.Machine === '') { if (this.Machine === '') {
@@ -436,7 +457,7 @@ export default {
} else { } else {
this.checkbox_number = 1 this.checkbox_number = 1
} }
getTable(this.checkbox_Machine, this.Machine, this.checkbox_Group, this.Group, this.checkbox_number, this.number, '', '', this.pageCurrent10, this.pageSize10).then(response => { getTable(this.checkbox_Machine, this.Machine, this.checkbox_Group, this.Group, this.checkbox_number, this.number, '', '', this.pageCurrent10, this.pageSize10, this.ordername, this.order).then(response => {
if (response.data.rows.length !== 0) { if (response.data.rows.length !== 0) {
for (let i = 0; i < response.data.rows.length; i++) { for (let i = 0; i < response.data.rows.length; i++) {
this.tableData10.push({ this.tableData10.push({

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

@@ -121,7 +121,7 @@
:disabled="Number(scope.row.是否请款)===1" :disabled="Number(scope.row.是否请款)===1"
type="text" type="text"
size="mini" size="mini"
icon="el-icon-delete" icon="el-icon-right"
style="margin-left: 20px" style="margin-left: 20px"
@click="deleteTable1(scope.row)"/> @click="deleteTable1(scope.row)"/>
</div> </div>
@@ -142,7 +142,7 @@
</div> </div>
</el-card> </el-card>
<el-card style="float: left;width: 41.3%;margin-left: 5px"> <el-card style="float: left;width: 41.3%;margin-left: 5px">
<el-table :data="gridData" class="subTableHeader" show-summary stripe border size="mini" style="width: 100%"> <el-table :data="gridData" class="subTableHeader" show-summary border size="mini" style="width: 100%">
<el-table-column width="50" align="center" type="index" label="序号"/> <el-table-column width="50" align="center" type="index" label="序号"/>
<el-table-column label="到货单编号" align="center"> <el-table-column label="到货单编号" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
@@ -177,7 +177,7 @@
<el-dialog v-el-drag-dialog :title="title1" :visible.sync="dialogVisible1" center style="min-height: 300px" width="800px"> <el-dialog v-el-drag-dialog :title="title1" :visible.sync="dialogVisible1" center style="min-height: 300px" width="800px">
<el-form ref="form1" :model="form1" :rules="rules1" label-width="110px"> <el-form ref="form1" :model="form1" :rules="rules1" label-width="110px">
<div style="width: 45%;float: left;margin-top: 5px"> <div style="width: 45%;float: left;margin-top: 5px">
<div style="background: gainsboro"> <div style="background: white">
<el-form-item label="供应商" prop="supplierNameValue"> <el-form-item label="供应商" prop="supplierNameValue">
<el-select v-model="form1.supplierNameValue" placeholder="供应商" size="small" filterable @change="Name=form1.supplierNameValue;searchTable4()"> <el-select v-model="form1.supplierNameValue" placeholder="供应商" size="small" filterable @change="Name=form1.supplierNameValue;searchTable4()">
<el-option <el-option
@@ -190,10 +190,10 @@
<el-form-item label="发票号" prop="money"> <el-form-item label="发票号" prop="money">
<el-input v-model="form1.Number" size="small" placeholder="发票号"/> <el-input v-model="form1.Number" size="small" placeholder="发票号"/>
</el-form-item> </el-form-item>
<el-form-item label="开票时间" prop="invoiceTime"> <el-form-item label="到票时间" prop="invoiceTime">
<el-date-picker v-model="form1.invoiceTime" size="small" type="date" value-format="yyyy-MM-dd" format="yyyy-MM-dd" placeholder="选择日期"/> <el-date-picker v-model="form1.invoiceTime" size="small" type="date" value-format="yyyy-MM-dd" format="yyyy-MM-dd" placeholder="选择日期"/>
</el-form-item> </el-form-item>
<el-form-item label="开票金额" prop="money"> <el-form-item label="到票金额" prop="money">
<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-form-item label="备注" prop="remark"> <el-form-item label="备注" prop="remark">
@@ -224,8 +224,8 @@
</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-show="title1==='新增备料发票'" size="small" type="primary" @click="submitAdd1('form1')">确定</el-button> <el-button v-show="title1==='新增备料到票'" size="small" type="primary" @click="submitAdd1('form1')">确定</el-button>
<el-button v-show="title1==='编辑备料发票'" size="small" type="primary" @click="submitEdit1('form1')">确定</el-button> <el-button v-show="title1==='编辑备料到票'" size="small" type="primary" @click="submitEdit1('form1')">确定</el-button>
</div> </div>
</el-dialog> </el-dialog>
@@ -417,7 +417,7 @@ export default {
if (this.$refs['form1'] !== undefined) { if (this.$refs['form1'] !== undefined) {
this.$refs['form1'].resetFields() this.$refs['form1'].resetFields()
} }
this.title1 = '新增备料发票' this.title1 = '新增备料到票'
this.tableData4 = [] this.tableData4 = []
this.dialogVisible1 = true this.dialogVisible1 = true
console.log(this.supplierNames) console.log(this.supplierNames)
@@ -457,7 +457,7 @@ export default {
if (this.$refs['form1'] !== undefined) { if (this.$refs['form1'] !== undefined) {
this.$refs['form1'].resetFields() this.$refs['form1'].resetFields()
} }
this.title1 = '编辑备料发票' this.title1 = '编辑备料到票'
this.dialogVisible1 = true this.dialogVisible1 = true
this.form1.invoiceNumValue = row.发票流水号 this.form1.invoiceNumValue = row.发票流水号
this.form1.invoiceTime = row.开票时间 this.form1.invoiceTime = row.开票时间