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-05-15 18:05:34 +08:00
parent aee7bd5966 f99edbf97f
commit 39a77099dc
12 changed files with 118 additions and 375 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/views/Assembly/DeliveryConfirmation/index.vue
View File

@@ -147,24 +147,24 @@
stripe
size="mini"
@row-click="openDialogFormVisible">
<el-table-column align="center" label="状态" min-width="80">
<el-table-column align="center" label="状态" min-width="80" fixed>
<template slot-scope="scope">
<span v-if="scope.row.是否发出.toString() === '1'" type="success" size="small">已发出</span>
<span v-else type="danger" size="small">未发出</span>
<!--{{ scope.row.是否发出.toString() === '1' ? '已发出' : '未发出' }}-->
</template>
</el-table-column>
<el-table-column align="center" label="发货单号" min-width="120">
<el-table-column align="center" label="发货单号" min-width="120" fixed>
<template slot-scope="scope">
{{ scope.row.发货单编号 }}
</template>
</el-table-column>
<el-table-column align="center" label="发货单名" min-width="110">
<el-table-column align="center" label="发货单名" min-width="110" fixed>
<template slot-scope="scope">
{{ scope.row.发货单名称 }}
</template>
</el-table-column>
<el-table-column align="center" label="收货单位" min-width="200">
<el-table-column align="center" label="收货单位" min-width="200" fixed>
<template slot-scope="scope">
{{ scope.row.收货单位 }}
</template>

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

@@ -68,33 +68,33 @@
</el-card>
<el-card>
<el-table v-loading="loading" :data="tableData1" element-loading-text="质检数据较多，请耐心等候..." border size="mini" highlight-current-row style="width: 100%" stripe height="475px">
<el-table-column align="center" label="禁用情况" width="80px">
<el-table-column align="center" label="禁用情况" width="80px" fixed>
<template slot-scope="scope">
<el-tag v-if="parseInt(scope.row.是否禁用)===0||scope.row.是否禁用===''" type="success" size="small" @click="approvalPass(scope.row)">未禁用</el-tag>
<el-tag v-if="parseInt(scope.row.是否禁用)===1" type="error" size="small">已禁用</el-tag>
</template>
</el-table-column>
<el-table-column label="机床图号" align="center" width="90px">
<el-table-column label="机床图号" align="center" width="90px" fixed>
<template slot-scope="scope">
{{ scope.row.机床图号 }}
</template>
</el-table-column>
<el-table-column label="机床名称" align="center" min-width="180px" show-overflow-tooltip>
<el-table-column label="机床名称" align="center" min-width="180px" show-overflow-tooltip fixed>
<template slot-scope="scope">
{{ scope.row.机床名称 }}
</template>
</el-table-column>
<el-table-column label="组号" align="center" width="60px">
<el-table-column label="组号" align="center" width="60px" fixed>
<template slot-scope="scope">
{{ scope.row.组号 }}
</template>
</el-table-column>
<el-table-column label="零件图号" align="center" min-width="130px" show-overflow-tooltip>
<el-table-column label="零件图号" align="center" min-width="130px" show-overflow-tooltip fixed>
<template slot-scope="scope">
{{ scope.row.零件图号 }}
</template>
</el-table-column>
<el-table-column label="零件名称" align="center">
<el-table-column label="零件名称" align="center" fixed>
<template slot-scope="scope">
{{ scope.row.零件名称 }}
</template>

93
src/views/Inventory/Inboundscanning/index.vue
View File

@@ -204,67 +204,52 @@ export default {
this.listLoading = true
searchTable(this.partNumber).then(response => {
console.log(response.data)
if (response.data.length === 0) {
if (response.data[0].结果 === '成功' || response.data[0].结果 === '自动完成入库') {
this.listLoading = false
this.tableData.push({
plannumber: response.data[0].剩余数量,
innumber: response.data[0].入库数量,
capture: '',
note: '',
工艺计划流水号: response.data[0].工艺计划流水号,
项目名称: response.data[0].项目名称,
机床图号: response.data[0].机床图号,
零件图号: response.data[0].零件图号
})
const hash = {} // 一个新数组，data为你需要去重的数组，newData用于接收去重后的数组, curVal.去重条件
this.tableDataNum = this.tableData.reduce((preVal, curVal) => {
hash[curVal.工艺计划流水号] ? '' : hash[curVal.工艺计划流水号] = true && preVal.push({
工艺计划流水号: curVal.工艺计划流水号,
项目名称: curVal.项目名称,
机床图号: curVal.机床图号,
零件图号: curVal.零件图号,
plannumber: curVal.plannumber,
innumber: curVal.innumber,
capture: '',
note: ''
})
return preVal
}, [])
} else if (response.data[0].结果 === '未查到') {
this.$notify({
title: '警告',
message: '该零件未加工',
message: '跟单号有误',
type: 'warning'
})
} else if (response.data[0].结果 === '未完成') {
this.$notify({
title: '警告',
message: '此零件未加工完成',
type: 'warning'
})
} else if (response.data[0].结果 === '已入库') {
this.$notify({
title: '警告',
message: '此零件已入库',
type: 'warning'
})
} else {
console.log(response.data, 1233)
for (let i = 0; i < response.data.length; i++) {
if (response.data[i].考核状态 === 7) {
this.listLoading = false
this.tableData.push({
plannumber: response.data[i].剩余数量,
innumber: response.data[i].入库数量,
capture: '',
note: '',
工艺计划流水号: response.data[i].工艺计划流水号,
项目名称: response.data[i].项目名称,
机床图号: response.data[i].机床图号,
零件图号: response.data[i].零件图号
})
const hash = {} // 一个新数组，data为你需要去重的数组，newData用于接收去重后的数组, curVal.去重条件
this.tableDataNum = this.tableData.reduce((preVal, curVal) => {
hash[curVal.工艺计划流水号] ? '' : hash[curVal.工艺计划流水号] = true && preVal.push({
工艺计划流水号: curVal.工艺计划流水号,
项目名称: curVal.项目名称,
机床图号: curVal.机床图号,
零件图号: curVal.零件图号,
plannumber: curVal.plannumber,
innumber: curVal.innumber,
capture: '',
note: ''
})
return preVal
}, [])
} else if (response.data[i].考核状态 === 6) {
this.$notify({
title: '警告',
message: 'P' + response.data[i].工艺计划流水号 + '未加工完成',
type: 'warning'
})
} else if (response.data[i].考核状态 === 8) {
this.$notify({
title: '警告',
message: 'P' + response.data[i].工艺计划流水号 + '已入库',
type: 'warning'
})
} else if (response.data[i].考核状态 === 9) {
this.$notify({
title: '警告',
message: 'P' + response.data[i].工艺计划流水号 + '已出库',
type: 'warning'
})
}
}
}
}).then(() => {
// if (this.finishParts.length > 0) {
// this.dialogFormVisible = true
// }
this.listLoading = false
})
},

8
src/views/ManufacturingCenter/DiscardedPartsInquiry/index.vue
View File

@@ -54,22 +54,22 @@
highlight-current-row
border
@row-click="fetchTableData2">
<el-table-column align="center" label="机床图号" width="120px" show-overflow-tooltip>
<el-table-column align="center" label="机床图号" width="120px" show-overflow-tooltip fixed>
<template slot-scope="scope">
{{ scope.row.机床图号 }}
</template>
</el-table-column>
<el-table-column align="center" label="组号" width="50px">
<el-table-column align="center" label="组号" width="50px" fixed>
<template slot-scope="scope">
{{ scope.row.组号 }}
</template>
</el-table-column>
<el-table-column align="center" label="零件图号" width="173px" show-overflow-tooltip>
<el-table-column align="center" label="零件图号" width="173px" show-overflow-tooltip fixed>
<template slot-scope="scope">
{{ scope.row.零件图号 }}
</template>
</el-table-column>
<el-table-column align="center" label="零件名称" width="129px" show-overflow-tooltip>
<el-table-column align="center" label="零件名称" width="129px" show-overflow-tooltip fixed>
<template slot-scope="scope">
{{ scope.row.零件名称 }}
</template>

6
src/views/ManufacturingCenter/GroupMatching/index.vue
View File

@@ -22,6 +22,7 @@
</el-option>
</el-select>
<el-button type="primary" plain icon="el-icon-search" size="small" style="margin-left: 20px" @click="total=0;pageSize=50;pageCurrent=1;searchData();searchTable()">查询</el-button>
<el-button type="text" plain style="float: right;margin-right: 20px;margin-top: 5px" @click="turnTo()">组件状态查询</el-button>
</el-card>
<el-card>
<el-tabs v-model="PartType2" type="border-card" style="margin-top: 10px">
@@ -505,6 +506,9 @@ export default {
this.SearchMachine()
},
methods: {
turnTo() {
this.$router.push({ path: '/ManufacturingCenter/CompletionOfWorkshopComponents' })
},
searchData() {
this.totalNum = 0
this.loading = true
@@ -544,7 +548,6 @@ export default {
this.dialogFormVisible4 = true
this.titleaa = row.零件图号
processingStatus(row.工艺计划流水号).then(response => {
console.log(response.data, 1123)
for (let i = 0; i < response.data.length; i++) {
if (response.data[i].计划日期 !== '' && response.data[i].计划日期 !== null) {
response.data[i].计划日期 = response.data[i].计划日期.split(' ')[0]
@@ -613,7 +616,6 @@ export default {
this.Group ? check2 = 1 : check2 = 0
searchTable02(check1, this.Machine, check2, this.Group, this.pageCurrent02, this.pageSize02).then(response => {
this.tableData02 = response.data.rows
console.log(response, 999)
this.total02 = response.data.total
})
},

12
src/views/ManufacturingCenter/ProjectPlanningManagementNew/index.vue
View File

@@ -2,7 +2,6 @@
<div class="app-container bold-font">
<el-card>
<el-row>
<!-- <h3 style="display: inline-block;margin: 0">项目名称:</h3> -->
<el-select v-model="projectValue" filterable clearable size="small" style="margin-top:10px;width: 180px" placeholder="项目名称" @change="typeChange()">
<el-option
v-for="item in project"
@@ -10,7 +9,6 @@
:label="item.label"
:value="item.value"/>
</el-select>
<!-- <h3 style="display: inline-block;margin: 0 0 0 20px">机床名称:</h3> -->
<el-select v-model="toolNumValue" clearable filterable size="small" style="margin-bottom:10px;width: 180px" placeholder="机床名称">
<el-option
v-for="item in toolNum"
@@ -18,7 +16,6 @@
:label="item.label"
:value="item.value"/>
</el-select>
<!-- <h3 style="display: inline-block;margin: 0 0 0 20px">客户名称:</h3> -->
<el-input v-model="CustomerNameValue" placeholder="客户名称" size="small" clearable style="width:200px"/>
<el-button size="small" icon="el-icon-search" type="primary" plain style="margin-left: 10px" @click="pageSize=10; pageCurrent=1;searchTable()">查询</el-button>
</el-row>
@@ -34,9 +31,8 @@
<el-row>
<el-col style="width: 1315px;">
<el-card>
<!--<h2 style="display: inline-block;margin: 0 0 10px 0">总计划:</h2>-->
<el-table v-loading="loading" :data="tableData" height="315" highlight-current-row style="margin-top: 5px;width: 100%;" border element-loading-text="拼命加载中" @row-click="rowClick">
<el-table-column label="项目编号" align="center" width="170px" fixed="left">
<el-table-column label="项目编号" align="center" width="100px" fixed="left">
<template slot-scope="scope">
<template v-if="scope.row.edit">
<el-input v-model="scope.row.项目编号" size="mini"/>
@@ -46,17 +42,17 @@
</template>
</template>
</el-table-column>
<el-table-column label="项目名称" align="center" min-width="160px" fixed="left">
<el-table-column label="项目名称" align="center" width="110px" fixed="left">
<template slot-scope="scope">
{{ scope.row.项目名称 }}
</template>
</el-table-column>
<el-table-column label="机床图号" align="center" width="140px" fixed="left">
<el-table-column label="机床图号" align="center" width="100px" fixed="left">
<template slot-scope="scope">
{{ scope.row.机床图号 }}
</template>
</el-table-column>
<el-table-column label="机床名称" align="center" width="280px" fixed="left">
<el-table-column label="机床名称" align="center" width="200px" fixed="left">
<template slot-scope="scope">
{{ scope.row.机床名称 }}
</template>

6
src/views/MarketingCenter/ComprehensiveInquiryMS/index.vue
View File

@@ -31,17 +31,17 @@
<el-card>
<el-col :span="16.5">
<el-table v-loading="listLoading" :data="tableData1" :header-cell-style="{fontFamily:'YouYuan',fontSize:'13px',fontWeight:200}" stripe highlight-current-row style="margin-top: 3px;width: 935px" height="580" border size="mini" @row-click="selectMachine">
<el-table-column align="center" label="项目名称" prop="项目名称" width="110" show-overflow-tooltip>
<el-table-column align="center" label="项目名称" prop="项目名称" width="110" fixed show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.项目名称 }}
</template>
</el-table-column>
<el-table-column align="center" label="客户名称" prop="客户名称" width="130" show-overflow-tooltip>
<el-table-column align="center" label="客户名称" prop="客户名称" width="130" fixed show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.客户名称 }}
</template>
</el-table-column>
<el-table-column align="center" label="付款方式" width="80">
<el-table-column align="center" label="付款方式" fixed width="80">
<template slot-scope="scope">
{{ scope.row.付款方式 }}
</template>

6
src/views/MarketingCenter/InvoiceRecord/index.vue
View File

@@ -51,18 +51,18 @@
stripe
size="mini"
@row-click="fetchTableData2">
<el-table-column align="center" label="合同编号" prop="合同编号" width="120">
<el-table-column align="center" label="合同编号" prop="合同编号" width="120" fixed>
<template slot-scope="scope">
<!-- <el-tag size="mini" type="primary">{{ scope.row.合同编号 }}</el-tag>-->
{{ scope.row.合同编号 }}
</template>
</el-table-column>
<el-table-column align="center" label="项目名称" prop="项目名称" width="110" show-overflow-tooltip>
<el-table-column align="center" label="项目名称" prop="项目名称" width="110" fixed show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.项目名称 }}
</template>
</el-table-column>
<el-table-column align="center" label="客户名称" width="160" show-overflow-tooltip>
<el-table-column align="center" label="客户名称" width="160" fixed show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.客户名称 }}
</template>

6
src/views/Outsourcing/OutsourcingPartsQuery/index.vue
View File

@@ -26,17 +26,17 @@
<el-tag v-if="Number(scope.row.外协状态)==2 && Number(scope.row.到货状态)===1" type="success" size="mini">已到货</el-tag>
</template>
</el-table-column>
<el-table-column label="项目名称" align="center" width="115px">
<el-table-column label="项目名称" align="center" width="115px" fixed>
<template slot-scope="scope">
{{ scope.row.项目名称 }}
</template>
</el-table-column>
<el-table-column label="零件图号" align="center" width="140px" show-overflow-tooltip>
<el-table-column label="零件图号" align="center" width="140px" show-overflow-tooltip fixed>
<template slot-scope="scope">
{{ scope.row.零件图号 }}
</template>
</el-table-column>
<el-table-column label="零件名称" align="center" width="110px">
<el-table-column label="零件名称" align="center" width="110px" fixed>
<template slot-scope="scope">
{{ scope.row.零件名称 }}
</template>

324
src/views/PurchasingCenter/CreateInquirySheet/index.vue
View File

@@ -39,13 +39,6 @@
<el-tabs v-model="tabName" type="border-card" @tab-click="tabClick">
<el-tab-pane label="外购/标准件" name="外购件">
<el-row style="margin-bottom: 10px">
<!--<el-select v-model="projectValue" placeholder="项目名称" size="small" style="width:100px" filterable clearable @change="projectChange">-->
<!--<el-option-->
<!--v-for="item in project"-->
<!--:key="item.value"-->
<!--:label="item.label"-->
<!--:value="item.value"/>-->
<!--</el-select>-->
<el-input v-model="materialName" placeholder="图号名称规格" size="small" style="width:140px" clearable @keyup.enter.native="searchTable11()"/>
<el-input v-model="supplierName" placeholder="供货商" size="small" style="width:140px" clearable/>
<el-select v-model="machineValue" placeholder="机床" size="small" clearable filterable>
@@ -66,20 +59,9 @@
style="width:250px"
start-placeholder="开始日期"
end-placeholder="结束日期"/>
<!--<el-select v-model="groupValue" placeholder="组号" style="width:100px" size="small" clearable filterable>-->
<!--<el-option-->
<!--v-for="item in group"-->
<!--:key="item.value"-->
<!--:label="item.label"-->
<!--:value="item.value"/>-->
<!--</el-select>-->
<!--<el-cascader :options="materialStatus" :props="{ checkStrictly: true }" v-model="materialStatusValue" style="width: 100px" size="small"/>-->
<!--<el-input v-model="materialSpec" placeholder="物料规格" size="small" style="width:120px" clearable/>-->
<el-button type="primary" size="small" icon="el-icon-search" plain style="margin-left: 10px" @click="pageCurrent11=1;pageSize11=50;total11=0;searchTable11()">查询</el-button>
<el-button v-positive="'loading'" :disabled="false" type="search" size="small" icon="el-icon-download" style="margin-left: 10px" @click="exportUninquirySheet">导出未询价单</el-button>
<el-tooltip :open-delay="100" effect="dark" content="开启物料变更" placement="top">
<el-switch v-model="switchValue" active-color="#13ce66" inactive-color="#ff4949" style="margin-left: 30px"/>
</el-tooltip>
<el-button type="distribution" size="small" @click="materialChange()">物料变更</el-button>
<el-button :disabled="tiaozheng1_disable" type="primary" size="small" plain style="float: right;margin-right: 20px" @click="tiaozheng1">调整采购任务</el-button>
<el-select v-model="PersonValue" style="width:100px;float: right;" placeholder="人员" size="small" filterable clearable>
<el-option
@@ -88,19 +70,6 @@
:label="item.label"
:value="item.value"/>
</el-select>
<!--<el-popover v-model="visible" 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" @click="visible = false;tiaozheng1()">确定</el-button>-->
<!--</div>-->
<!--<el-button slot="reference" type="success" size="small" plain style="float: right;margin-right: 20px">调整采购任务</el-button>-->
<!--</el-popover>-->
</el-row>
<el-row>
<el-table
@@ -111,23 +80,12 @@
style="width: 100%;max-height: 500px;"
height="300px"
size="mini"
highlight-current-row
@sort-change="sortChange"
@selection-change="handleSelectionChange1"
@select="handleSelection">
@select="handleSelection"
@row-click="rowClick">
<el-table-column :selectable="selectable" align="center" width="43" type="selection" fixed="left"/>
<el-table-column v-if="switchValue" label="操作" align="center" width="110" fixed="left">
<template slot-scope="scope">
<el-button :disabled="parseInt(scope.row.询价状态编号)!==1||parseInt(scope.row.是否确认)!==1" type="distribution" size="mini" @click="materialChange(scope.row)">物料变更</el-button>
</template>
</el-table-column>
<!--<el-table-column label="状态" align="center" width="70">-->
<!--<template slot-scope="scope">-->
<!--<span v-if="unInquiry(scope.row)" style="color: orange">未询价</span>-->
<!--<span v-if="inquiry(scope.row)" style="color: blue">已询价</span>-->
<!--<span v-if="approval(scope.row)" style="color: green">审批中</span>-->
<!--<span v-if="purchased(scope.row)">已采购</span>-->
<!--</template>-->
<!--</el-table-column>-->
<!--物料名称排序-->
<el-table-column label="名称" align="center" width="120" prop="物料名称" sortable="custom" fixed="left">
<template slot-scope="scope">
@@ -192,15 +150,10 @@
</el-table-column>
<el-table-column label="使用滞货" align="center" width="80">
<template slot-scope="scope">
<!--<el-tooltip class="item" effect="dark" content="使用滞货" placement="top-start">-->
<template v-if="parseInt(scope.row.询价状态编号)!==1||parseInt(scope.row.是否确认)!==1||Number(scope.row.滞货数量)===0">
—
</template>
<el-button v-else :disabled="parseInt(scope.row.询价状态编号)!==1||parseInt(scope.row.是否确认)!==1||Number(scope.row.滞货数量)===0" icon="el-icon-goods" plain type="primary" size="mini" @click="useInventory(scope.row)"/>
<!--</el-tooltip>-->
<!--<el-tooltip class="item" effect="dark" content="取消使用滞货" placement="top-start">-->
<!--<el-button :disabled="parseInt(scope.row.询价状态编号)!==1||parseInt(scope.row.是否确认)!==1||Number(scope.row.使用滞货数量)===0" icon="el-icon-sold-out" plain type="danger" size="mini" @click="cancelUseInventory(scope.row)"/>-->
<!--</el-tooltip>-->
</template>
</el-table-column>
<el-table-column label="可用滞货" align="center" width="80">
@@ -223,17 +176,6 @@
{{ scope.row.组件设计者 || scope.row.机床设计者 || '—' }}
</template>
</el-table-column>
<!--<el-table-column label="询价单编号" align="center" min-width="100">-->
<!--<template slot-scope="scope">-->
<!--<b v-if="inquiry(scope.row)">{{ scope.row.询价单编号 }}</b>-->
<!--<b v-else>—</b>-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column :filters="source" :filter-method="filterSource" align="center" label="数据来源" min-width="90px" prop="零件类型">-->
<!--<template slot-scope="scope">-->
<!--{{ Number(scope.row.零件类型) === 1 ? 'BZ' : 'WG' }}-->
<!--</template>-->
<!--</el-table-column>-->
</el-table>
<div class="block" style="display: inline-block;width:1150px;float: right;">
<div style="display: inline-block;float: right;">
@@ -446,185 +388,6 @@
</el-tooltip>
</div>
</el-tab-pane>
<!--<el-tab-pane v-show="false" label="标准件" name="标准件">-->
<!--<el-row style="margin-bottom: 5px">-->
<!--<span>项目名称:</span>-->
<!--<el-select v-model="projectValue" style="width:200px" placeholder="项目名称" size="small" filterable clearable @change="projectChange">-->
<!--<el-option-->
<!--v-for="item in project"-->
<!--:key="item.value"-->
<!--:label="item.label"-->
<!--:value="item.value"/>-->
<!--</el-select>-->
<!--<span>机床图号:</span>-->
<!--<el-select v-model="machineValue" style="width:200px" placeholder="请选择" size="small" clearable filterable @change="machineChange">-->
<!--<el-option-->
<!--v-for="item in machine"-->
<!--:key="item.value"-->
<!--:label="item.label"-->
<!--:value="item.value"/>-->
<!--</el-select>-->
<!--<span>组号:</span>-->
<!--<el-select v-model="groupValue" style="width:200px" placeholder="请选择" size="small" clearable filterable>-->
<!--<el-option-->
<!--v-for="item in group"-->
<!--:key="item.value"-->
<!--:label="item.label"-->
<!--:value="item.value"/>-->
<!--</el-select>-->
<!--</el-row>-->
<!--<el-row style="margin-bottom: 5px">-->
<!--<span style="margin-right: -10px">物料状态:</span>-->
<!--<el-cascader :options="materialStatus" :props="{ checkStrictly: true }" v-model="materialStatusValue" size="small" style="margin-left: 10px"/>-->
<!--<span>零件图号:</span>-->
<!--<el-input v-model="partNum" placeholder="零件图号" size="small" clearable/>-->
<!--</el-row>-->
<!--<el-row style="margin-bottom: 10px">-->
<!--<span>零件名称:</span>-->
<!--<el-input v-model="partName" placeholder="零件名称" size="small" clearable/>-->
<!--<span>零件规格:</span>-->
<!--<el-input v-model="partSpec" placeholder="零件规格" size="small" clearable/>-->
<!--<span style="margin-left: 10px">时间段:</span>-->
<!--<el-date-picker-->
<!--v-model="endTime"-->
<!--size="small"-->
<!--type="daterange"-->
<!--align="center"-->
<!--value-format="yyyy-MM-dd"-->
<!--format="yyyy-MM-dd"-->
<!--range-separator="～"-->
<!--style="width:250px"-->
<!--start-placeholder="开始日期"-->
<!--end-placeholder="结束日期"/>-->
<!--<el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px" @click="pageCurrent12=1;pageSize12=100;total12=0;searchTable12()">查询</el-button>-->
<!--<el-button type="warning" size="small" icon="el-icon-download" style="margin-left: 10px" @click="exportUninquirySheet">导出未询价物料清单</el-button>-->
<!--<el-popover v-model="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" @click="visible2 = false;tiaozheng2()">确定</el-button>-->
<!--</div>-->
<!--<el-button slot="reference" type="success" size="small" plain style="float: right;margin-right: 20px">调整采购任务</el-button>-->
<!--</el-popover>-->
<!--</el-row>-->
<!--<el-row style="margin-bottom: 10px">-->
<!--<el-table v-loading="" :data="tableData13" size="mini" style="max-height: 600px" height="500px" border stripe @selection-change="handleSelectionChange3">-->
<!--<el-table-column :selectable="selectable" align="center" type="selection"/>-->
<!--<el-table-column align="center" label="采购情况" prop="询价状态编号" min-width="100px">-->
<!--<template slot-scope="scope">-->
<!--<el-tag v-if="scope.row.人员编号===''" type="primary" size="small">未分配</el-tag>-->
<!--<el-tag v-if="parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!==''" type="warning" size="small">未询价</el-tag>-->
<!--<el-tag v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)!==3" type="success" size="small">已询价</el-tag>-->
<!--<el-tag v-if="parseInt(scope.row.采购状态编号)===3" type="info" size="small">已采购</el-tag>-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column align="center" label="项目名称" prop="项目名称" min-width="100px">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.项目名称 }}-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column align="center" prop="机床图号" label="机床图号" min-width="100px">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.机床图号 }}-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column align="center" label="组号" min-width="80px">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.组号 }}-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column align="center" prop="物料类别" label="物料类别" min-width="100px">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.物料类别 }}-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column align="center" prop="物料品种" label="物料品种" min-width="100px">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.物料品种 }}-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column align="center" prop="物料型号" label="图号或型号" min-width="110px">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.物料型号 }}-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column align="center" prop="物料名称" label="名称" min-width="100px">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.物料名称 }}-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column align="center" prop="物料规格" label="规格" min-width="100px">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.物料规格 }}-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column align="center" label="数量" min-width="80px">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.零件数量 }}-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column align="center" label="备注" min-width="100px">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.备注 }}-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column align="center" prop="供货商" label="供货商" min-width="100px">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.供货商 }}-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column align="center" label="计划到货时间" min-width="100px">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.物料计划到货时间.split(' ')[0] }}-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column align="center" label="生产分配时间" min-width="100px">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.操作日期.split(' ')[0] }}-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column align="center" label="采购员" min-width="80px" prop="姓名">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.姓名 ? scope.row.姓名 : '—' }}-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column align="center" label="采购分配时间" min-width="100px">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.任务分配时间 ? scope.row.任务分配时间.split(' ')[0] : '—' }}-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column align="center" label="撤回分配" min-width="100px" fixed="right">-->
<!--<template slot-scope="scope">-->
<!--<el-tooltip :open-delay="1200" effect="dark" content="撤回已分配的采购任务" placement="top">-->
<!--<el-button-->
<!--:disabled="!(parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='')"-->
<!--type="primary"-->
<!--size="mini"-->
<!--plain-->
<!--icon="el-icon-back"-->
<!--@click="retract(scope.row)">撤回</el-button>-->
<!--</el-tooltip>-->
<!--</template>-->
<!--</el-table-column>-->
<!--</el-table>-->
<!--</el-row>-->
<!--<div class="block">-->
<!--<el-pagination-->
<!--:current-page="pageCurrent13"-->
<!--:page-sizes="[10, 20, 30, 40]"-->
<!--:page-size="pageSize13"-->
<!--:total="total13"-->
<!--style="display:inline-block;width:50%"-->
<!--layout="total, sizes, prev, pager, next, jumper"-->
<!--@size-change="handleSizeChange13"-->
<!--@current-change="handleCurrentChange13"/>-->
<!--</div>-->
<!--</el-tab-pane>-->
</el-tabs>
</el-col>
</el-row>
@@ -802,7 +565,6 @@
</el-col>
</el-row>
</el-card>
<!--<div id="inquirySheet" style="width: 800px;margin: 0 auto;display:none">-->
<div id="inquirySheet" style="width: 800px;margin: 0 auto;display:none">
<table class="inquirySheet" cellspacing="0px" align="center" border="1 solid black" width="100%">
<tr>
@@ -991,15 +753,26 @@
<el-dialog v-el-drag-dialog :visible.sync="dialogVisible3" title="物料变更选择" center style="min-height: 300px;" width="780px">
<el-row style="margin-bottom: 10px">
<span>物料名称：</span>
<el-input v-model="materialName0" placeholder="物料名称" size="small" clearable/>
<span>物料规格：</span>
<el-input v-model="materialSpec0" placeholder="物料规格" size="small" clearable/>
<el-col :span="10">
<div style="font-size: 18px;text-align: right">原物料: </div>
</el-col>
<el-col :span="14">
<div style="font-size: 18px;text-align: left">{{ materialOld111 }}</div>
</el-col>
</el-row>
<el-row style="margin-bottom: 10px">
<span>物料型号：</span>
<el-col :span="10">
<div style="font-size: 18px;text-align: right">新物料: </div>
</el-col>
<el-col :span="14">
<div style="font-size: 18px;text-align: left;color: red">{{ materialNew }}</div>
</el-col>
</el-row>
<el-row style="margin-bottom: 10px">
<el-input v-model="materialName0" placeholder="物料名称" size="small" clearable/>
<el-input v-model="materialSpec0" placeholder="物料规格" size="small" clearable/>
<el-input v-model="materialModel0" placeholder="物料型号" size="small" clearable/>
<el-button type="success" size="small" icon="el-icon-search" style="margin-left:10px" @click="pageCurrent02=1;pageSize02=10;total02=0;searchMaterial()">查询</el-button>
<el-button type="success" size="small" icon="el-icon-search" style="margin-left:20px" @click="pageCurrent02=1;pageSize02=10;total02=0;searchMaterial()">查询</el-button>
</el-row>
<el-table :data="tableData02" size="mini" style="width: 97%;max-height: 300px;margin-top:15px" height="400px" border highlight-current-row @row-click="selectNewMaterial">
<el-table-column align="center" label="物料名称" min-width="150">
@@ -1029,8 +802,6 @@
@size-change="handleSizeChange02"
@current-change="handleCurrentChange02"/>
</div>
<span style="font-size: large;color: red">将原物料替换为: {{ materialNew }}</span>
<!--<el-input v-model="materialNew" size="small" readonly style="margin: 10px 10px 0 10px"></el-input>-->
<div slot="footer" class="dialog-footer">
<el-button size="small" @click="dialogVisible3=false">取消</el-button>
<el-button type="primary" size="small" @click="submitMaterialChange">确定</el-button>
@@ -1122,7 +893,6 @@
import { tiaozheng2, tiaozheng1, getPerson, getBillNum, searchMaterial, searchPart, searchSupplier, searchCreateInquirySheet, searchCreateInquirySheet2, searchSheetDetail, editInquirySheet,
createInquirySheet, deleteInquirySheet, addInquirySheet1, addInquirySheet2, outInquirySheet, searchAllMaterial, materialChange, saveOrder,
submitUseInventory, initProject, searchMachine, searchGroup, searchBaseInfo, editBaseInfo, searchMerge, changeNum } from '@/api/PurchasingCenter/CreateInquirySheet'
// import { json2excel } from '@/utils/setMethods.js'
import { mapGetters } from 'vuex'
import { exportExcelMethod } from './exportExcel'
import $ from 'jquery'
@@ -1132,6 +902,8 @@ export default {
name: '', // 创建询价单
data() {
return {
materialOld111: '',
checkeddd: 0,
tiaozheng1_disable: false,
createInquirySheet_disable: false,
startTime: '',
@@ -1189,10 +961,6 @@ export default {
value: 0,
label: '全部'
},
// {
// value: 1,
// label: '未分配'
// },
{
value: 2,
label: '已分配',
@@ -1352,10 +1120,20 @@ export default {
}, 500)
},
methods: {
rowClick(row) {
this.groupPartNumValue = row.组件零件流水号
this.standardAndPurchaseValue = row.标准件和外购件流水号
this.materialOldValue = row.物料流水号
this.materialOld111 = row.物料名称 + ' ' + row.物料规格 + ' ' + row.物料型号
if (parseInt(row.询价状态编号) === 1 || parseInt(row.是否确认) === 1) {
this.checkeddd = 1
} else {
this.checkeddd = 0
}
},
// 2020 03 04 刘路加表头排序
// 1 供货商 2 机床图号 3 物料名称 4 物料型号
sortChange(column, prop, order) {
console.log(column + '-' + column.prop + '-' + column.order, 11111)
if (column.prop === '供货商') {
this.ordername = 1
} else if (column.prop === '机床图号') {
@@ -1374,15 +1152,7 @@ export default {
}
this.searchTable11()
this.searchTable12()
// this.getTableData()
},
// timeSearch() {
// timeSearch().then(response => {
// this.startTime = [response.data[0].外购件开始时间, response.data[0].外购件结束时间]
// this.endTime = [response.data[0].基本件开始时间, response.data[0].基本件结束时间]
// this.searchTable11()
// })
// },
changeNumber(row) {
changeNum(row.物料流水号, row.使用库存数, row.机床流水号, row.组件零件流水号, row.零件数量).then(response => {
if (response.data[0].result === '1') {
@@ -1417,16 +1187,6 @@ export default {
}
})
},
// timeChange1() {
// if (this.startTime) {
// timeChange1(this.startTime[0], this.startTime[1])
// }
// },
// timeChange2() {
// if (this.endTime) {
// timeChange2(this.endTime[0], this.endTime[1])
// }
// },
Jump() {
window.location.hash = '#PurchasingCenter/CreateInquirySheet'
},
@@ -1497,8 +1257,6 @@ export default {
},
clickCard1(project, machine) {
window.location.hash = '#PurchasingCenter/CreateInquirySheet'
// var hight = this.$refs.height1.offsetHeight
// document.documentElement.scrollTop = hight + 140
this.projectValue = project
this.machine = []
this.machineValue = ''
@@ -2482,11 +2240,13 @@ export default {
this.tableData3 = response.data
})
},
materialChange(row) { // 物料变更 标准件和外购件
this.dialogVisible3 = true
this.groupPartNumValue = row.组件零件流水号
this.standardAndPurchaseValue = row.标准件和外购件流水号
this.materialOldValue = row.物料流水号
// 物料变更 标准件和外购件
materialChange() {
if (this.groupPartNumValue) {
if (this.checkeddd === 1) {
this.dialogVisible3 = true
}
}
},
partChange(row) { // 零件变更 基本件
this.$message('没有基本件的标准库')
@@ -2569,7 +2329,7 @@ export default {
margin-right: 10px;
}
.el-input{
width:150px;
width:180px;
margin-right: 10px;
}
.el-cascader{

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

@@ -22,7 +22,7 @@
<!--:label="item.label"-->
<!--:value="item.value"/>-->
<!--</el-select>-->
<el-input v-model="ModelValue" placeholder="规格" style="width: 180px" size="small" clearable/>
<el-input v-model="ModelValue" placeholder="名称规格型号" style="width: 180px" size="small" clearable/>
<el-button icon="el-icon-search" type="primary" plain size="small" @click="pageCurrentWB = 1;pageSizeWB = 1000;pageCurrent = 1;pageSize = 1000;getTableData()">查询</el-button>
</el-card>
<el-card>

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

@@ -36,23 +36,23 @@
</el-card>
<el-card style="width: 100%">
<el-table v-loading="loading" :data="tableData" highlight-current-row border stripe size="mini" style="width: 100%" height="750" @sort-change="sortChange">
<el-table-column label="序号" align="center" type="index" width="50"/>
<el-table-column label="进程" align="center" prop="进程" sortable="custom" width="80px">
<el-table-column label="序号" align="center" type="index" width="50" fixed/>
<el-table-column label="进程" align="center" prop="进程" sortable="custom" width="80px" fixed>
<template slot-scope="scope">
{{ scope.row.备料状态 }}
</template>
</el-table-column>
<el-table-column label="供应商" align="center" min-width="210px" width="300" prop="供应商名称" sortable="custom" show-overflow-tooltip>
<el-table-column label="供应商" align="center" min-width="210px" width="300" prop="供应商名称" sortable="custom" show-overflow-tooltip fixed>
<template slot-scope="scope">
{{ scope.row.备料状态==='自家' ? '自家' : scope.row.供应商名称 }}
</template>
</el-table-column>
<el-table-column label="物料编码" align="center" width="180px">
<el-table-column label="物料编码" align="center" width="180px" fixed>
<template slot-scope="scope">
{{ scope.row.物料编码 ? scope.row.物料编码 : scope.row.零件图号 }}
</template>
</el-table-column>
<el-table-column label="物料名称" align="center" prop="零件名称" sortable="custom" width="120px">
<el-table-column label="物料名称" align="center" prop="零件名称" sortable="custom" width="120px" fixed>
<template slot-scope="scope">
{{ scope.row.零件名称 }}
</template>