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

Merge branch 'master' of ssh://192.168.1.149:29418/高精2.0

Browse Source
This commit is contained in:
chenjianan
2018-11-27 08:01:02 +08:00
parent 57a27ebff6 0113ef27db
commit e300a31a5e
9 changed files with 136 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/api/MarketingCenter/ContractCapitalManagement.js
View File

@@ -87,6 +87,16 @@ export function searchProjectNumber() {
} }
}) })
} }
export function searchProjectNumber2() {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '合同信息管理_项目名称_总_查询_增加限制'
}
})
}
export function searchProjectName(num1) { export function searchProjectName(num1) {
return request({ return request({
url: '', url: '',

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

@@ -32,7 +32,7 @@
</el-table-column> </el-table-column>
<el-table-column label="联系人" align="center"> <el-table-column label="联系人" 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="备注" width="180" align="center"> <el-table-column label="备注" width="180" align="center">
@@ -97,6 +97,11 @@
{{ scope.row.仓库名称 }} {{ scope.row.仓库名称 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="追溯码" width="150">
<template slot-scope="scope">
<canvas :id="canvas[scope.$index]"/>
</template>
</el-table-column>
<el-table-column label="操作" min-width="100" align="center" fixed="right"> <el-table-column label="操作" min-width="100" align="center" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
@@ -243,6 +248,7 @@
</template> </template>
<script> <script>
import { initWarehouse, addWarehouse, alterWarehouse, deleteWarehouse, searchLocate, addLocate, alterLocate, deleteLocate, searchPeople } from '@/api/Inventory/InventoryManagement' import { initWarehouse, addWarehouse, alterWarehouse, deleteWarehouse, searchLocate, addLocate, alterLocate, deleteLocate, searchPeople } from '@/api/Inventory/InventoryManagement'
import QRCode from 'qrcode'
export default { export default {
data() { data() {
return { return {
@@ -341,6 +347,7 @@ export default {
不可用量: response.data[i].不可用量, 不可用量: response.data[i].不可用量,
仓库名称: response.data[i].仓库名称 仓库名称: response.data[i].仓库名称
}) })
this.useqrcode()
} }
}) })
}, },
@@ -536,6 +543,15 @@ export default {
}) })
}) })
}, },
useqrcode() {
// 生成的二维码内容，可以添加变量
this.QueryDetail = this.num
var canvas = document.getElementById('canvas')
QRCode.toCanvas(canvas, this.QueryDetail, function(error) {
if (error) console.error(error)
console.log('success!')
})
},
// 重置表单 // 重置表单
callLocateOff(formName) { callLocateOff(formName) {
this.form2 = {} this.form2 = {}

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

@@ -143,24 +143,24 @@
{{ scope.row.零件类型名称 }} {{ scope.row.零件类型名称 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="是否外协" align="center" width="90"> <!--<el-table-column label="是否外协" align="center" width="90">-->
<template slot-scope="scope"> <!--<template slot-scope="scope">-->
<el-checkbox v-model="tableData[scope.$index].checked_waixie" @change="gaibianwaixie(scope.$index, scope.row)"/> <!--<el-checkbox v-model="tableData[scope.$index].checked_waixie" @change="gaibianwaixie(scope.$index, scope.row)"/>-->
外协 <!--外协-->
</template> <!--</template>-->
</el-table-column> <!--</el-table-column>-->
<el-table-column label="是否带料" align="center" width="90"> <!--<el-table-column label="是否带料" align="center" width="90">-->
<template slot-scope="scope"> <!--<template slot-scope="scope">-->
<el-checkbox :disabled="!tableData[scope.$index].checked_waixie" v-model="tableData[scope.$index].checked_dailiao"/> <!--<el-checkbox :disabled="!tableData[scope.$index].checked_waixie" v-model="tableData[scope.$index].checked_dailiao"/>-->
带料 <!--带料-->
</template> <!--</template>-->
</el-table-column> <!--</el-table-column>-->
<el-table-column label="是否着急" align="center" width="90"> <!--<el-table-column label="是否着急" align="center" width="90">-->
<template slot-scope="scope"> <!--<template slot-scope="scope">-->
<el-checkbox v-model="tableData[scope.$index].checked_zhaoji"/> <!--<el-checkbox v-model="tableData[scope.$index].checked_zhaoji"/>-->
着急 <!--着急-->
</template> <!--</template>-->
</el-table-column> <!--</el-table-column>-->
<!--<el-table-column prop="name" label="打回原因" width="170" align="center">--> <!--<el-table-column prop="name" label="打回原因" width="170" align="center">-->
<!--<template slot-scope="scope">--> <!--<template slot-scope="scope">-->
<!--<el-input v-model="tableData[scope.$index].name" type="textarea" :rows="1" style="width:150px" placeholder="原因">--> <!--<el-input v-model="tableData[scope.$index].name" type="textarea" :rows="1" style="width:150px" placeholder="原因">-->
@@ -176,7 +176,7 @@
<el-button <el-button
size="mini" size="mini"
type="primary" type="primary"
@click="handleDele(scope.$index, scope.row, 'form1')">打回档案</el-button> @click="handleDele(scope.$index, scope.row, 'form1')">打回</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@@ -190,16 +190,10 @@
layout="total, sizes, prev, pager, next, jumper" layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange" @size-change="handleSizeChange"
@current-change="handleCurrentChange"/> @current-change="handleCurrentChange"/>
<el-checkbox v-model="checked_baitu" style="margin-top:0px">是否白图</el-checkbox> <!--<el-checkbox v-model="checked_baitu" style="margin-top:0px">是否白图</el-checkbox>-->
<el-checkbox v-model="checked_gaonandu">是否高难度</el-checkbox> <!--<el-checkbox v-model="checked_gaonandu">是否高难度</el-checkbox>-->
<el-button type="primary" size="small" style="float:right;margin-top:10px" @click="production">投产</el-button> <el-button type="primary" size="small" style="float:right;margin-top:10px" @click="production">投产</el-button>
</div> </div>
<!--<el-row>-->
<!--<el-checkbox v-model="checked_baitu" style="margin-top:20px">是否白图</el-checkbox>-->
<!--<el-checkbox v-model="checked_gaonandu">是否高难度</el-checkbox>-->
<!--<el-button type="primary" size="small" @click="production" style="float:right;margin-top:10px">投产</el-button>-->
<!--</el-row>-->
</div> </div>
</el-card> </el-card>
@@ -236,14 +230,14 @@
label="批次数量"> label="批次数量">
<template slot-scope="scope">{{ scope.row.批次数量 }}</template> <template slot-scope="scope">{{ scope.row.批次数量 }}</template>
</el-table-column> </el-table-column>
<el-table-column <!--<el-table-column-->
label="是否外协"> <!--label="是否外协">-->
<template slot-scope="scope">{{ scope.row.是否外协 }}</template> <!--<template slot-scope="scope">{{ scope.row.是否外协 }}</template>-->
</el-table-column> <!--</el-table-column>-->
<el-table-column <!--<el-table-column-->
label="是否带料"> <!--label="是否带料">-->
<template slot-scope="scope">{{ scope.row.是否带料 }}</template> <!--<template slot-scope="scope">{{ scope.row.是否带料 }}</template>-->
</el-table-column> <!--</el-table-column>-->
<el-table-column <el-table-column
label="机加工开始时间"> label="机加工开始时间">
<template slot-scope="scope">{{ scope.row.机加工开始时间 }}</template> <template slot-scope="scope">{{ scope.row.机加工开始时间 }}</template>

76
src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue
View File

@@ -73,12 +73,12 @@
type="selection" type="selection"
align="center" align="center"
width="35"/> width="35"/>
<el-table-column label="零件图号" align="center" width="200"> <el-table-column label="零件图号" align="center" width="300">
<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="130"> <el-table-column label="零件名称" align="center" width="200">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.零件名称 }} {{ scope.row.零件名称 }}
</template> </template>
@@ -103,42 +103,42 @@
{{ 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="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="外协" width="100" align="center"> <!--<el-table-column label="外协" width="100" align="center">-->
<template slot-scope="scope"> <!--<template slot-scope="scope">-->
<el-checkbox v-model="scope.row.是否预计外协" @change="table1Out(scope.row)">外协</el-checkbox> <!--<el-checkbox v-model="scope.row.是否预计外协" @change="table1Out(scope.row)">外协</el-checkbox>-->
</template> <!--</template>-->
</el-table-column> <!--</el-table-column>-->
<el-table-column label="加工件合格" align="center" width="230"> <!--<el-table-column label="加工件合格" align="center" width="230">-->
<template slot-scope="scope"> <!--<template slot-scope="scope">-->
<el-date-picker <!--<el-date-picker-->
v-model="tableData[scope.$index].加工件合格时间" <!--v-model="tableData[scope.$index].加工件合格时间"-->
size="mini" <!--size="mini"-->
type="date" <!--type="date"-->
value-format="yyyy-MM-dd" <!--value-format="yyyy-MM-dd"-->
placeholder="选择加工件合格时间" <!--placeholder="选择加工件合格时间"-->
@change="timeChange(scope.row)"/> <!--@change="timeChange(scope.row)"/>-->
</template> <!--</template>-->
</el-table-column> <!--</el-table-column>-->
<el-table-column label="板焊结束" width="150" align="center"> <!--<el-table-column label="板焊结束" width="150" 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="操作" width="200px" align="center" fixed="right"> <!--<el-table-column label="操作" width="200px" align="center" fixed="right">-->
<template slot-scope="scope" align="center"> <!--<template slot-scope="scope" align="center">-->
<el-button <!--<el-button-->
size="mini" <!--size="mini"-->
type="primary" <!--type="primary"-->
class="el-icon-edit" <!--class="el-icon-edit"-->
@click="PlateWelding(scope.$index, scope.row, 'form1')">板焊</el-button> <!--@click="PlateWelding(scope.$index, scope.row, 'form1')">板焊</el-button>-->
<!--<el-button size="mini" type="primary" @click="inBatches">分批</el-button>--> <!--&lt;!&ndash;<el-button size="mini" type="primary" @click="inBatches">分批</el-button>&ndash;&gt;-->
</template> <!--</template>-->
</el-table-column> <!--</el-table-column>-->
</el-table> </el-table>
<div v-if="是否扫描 === false" class="block" style="margin-top: 10px;"> <div v-if="是否扫描 === false" class="block" style="margin-top: 10px;">
<el-pagination <el-pagination

50
src/views/MarketingCenter/ContractCapitalManagement/index.vue
View File

@@ -42,11 +42,6 @@
{{ scope.row.机床名称 }} {{ scope.row.机床名称 }}
</template> </template>
</el-table-column> </el-table-column>
<!--<el-table-column label="发货状态" align="center">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.机床名称 }}-->
<!--</template>-->
<!--</el-table-column>-->
</el-table> </el-table>
</template> </template>
</el-table-column> </el-table-column>
@@ -119,12 +114,6 @@
</el-table-column> </el-table-column>
<el-table-column label="操作" fixed="right" align="center" width="200"> <el-table-column label="操作" fixed="right" align="center" width="200">
<template slot-scope="scope"> <template slot-scope="scope">
<!--<el-button-->
<!--size="mini"-->
<!--type="primary"-->
<!--icon="el-icon-tickets"-->
<!--:disabled="scope.row.是否禁用"-->
<!--@click.stop="handleEdit(scope.row, scope.$index)">付款</el-button>-->
<el-button <el-button
:disabled="scope.row.是否禁用编辑" :disabled="scope.row.是否禁用编辑"
size="mini" size="mini"
@@ -180,11 +169,6 @@
{{ scope.row.本次收款时间 }} {{ scope.row.本次收款时间 }}
</template> </template>
</el-table-column> </el-table-column>
<!--<el-table-column label="是否开票" align="center">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.是否开票 }}-->
<!--</template>-->
<!--</el-table-column>-->
<el-table-column label="操作" fixed="right" align="center" width="250"> <el-table-column label="操作" fixed="right" align="center" width="250">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
@@ -246,7 +230,11 @@
</el-table-column> </el-table-column>
<el-table-column align="center" label="状态"> <el-table-column align="center" label="状态">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag type="danger" style="width: 80px">{{ scope.row.状态 }}</el-tag> <el-tag v-if="scope.row.计划付款时间===''||scope.row.计划付款时间===null" size="small">无计划</el-tag>
<el-tag v-else-if="scope.row.计划付款时间!==''&&scope.row.计划付款时间!==null&&parseInt(scope.row.未收金额)===0" type="success" size="small">已完成</el-tag>
<el-tag v-else-if="scope.row.计划付款时间!==''&&scope.row.计划付款时间!==null&&scope.row.状态==='未开始'" type="primary" size="small">未开始</el-tag>
<el-tag v-else-if="scope.row.计划付款时间!==''&&scope.row.计划付款时间!==null&&scope.row.状态==='即将拖期'" type="warning" size="small">即将拖期</el-tag>
<el-tag v-else-if="scope.row.计划付款时间!==''&&scope.row.计划付款时间!==null&&scope.row.状态==='已拖期'" type="danger" size="small">已拖期</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" fixed="right" align="center" width="280"> <el-table-column label="操作" fixed="right" align="center" width="280">
@@ -283,7 +271,7 @@
<el-form-item label="项目名称" prop="entryNameValue" label-width="100px"> <el-form-item label="项目名称" prop="entryNameValue" label-width="100px">
<el-select v-model="form2.entryNameValue" clearable filterable placeholder="请输入项目名称" style="margin-left: 2px; width: 200px" size="small" @change="searchProjectName"> <el-select v-model="form2.entryNameValue" clearable filterable placeholder="请输入项目名称" style="margin-left: 2px; width: 200px" size="small" @change="searchProjectName">
<el-option <el-option
v-for="item in entryName" v-for="item in entryName2"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value"/> :value="item.value"/>
@@ -486,7 +474,7 @@
<script> <script>
import elInput from 'element-ui/packages/input' import elInput from 'element-ui/packages/input'
import { SelectContractFunds, AccountsReceivable, editDay, TransPlanning, selectBatch, editList, delMoney, editTime, selectMax, editFukuan, fukuan, selectProvince, SelectMarketingManager, searchTable1, searchTable2, editBatchCapitalChar, deletechar, searchProjectNumber, searchProjectName, addList, PaymentPhase, dellist, selectMachine, selectBatchFundingDetails } from '@/api//MarketingCenter/ContractCapitalManagement' import { searchProjectNumber2, SelectContractFunds, AccountsReceivable, editDay, TransPlanning, selectBatch, editList, delMoney, editTime, selectMax, editFukuan, fukuan, selectProvince, SelectMarketingManager, searchTable1, searchTable2, editBatchCapitalChar, deletechar, searchProjectNumber, searchProjectName, addList, PaymentPhase, dellist, selectMachine, selectBatchFundingDetails } from '@/api//MarketingCenter/ContractCapitalManagement'
export default { export default {
components: { components: {
elInput elInput
@@ -500,7 +488,7 @@ export default {
} }
} }
return { return {
// disabled: false, entryName2: [],
type: '', type: '',
a: 1, a: 1,
b: 1, b: 1,
@@ -612,7 +600,6 @@ export default {
} }
}, },
created() { created() {
// this.fetchData()
this.getTableData() this.getTableData()
this.init() this.init()
}, },
@@ -620,6 +607,7 @@ export default {
init() { init() {
this.getSelect(selectProvince, ['省份', '省份流水号'], 'Province') this.getSelect(selectProvince, ['省份', '省份流水号'], 'Province')
this.getSelect(searchProjectNumber, ['项目名称', '项目流水号'], 'entryName') this.getSelect(searchProjectNumber, ['项目名称', '项目流水号'], 'entryName')
this.getSelect(searchProjectNumber2, ['项目名称', '项目流水号'], 'entryName2')
this.getSelect(PaymentPhase, ['付款阶段', '付款阶段ID'], 'PaymentPhase') this.getSelect(PaymentPhase, ['付款阶段', '付款阶段ID'], 'PaymentPhase')
AccountsReceivable().then(response => { AccountsReceivable().then(response => {
const data = response.data const data = response.data
@@ -685,7 +673,6 @@ export default {
} }
} }
data[i].未收金额 === '0' ? data[i].是否禁用 = true : data[i].是否禁用 = false data[i].未收金额 === '0' ? data[i].是否禁用 = true : data[i].是否禁用 = false
// data[i].已支付 === '0' ? data[i].是否禁用编辑 = false : data[i].是否禁用编辑 = true
} }
this.tableData2 = data this.tableData2 = data
this.total2 = response.data.total this.total2 = response.data.total
@@ -821,19 +808,6 @@ export default {
} }
} }
}, },
// fetchData() {
// getTree().then(response => { // 获取人员信息树
// const data = response.data
// this.dataPeople = tree(data, 0)
// })
// },
// handleNodeClick(data) { // 树节点点击
// this.getData(getTablePeople, 'ListPeople', data.id)
// },
// handleChange(row) {
// this.peopleid = row.人员编号
// this.peoplename = row.姓名
// },
getName() { getName() {
this.dialogFormVisiblePeople = false this.dialogFormVisiblePeople = false
this.MarketingManagerValue = this.peoplename this.MarketingManagerValue = this.peoplename
@@ -910,7 +884,6 @@ export default {
this.tableData2 = data this.tableData2 = data
this.total2 = response.data.total this.total2 = response.data.total
}) })
// this.getTable(searchTable2, [this.PageCurrent2, this.PageSize2, this.moneyID], ['tableData2', 'total2', 'listLoading2'])
}, },
handleSizeChange(val) { handleSizeChange(val) {
this.PageCurrent = 1 this.PageCurrent = 1
@@ -1102,11 +1075,6 @@ export default {
}, },
handleEdit1(row) { handleEdit1(row) {
this.addForm('form3') this.addForm('form3')
// let sum = 0
// this.tableData2.map(item => {
// sum += parseFloat(item.本次付款)
// })
// this.max1 = this.contractTotal - (sum - row.本次付款)
this.title = '记录阶段收款' this.title = '记录阶段收款'
this.max1 = parseFloat(row.应收金额) - parseFloat(row.已收金额) this.max1 = parseFloat(row.应收金额) - parseFloat(row.已收金额)
this.dialogFormVisible3 = true this.dialogFormVisible3 = true

37
src/views/Outsourcing/OutsourcingDataMaintenance/index.vue
View File

@@ -22,6 +22,7 @@
:data="tableData3" :data="tableData3"
border border
stripe stripe
size="small"
tooltip-effect="dark" tooltip-effect="dark"
style="width: 100%;" style="width: 100%;"
height="650"> height="650">
@@ -43,30 +44,31 @@
<template slot-scope="scope">{{ scope.row.工艺名称简称 }}</template> <template slot-scope="scope">{{ scope.row.工艺名称简称 }}</template>
</el-table-column> </el-table-column>
<el-table-column label="计算方式" width="100" align="center">
<template slot-scope="scope">
<el-tag v-if="parseInt(scope.row.外协价格计算标准流水号)===1" type="success" size="small">工时</el-tag>
<el-tag v-if="parseInt(scope.row.外协价格计算标准流水号)===2" type="success" size="small">重量</el-tag>
<el-tag v-if="parseInt(scope.row.外协价格计算标准流水号)===3" type="success" size="small">面积</el-tag>
</template>
</el-table-column>
<el-table-column align="center" label="工时价格(元/分)"> <el-table-column align="center" label="工时价格(元/分)">
<template slot-scope="scope"> <template slot-scope="scope">
<div :class="colorCode1[scope.$index]"> {{ scope.row.外协价格1 }}
<h4>{{ scope.row.外协价格1 }}</h4>
</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="重量价格(元/kg)"> <el-table-column align="center" label="重量价格(元/kg)">
<template slot-scope="scope"> <template slot-scope="scope">
<div :class="colorCode2[scope.$index]"> {{ scope.row.重量价格1 }}
<h4>{{ scope.row.重量价格1 }}</h4>
</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="面积价格(元/m2)"> <el-table-column align="center" label="面积价格(元/m2)">
<template slot-scope="scope"> <template slot-scope="scope">
<div :class="colorCode3[scope.$index]"> {{ scope.row.面积价格1 }}
<h4>{{ scope.row.面积价格1 }}</h4>
</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" width="130px" align="center"> <el-table-column label="操作" width="130px" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
@@ -227,21 +229,6 @@ export default {
getTable(this.Code_Check, this.Code, this.Code_Check1, this.processClassificationValue, this.pageList, this.pageSize).then(response => { getTable(this.Code_Check, this.Code, this.Code_Check1, this.processClassificationValue, this.pageList, this.pageSize).then(response => {
this.total = parseInt(response.data.total) this.total = parseInt(response.data.total)
if (response.data.rows.length !== 0) { if (response.data.rows.length !== 0) {
for (let i = 0; i < response.data.rows.length; i++) {
if (response.data.rows[i].外协价格计算标准流水号 === '1') {
this.colorCode1.push('mianji')
this.colorCode2.push('')
this.colorCode3.push('')
} else if (response.data.rows[i].外协价格计算标准流水号 === '2') {
this.colorCode1.push('')
this.colorCode2.push('mianji')
this.colorCode3.push('')
} else {
this.colorCode1.push('')
this.colorCode2.push('')
this.colorCode3.push('mianji')
}
}
this.tableData3 = response.data.rows this.tableData3 = response.data.rows
} }
}) })

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

@@ -56,12 +56,18 @@
</el-card> </el-card>
<el-card> <el-card>
<el-table v-loading="loading" :data="tableData" :row-class-name="tableRowClassName" height="580" style="width: 100%;" border element-loading-text="拼命加载中" @row-click="getParts"> <el-table v-loading="loading" :data="tableData" height="580" style="width: 100%;" border element-loading-text="拼命加载中" @row-click="getParts">
<el-table-column <el-table-column
label=" " label=" "
type="index" type="index"
align="center" align="center"
width="50"/> width="50"/>
<el-table-column label="付款状态" width="100" align="center">
<template slot-scope="scope">
<el-tag v-if="scope.row.实际付款时间!==''" type="success" size="small">已付款</el-tag>
<el-tag v-else type="info" size="small">未付款</el-tag>
</template>
</el-table-column>
<el-table-column label="表单号" align="center" width="280px"> <el-table-column label="表单号" align="center" width="280px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.表单号 }} {{ scope.row.表单号 }}
@@ -425,14 +431,6 @@ export default {
this.dialogFormVisible2 = false this.dialogFormVisible2 = false
this.$refs[formName].resetFields() this.$refs[formName].resetFields()
}, },
// 表格颜色
tableRowClassName({ row }) {
if (row.实际付款时间 !== '') {
return 'fukuan'
} else {
return ''
}
},
// 获取表格2数据 // 获取表格2数据
getParts(row) { getParts(row) {
this.loading2 = true this.loading2 = true

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

@@ -19,7 +19,13 @@
</el-card> </el-card>
<el-card> <el-card>
<el-table v-loading="loading2" :data="List" :row-class-name="tableRowClassName2" highlight-current-row height="350" border @row-click="searchProcess" > <el-table v-loading="loading2" :data="List" highlight-current-row height="350" border @row-click="searchProcess" >
<el-table-column label="单据状态" width="100" align="center">
<template slot-scope="scope">
<el-tag v-if="scope.row.单据状态==='成交'" type="success" size="small">成交</el-tag>
<el-tag v-else type="info" size="small">未成交</el-tag>
</template>
</el-table-column>
<el-table-column label="表单号" align="center" min-width="200px"> <el-table-column label="表单号" align="center" min-width="200px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.表单号 }} {{ scope.row.表单号 }}
@@ -1542,14 +1548,6 @@ export default {
return '' return ''
} }
}, },
// 表格颜色
tableRowClassName2({ row }) {
if (row.单据状态 === '成交') {
return 'chengjiao'
} else {
return ''
}
},
// 分页 // 分页
handleSizeChange(val) { handleSizeChange(val) {
this.pageList = 1 this.pageList = 1

20
src/views/Outsourcing/PreorderAssociation/index.vue
View File

@@ -16,11 +16,9 @@
align="center" align="center"
width="50"/> width="50"/>
<el-table-column label="零件图号" align="center" width="380px"> <el-table-column label="零件图号" align="center" width="380px">
<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="320px"> <el-table-column label="零件名称" align="center" width="320px">
<template slot-scope="scope"> <template slot-scope="scope">
@@ -57,19 +55,23 @@
</el-card> </el-card>
<el-card> <el-card>
<el-table v-loading="loading2" :data="tableData2" :row-class-name="tableRowClassName" height="350" style="width: 100%;" border element-loading-text="拼命加载中"> <el-table v-loading="loading2" :data="tableData2" height="350" style="width: 100%;" border element-loading-text="拼命加载中">
<el-table-column <el-table-column
label=" " label=" "
type="index" type="index"
align="center" align="center"
width="50"/> width="50"/>
<el-table-column label="序间外协" width="100" align="center"> <el-table-column label="序间外协" width="100" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-checkbox v-model="checkBox[scope.$index]" @change="edit(scope.$index, scope.row)">选择</el-checkbox> <el-checkbox v-model="checkBox[scope.$index]" @change="edit(scope.$index, scope.row)">选择</el-checkbox>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="外协状态" width="100" align="center">
<template slot-scope="scope">
<el-tag v-if="parseInt(scope.row.工序间是否外协)===2" type="success" size="small">外协</el-tag>
<el-tag v-else size="small">自制</el-tag>
</template>
</el-table-column>
<el-table-column label="工艺名称" align="center" width="220px"> <el-table-column label="工艺名称" align="center" width="220px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.工艺名称 }} {{ scope.row.工艺名称 }}
@@ -252,14 +254,6 @@ export default {
handleCurrentChange1(val) { handleCurrentChange1(val) {
this.pageCurrent1 = val this.pageCurrent1 = val
this.searchTable() this.searchTable()
},
// 表格颜色
tableRowClassName({ row }) {
if (row.工序间是否外协 === 2) {
return 'waixie'
} else {
return ''
}
} }
} }
} }