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

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

Browse Source
This commit is contained in:
liushuai
2020-02-06 17:19:46 +08:00
parent aedc8fd873 76db4ae54a
commit bfc3e125d5
12 changed files with 101 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -127,12 +127,13 @@ export default {
} 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 = ''
}
console.log(this.ordername, 9990999, this.order)
this.selecttable()
},
initProject() {

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

@@ -421,14 +421,18 @@ export default {
// 编辑
handleEdit(index, row, formName) {
this.temp = 2
this.dialogFormVisible = true
this.form.WarehouseNumber = row.仓库编号
this.form.WarehouseName = row.仓库名称
this.form.WarehouseDescription = 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.HouseNumber = row.仓库流水号
this.dialogFormVisible = true
},
// 执行修改
chaEdit() {

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

@@ -20,7 +20,7 @@
</el-select>
<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 :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-row>
<el-card style="width: 50%; float: left">

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

@@ -1,6 +1,6 @@
<template>
<div class="app-container">
<el-card>
<el-card style="padding-top: 10px">
<el-row>
<!-- <span>机床编号:</span>-->
<el-select v-model="machineNumberValue" filterable placeholder="机床编号" size="small" style="margin:0px 10px" clearable @change="machineChange">
@@ -21,6 +21,7 @@
:label="item.label"
:value="item.value"/>
</el-select>
<span style="margin-left: 50px">三表下达时间:&nbsp;&nbsp;{{ DeliveryTime }}</span>
<!-- <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 15px" @click="searchTable()">查询</el-button>-->
<!-- <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 15px" @click="searchPart()">查询1</el-button>-->
<el-badge :value="value1" :max="99" class="item">
@@ -567,13 +568,14 @@
</template>
<script>
import { initProject, searchgroup, searchTable, searchPart, searchPart1, searchTable1, addData, editData, deleteData, searchDetailed1, purchaseRequisition, purchaseRequisition1, purchaseRequisition2, MoveOut, MoveOut1, PurchasingDepartment, Production, PartCallbackInformation, PartCallbackInformation1, submit, submit1, Delete, Delete1, editStock, editNum, OutPart } from '@/api/ManufacturingCenter/PartAssignment'
import { DeliveryTimeSelect, initProject, searchgroup, searchTable, searchPart, searchPart1, searchTable1, addData, editData, deleteData, searchDetailed1, purchaseRequisition, purchaseRequisition1, purchaseRequisition2, MoveOut, MoveOut1, PurchasingDepartment, Production, PartCallbackInformation, PartCallbackInformation1, submit, submit1, Delete, Delete1, editStock, editNum, OutPart } from '@/api/ManufacturingCenter/PartAssignment'
import { mapGetters } from 'vuex'
import Cookie from 'js-cookie'
export default {
inject: ['reload'],
data() {
return {
DeliveryTime: '', // 三表下达时间
projectFloatValue: '',
machineNumberValue: '',
machineFloatValue: '',
@@ -869,12 +871,21 @@ export default {
}
})
},
// 三表下达时间查询
DeliveryTimeSelect() {
this.DeliveryTime = ''
DeliveryTimeSelect(this.groupNumberValue).then(response => {
console.log(response.data)
this.DeliveryTime = response.data[0].操作日期.substring(0, 10)
})
},
searchTable() {
this.loading = true
if (this.machineNumberValue !== '') {
this.check2 = 1
} else { this.check2 = 0 }
if (this.groupNumberValue !== '') {
this.DeliveryTimeSelect() // 三表下达时间查询
this.check3 = 1
} else { this.check3 = 0 }
searchTable(this.machineNumberValue, this.check2, this.groupNumberValue, this.check3).then(response => {

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

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

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

@@ -228,7 +228,7 @@
</el-table>
</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-row>
<el-col :span="12">
@@ -610,6 +610,14 @@ export default {
this.form2.计划完成日期 = ''
this.dialogVisible2 = true
},
closedialog() {
this.form2.采购计划流水号 = ''
this.form2.采购单名称 = ''
this.form2.supplierNameValue = ''
this.form2.计划完成日期 = ''
this.form2.供应商名称 = ''
this.form2.计划完成日期 = ''
},
submitAddPurchaseOrder() { // 新建采购单
this.$refs['form2'].validate((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>
</template>
</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">
{{ scope.row.供应商名称 }}
</template>
@@ -46,12 +46,12 @@
{{ scope.row.日期.split(' ')[0] }}
</template>
</el-table-column>
<el-table-column label="到货单号" align="center" width="150">
<el-table-column label="到货单号" align="center" width="110">
<template slot-scope="scope">
{{ scope.row.到货单编号 }}
</template>
</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">
<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>
@@ -550,11 +550,11 @@ export default {
planTypes: [
{
value: 0,
label: '采购计划'
label: '备料采购计划'
},
{
value: 1,
label: '离线采购计划'
label: '备料（离线）采购计划'
}
],
arrest: [],
@@ -761,6 +761,9 @@ export default {
} else {
sums[index] = 'N/A'
}
} else if (index === 3) {
sums[index] = 'KG'
return
} else if (index === 4) {
sums[index] = '总金额：'
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-card>
<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 label="机床图号" prop="机床图号" min-width="180" align="center">
<template slot-scope="scope">
{{ scope.row.机床图号 }}
</template>
</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">
{{ scope.row.组号 }}
</template>
</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">
{{ scope.row.零件图号 }}
</template>
@@ -52,7 +52,7 @@
{{ scope.row.批次数量 }}
</template>
</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">
{{ scope.row.材料 }}
</template>
@@ -71,8 +71,8 @@
</div>
</el-card>
<el-card style="width: 1137px">
<span>离线采购计划编号:</span>
<el-input v-model="purchasingOrder" placeholder="离线采购计划编号" size="small" style="width: 160px" clearable/>
<span>离线备料单号:</span>
<el-input v-model="purchasingOrder" placeholder="离线备料单号" size="small" style="width: 160px" clearable/>
<span style="margin-left: 10px">供应商:</span>
<el-select v-model="supplierName" placeholder="供应商" size="small" style="width: 150px" filterable clearable>
<el-option
@@ -346,7 +346,7 @@ export default {
},
created() {
this.searchRawMaterial()
this.searchTable()
// this.searchTable()
this.getMachine()
},
methods: {
@@ -377,7 +377,7 @@ export default {
if (Cookie.get('group') !== undefined) {
this.Machine = parseInt(Cookie.get('machineValue'))
this.getGroup()
this.getTableData()
// this.getTableData()
this.Group = parseInt(Cookie.get('group'))
// this.getTableData()
Cookie.remove('machineValue')
@@ -418,7 +418,28 @@ export default {
this.Group = response.data[0].组件流水号
})
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() {
this.tableData10 = []
if (this.Machine === '') {
@@ -436,7 +457,7 @@ export default {
} else {
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) {
for (let i = 0; i < response.data.rows.length; i++) {
this.tableData10.push({

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

@@ -121,7 +121,7 @@
:disabled="Number(scope.row.是否请款)===1"
type="text"
size="mini"
icon="el-icon-delete"
icon="el-icon-right"
style="margin-left: 20px"
@click="deleteTable1(scope.row)"/>
</div>
@@ -142,7 +142,7 @@
</div>
</el-card>
<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 label="到货单编号" align="center">
<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-form ref="form1" :model="form1" :rules="rules1" label-width="110px">
<div style="width: 45%;float: left;margin-top: 5px">
<div style="background: gainsboro">
<div style="background: white">
<el-form-item label="供应商" prop="supplierNameValue">
<el-select v-model="form1.supplierNameValue" placeholder="供应商" size="small" filterable @change="Name=form1.supplierNameValue;searchTable4()">
<el-option
@@ -190,10 +190,10 @@
<el-form-item label="发票号" prop="money">
<el-input v-model="form1.Number" size="small" placeholder="发票号"/>
</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-form-item>
<el-form-item label="开票金额" prop="money">
<el-form-item label="到票金额" prop="money">
<el-input v-model="form1.money" size="small" placeholder="开票金额"/>
</el-form-item>
<el-form-item label="备注" prop="remark">
@@ -224,8 +224,8 @@
</el-form>
<div slot="footer" class="dialog-footer">
<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="submitEdit1('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>
</div>
</el-dialog>
@@ -417,7 +417,7 @@ export default {
if (this.$refs['form1'] !== undefined) {
this.$refs['form1'].resetFields()
}
this.title1 = '新增备料发票'
this.title1 = '新增备料到票'
this.tableData4 = []
this.dialogVisible1 = true
console.log(this.supplierNames)
@@ -457,7 +457,7 @@ export default {
if (this.$refs['form1'] !== undefined) {
this.$refs['form1'].resetFields()
}
this.title1 = '编辑备料发票'
this.title1 = '编辑备料到票'
this.dialogVisible1 = true
this.form1.invoiceNumValue = row.发票流水号
this.form1.invoiceTime = row.开票时间