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
2019-10-29 15:54:18 +08:00
parent 68e2b8e750
commit ad31970800
17 changed files with 1626 additions and 784 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
src/views/ManufacturingCenter/CreateWarehousePurchasing/index.vue
View File

@@ -128,6 +128,7 @@
@click="addpurchasingDetailsForm">创建采购明细表</el-button>
<el-tooltip :open-delay="1000" effect="dark" content="将勾选的物料库中物料选入到选中的采购明细表" placement="top">
<el-button
:disabled="Number(whetherToAllocate) === 1"
type="warning"
size="small"
style="margin-left: 10px"
@@ -160,12 +161,25 @@
{{ scope.row.申请人 }}
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="240" fixed="right">
<el-table-column label="操作" align="center" width="280" fixed="right">
<template slot-scope="scope">
<el-popover v-model="scope.row.visible2" title="调整采购任务" placement="top" width="180">
<div style="text-align: right; margin: 0">
<el-select v-model="PersonValue" style="width:150px" placeholder="人员" size="small" filterable clearable>
<el-option
v-for="item in Person"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<el-button type="primary" size="mini" style="margin:10px 50px 0px 20px" @click="scope.row.visible2 = false;tiaoZheng()">确定</el-button>
</div>
<el-button v-if="!scope.row.edit" slot="reference" :disabled="Number(scope.row.是否分配)===1" type="primary" icon="el-icon-tickets" plain size="mini" style="margin-right:10px" @click="scope.row.visible2 = true;getPeople()">分配</el-button>
</el-popover>
<el-button v-if="scope.row.edit" type="text" size="mini" icon="el-icon-circle-check-outline" @click="confirmEdit(scope.row)">确定</el-button>
<el-button v-if="scope.row.edit" class="cancel-btn" size="mini" type="text" @click="cancelEdit(scope.$index, scope.row)">取消</el-button>
<el-button v-else type="warning" size="mini" icon="el-icon-edit" plain @click="scope.row.edit=!scope.row.edit">编辑</el-button>
<el-button v-if="!scope.row.edit" type="danger" size="mini" icon="el-icon-delete" plain @click="openDelete(scope.row)">删除</el-button>
<el-button v-else :disabled="Number(scope.row.是否分配)===1" type="warning" size="mini" icon="el-icon-edit" plain @click="scope.row.edit=!scope.row.edit">编辑</el-button>
<el-button v-if="!scope.row.edit" :disabled="Number(scope.row.是否分配)===1" type="danger" size="mini" icon="el-icon-delete" plain @click="openDelete(scope.row)">删除</el-button>
</template>
</el-table-column>
</el-table>
@@ -205,17 +219,17 @@
</el-table-column>
<el-table-column label="数量" align="center" min-width="100">
<template slot-scope="scope">
<el-input v-model="scope.row.数量" size="mini" style="width:70px" @change="updateNumber(scope.row)"/>
<el-input v-model="scope.row.数量" :disabled="Number(whetherToAllocate) === 1" size="mini" style="width:70px" @change="updateNumber(scope.row)"/>
</template>
</el-table-column>
<el-table-column label="备注" align="center" min-width="150" prop="备注">
<template slot-scope="scope">
<el-input v-model="scope.row.备注" size="mini" style="width:120px" @change="updateNumber(scope.row)"/>
<el-input v-model="scope.row.备注" :disabled="Number(whetherToAllocate) === 1" size="mini" style="width:120px" @change="updateNumber(scope.row)"/>
</template>
</el-table-column>
<el-table-column label="操作" align="center" min-width="100">
<template slot-scope="scope">
<el-button type="danger" plain size="mini" icon="el-icon-delete" @click="deleteMateriel(scope.row)">移除</el-button>
<el-button :disabled="Number(whetherToAllocate) === 1" type="danger" plain size="mini" icon="el-icon-delete" @click="deleteMateriel(scope.row)">移除</el-button>
</template>
</el-table-column>
</el-table>
@@ -236,12 +250,13 @@
</template>
<script>
import { searchInventoryNum, submitaddpurchasingdetailsform, searchpurchasingDetailsForm, confirmEditpurchasingDetailsForm, openDeletepurchasingDetailsForm, addmateriel, searchtable2, setSafeValue, updateNumber } from '@/api/ManufacturingCenter/CreateWarehousePurchasing'
import { searchInventoryNum, submitaddpurchasingdetailsform, searchpurchasingDetailsForm, confirmEditpurchasingDetailsForm, openDeletepurchasingDetailsForm, addmateriel, searchtable2, setSafeValue, updateNumber, getperson, tiaozheng, deletematerial } from '@/api/ManufacturingCenter/CreateWarehousePurchasing'
import { mapGetters } from 'vuex'
export default {
name: '', // 创建仓库采购
data() {
return {
visible2: false,
dialogVisible: false, // 新增明细表弹出框
title: '', // 新增明细表标题
form: {
@@ -278,7 +293,10 @@ export default {
applicant: '',
formNumber: '', // 表单编号
materielGroup: [], // 物料组
tableData2: [] // 采购明细
tableData2: [], // 采购明细
PersonValue: '', // 采购员编号
Person: [], // 采购员
whetherToAllocate: '' // 是否分配
}
},
computed: {
@@ -292,6 +310,20 @@ export default {
this.searchTable1()
},
methods: {
// 查询采购员
getPeople() {
this.PersonValue = ''
this.Person = []
getperson().then(response => {
for (let i = 0; i < response.data.length; i++) {
this.Person.push({
value: response.data[i].人员编号,
label: response.data[i].姓名
})
}
this.PersonValue = response.data[0].人员编号
})
},
searchTable() { // 查询物料库物料
this.loading = true
let check2, check3
@@ -367,7 +399,8 @@ export default {
表单名称_原: response.data.rows[i].表单名称,
表单流水号: response.data.rows[i].表单流水号,
是否分配: response.data.rows[i].是否分配,
edit: false
edit: false,
visible2: false
})
}
}
@@ -426,11 +459,32 @@ export default {
searchTable2(row) {
this.formNumber = row.表单流水号
this.tableData2 = []
this.whetherToAllocate = row.是否分配
searchtable2(row.表单流水号).then(response => {
console.log(response.data)
this.tableData2 = response.data
})
}, // 勾选物料
}, // 调整采购计划
tiaoZheng() {
tiaozheng(this.formNumber, this.PersonValue).then(response => {
if (response.data[0].result === '1') {
this.$message.success('分配成功')
} else {
this.$message.error('分配失败')
}
})
this.searchTable1()
}, // 移除物料明细
deleteMateriel(row) {
deletematerial(row.id).then(response => {
if (response.data[0].result === '1') {
this.$message.success('移除成功')
} else {
this.$message.error('移除失败')
}
})
},
// 勾选物料
handleSelectionChange(val) {
this.materielGroup = []
for (let i = 0; i < val.length; i++) {

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

@@ -3,56 +3,56 @@
<el-card>
<div class="main">
<div class="process" @click.stop="chaxun">
<div id="son" :class="[isActive ? color[22] : 'weikaishi']" class="module" style="position: relative;left: 1543px;top:190px; width: 80px;height: 48px;">
<div id="son" :class="[isActive ? color[22] : 'weikaishi']" class="module" style="position: relative;left: 1543px;top:188px; width: 80px;height: 48px;">
<el-tooltip :open-delay="600" placement="top">
<div slot="content">单击查看发货详情</div>
<el-button :disabled="disabled" :class="[isActive ? color[22] : 'weikaishi']" type="text" @click.stop="searchDiv23">发货</el-button>
</el-tooltip>
</div>
<div id="son1" :class="[isActive ? color[21] : 'weikaishi']" class="module" style="position: relative;left: 1355px;top:190px; width: 80px;height: 48px;">
<div id="son1" :class="[isActive ? color[21] : 'weikaishi']" class="module" style="position: relative;left: 1355px;top:185px; width: 80px;height: 48px;">
<el-tooltip :open-delay="600" placement="top">
<div slot="content">总装开始时间：{{ `${data2[0].总装调试}` }}<br>总装结束时间：{{ `${data2[0].机床装配实际完成时间}` }}</div>
<el-button v-if="data2[0].总装调试状态===2" :disabled="disabled" :class="[isActive ? color[21] : 'weikaishi']" type="text" @click.stop="searchDiv22">总装调试<br>{{ `${data2[0].机床装配实际完成时间}` }}</el-button>
<el-button v-else :disabled="disabled" :class="[isActive ? color[21] : 'weikaishi']" type="text" @click.stop="searchDiv22">总装调试<br>{{ `${data2[0].总装调试}` }}</el-button>
</el-tooltip>
</div>
<div id="son2" :class="[isActive ? color[20] : 'weikaishi']" class="module" style="position: relative;left: 1168px;top:190px; width: 80px;height: 48px;">
<div id="son2" :class="[isActive ? color[20] : 'weikaishi']" class="module" style="position: relative;left: 1168px;top:185px; width: 80px;height: 48px;">
<el-tooltip :open-delay="600" placement="top">
<div slot="content">装配质检合格率：{{ `${data2[0].装配质检 === 11111111 ? '-' : data2[0].装配质检}%` }}</div>
<el-button :disabled="disabled" :class="[isActive ? color[20] : 'weikaishi']" type="text" @click.stop="searchDiv21">装配质检<br>{{ `${data2[0].装配质检 === 11111111 ? '-' : data2[0].装配质检}%` }}</el-button>
</el-tooltip>
</div>
<div id="son3" :class="[isActive ? color[19] : 'weikaishi']" class="module" style="position: relative;left: 965px;top:62px; width: 80px;height: 48px;">
<div id="son3" :class="[isActive ? color[19] : 'weikaishi']" class="module" style="position: relative;left: 965px;top:135px; width: 80px;height: 48px;">
<el-tooltip :open-delay="600" placement="top">
<div slot="content">电气装配计划完成率：{{ `${data2[0].电气装配}%` }}</div>
<el-button :disabled="disabled" :class="[isActive ? color[19] : 'weikaishi']" type="text" @click.stop="searchDiv6">电气装配<br>{{ `${data2[0].电气装配}%` }}</el-button>
</el-tooltip>
</div>
<div id="son4" :class="[isActive ? color[18] : 'weikaishi']" class="module" style="position: relative;left: 878px;top:140px; width: 80px;height: 48px;">
<div id="son4" :class="[isActive ? color[18] : 'weikaishi']" class="module" style="position: relative;left: 878px;top:215px; width: 80px;height: 48px;">
<el-tooltip :open-delay="600" placement="top">
<div slot="content">机械装配计划完成率：{{ `${data2[0].机械装配}%` }}</div>
<el-button :disabled="disabled" :class="[isActive ? color[18] : 'weikaishi']" type="text" @click.stop="searchDiv5">机械装配<br>{{ `${data2[0].机械装配}%` }}</el-button>
</el-tooltip>
</div>
<div id="son5" :class="[isActive ? color[17] : 'weikaishi']" class="module" style="position: relative;left: 795px;top:220px; width: 80px;height: 48px;">
<el-tooltip :open-delay="600" placement="top">
<div slot="content">冷作计划完成率：{{ `${data2[0].冷作}%` }}</div>
<el-button :disabled="disabled" :class="[isActive ? color[17] : 'weikaishi']" type="text" @click.stop="searchDiv7">冷作<br>{{ `${data2[0].冷作}%` }}</el-button>
</el-tooltip>
</div>
<div id="son6" :class="[isActive ? color[16] : 'weikaishi']" class="module" style="position: relative;left: 710px;top:300px; width: 80px;height: 48px;">
<el-tooltip :open-delay="600" placement="top">
<div slot="content">油漆计划完成率：{{ `${data2[0].油漆}%` }}</div>
<el-button :disabled="disabled" :class="[isActive ? color[16] : 'weikaishi']" type="text" @click.stop="searchDiv8">油漆<br>{{ `${data2[0].油漆}%` }}</el-button>
</el-tooltip>
</div>
<div id="son7" :class="[isActive ? color[15] : 'weikaishi']" class="module" style="position: relative;left: 500px;top:190px; width: 80px;height: 48px;">
<!--<div id="son5" :class="[isActive ? color[17] : 'weikaishi']" class="module" style="position: relative;left: 795px;top:220px; width: 80px;height: 48px;">-->
<!--<el-tooltip :open-delay="600" placement="top">-->
<!--<div slot="content">冷作计划完成率：{{ `${data2[0].冷作}%` }}</div>-->
<!--<el-button :disabled="disabled" :class="[isActive ? color[17] : 'weikaishi']" type="text" @click.stop="searchDiv7">冷作<br>{{ `${data2[0].冷作}%` }}</el-button>-->
<!--</el-tooltip>-->
<!--</div>-->
<!--<div id="son6" :class="[isActive ? color[16] : 'weikaishi']" class="module" style="position: relative;left: 710px;top:300px; width: 80px;height: 48px;">-->
<!--<el-tooltip :open-delay="600" placement="top">-->
<!--<div slot="content">油漆计划完成率：{{ `${data2[0].油漆}%` }}</div>-->
<!--<el-button :disabled="disabled" :class="[isActive ? color[16] : 'weikaishi']" type="text" @click.stop="searchDiv8">油漆<br>{{ `${data2[0].油漆}%` }}</el-button>-->
<!--</el-tooltip>-->
<!--</div>-->
<div id="son7" :class="[isActive ? color[15] : 'weikaishi']" class="module" style="position: relative;left: 670px;top:185px; width: 80px;height: 48px;">
<el-tooltip :open-delay="600" placement="top">
<div slot="content">成组配套率：{{ `${data2[0].成组配套}%` }}</div>
<el-button :disabled="disabled" :class="[isActive ? color[15] : 'weikaishi']" type="text" @click.stop="searchDiv9">成组配套<br>{{ `${data2[0].成组配套}%` }}</el-button>
</el-tooltip>
</div>
<div id="son8" :class="[isActive ? color[14] : 'weikaishi']" class="module" style="position: relative;left: 280px;top:95px; width: 80px;height: 48px;">
<div id="son8" :class="[isActive ? color[14] : 'weikaishi']" class="module" style="position: relative;left: 380px;top:95px; width: 80px;height: 48px;">
<el-tooltip :open-delay="600" placement="top">
<div slot="content">自制质检合格率：{{ `${data2[0].自制质检 === 11111111 ? '-' : data2[0].自制质检}%` }}</div>
<el-button :disabled="disabled" :class="[isActive ? color[14] : 'weikaishi']" type="text" @click.stop="searchDiv12">自制质检<br>{{ `${data2[0].自制质检 === 11111111 ? '-' : data2[0].自制质检}%` }}</el-button>
@@ -4491,7 +4491,7 @@ export default {
width: 1680px;
height: 400px;
/*border: 1px solid red;*/
background: url('../../../assets/img/img16.png') repeat;
background: url('../../../assets/img/img27.png') repeat;
background-repeat:no-repeat;
background-size:100% 100%;-moz-background-size:100% 100%;
}