领料和综合查询都添加实施单位,合同主体单位字段
This commit is contained in:
parent
02be6c3969
commit
ee1454ef55
|
|
@ -263,7 +263,7 @@
|
|||
>
|
||||
<template slot-scope="scope">
|
||||
<el-button size="mini" type="danger"
|
||||
@click="handleDelete({ ...scope.row, index: scope.$index })">删除</el-button>
|
||||
@click="handleDelete(scope.row,scope.$index)">删除</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
|
|
@ -772,19 +772,18 @@ export default {
|
|||
|
||||
/** 删除按钮操作 */
|
||||
handleDelete(row,index) {
|
||||
this.$modal
|
||||
.confirm('是否确认删除所选择的数据项?')
|
||||
.then(() => {
|
||||
this.deviceType.forEach((e, index) => {
|
||||
this.$modal.confirm('是否确认删除所选择的数据项?').then(() => {
|
||||
this.deviceType.forEach((e, i) => {
|
||||
if (e[3] === row.typeId) {
|
||||
this.deviceType.splice(index, 1)
|
||||
this.deviceType.splice(i, 1)
|
||||
this.propsKey++
|
||||
}
|
||||
})
|
||||
this.equipmentList.splice(index+1, 1)
|
||||
|
||||
})
|
||||
.catch(() => {})
|
||||
})
|
||||
console.log(index)
|
||||
// let index = this.equipmentList.findIndex(item=>item.typeId==row.typeId)
|
||||
this.equipmentList.splice(index, 1)
|
||||
}).catch(() => {})
|
||||
|
||||
// this.equipmentList.splice(row.index, 1)
|
||||
},
|
||||
|
||||
|
|
|
|||
|
|
@ -10,6 +10,9 @@
|
|||
>
|
||||
<div id="printcontent" style="height: 600px;overflow-y: scroll;padding: 0 20px;">
|
||||
<vue-easy-print tableShow ref="printRef">
|
||||
<div style="text-align: center;font-weight: 600;font-size: 16px;">
|
||||
机具设备退料单
|
||||
</div>
|
||||
<div class="order_box">
|
||||
<div class="order_box_one">
|
||||
<div>
|
||||
|
|
|
|||
|
|
@ -114,7 +114,7 @@
|
|||
|
||||
<el-table
|
||||
v-loading="loading"
|
||||
:data="typeList"
|
||||
:data="typeList" border
|
||||
@selection-change="handleSelectionChange"
|
||||
>
|
||||
<!-- <el-table-column type="selection" width="55" align="center" /> -->
|
||||
|
|
|
|||
|
|
@ -132,6 +132,20 @@
|
|||
prop="createBy"
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
<el-table-column
|
||||
label="实施单位"
|
||||
align="center"
|
||||
prop="impUnitName"
|
||||
width="150px"
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
<el-table-column
|
||||
label="合同主体单位"
|
||||
align="center"
|
||||
prop="contractPart"
|
||||
width="150px"
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
<el-table-column
|
||||
label="租赁单位"
|
||||
align="center"
|
||||
|
|
@ -146,13 +160,13 @@
|
|||
width="150px"
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
<el-table-column
|
||||
<!-- <el-table-column
|
||||
label="领料物资类型"
|
||||
align="center"
|
||||
prop="maTypeNames"
|
||||
width="110px"
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
/> -->
|
||||
<el-table-column
|
||||
label="协议号"
|
||||
align="center"
|
||||
|
|
@ -176,13 +190,13 @@
|
|||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
|
||||
<el-table-column
|
||||
<!-- <el-table-column
|
||||
label="领料人电话"
|
||||
align="center"
|
||||
prop="phone"
|
||||
width="120px"
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
/> -->
|
||||
<el-table-column
|
||||
label="状态"
|
||||
align="center"
|
||||
|
|
@ -204,7 +218,7 @@
|
|||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
|
||||
<el-table-column label="操作" align="center" width="300">
|
||||
<el-table-column label="操作" align="center" width="300" fixed="right">
|
||||
<template slot-scope="scope">
|
||||
<el-button
|
||||
size="mini"
|
||||
|
|
|
|||
|
|
@ -93,6 +93,20 @@
|
|||
prop="createBy"
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
<el-table-column
|
||||
label="实施单位"
|
||||
align="center"
|
||||
prop="impUnitName"
|
||||
width="150px"
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
<el-table-column
|
||||
label="合同主体单位"
|
||||
align="center"
|
||||
prop="contractPart"
|
||||
width="150px"
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
<el-table-column
|
||||
label="租赁单位"
|
||||
align="center"
|
||||
|
|
@ -105,13 +119,13 @@
|
|||
prop="leaseProject"
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
<el-table-column
|
||||
<!-- <el-table-column
|
||||
label="领料物资类型"
|
||||
align="center"
|
||||
prop="leaseType"
|
||||
width="110px"
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
/> -->
|
||||
<el-table-column
|
||||
label="协议号"
|
||||
align="center"
|
||||
|
|
@ -134,13 +148,13 @@
|
|||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
|
||||
<el-table-column
|
||||
<!-- <el-table-column
|
||||
label="领料人电话"
|
||||
align="center"
|
||||
prop="phone"
|
||||
width="120px"
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
/> -->
|
||||
|
||||
<el-table-column
|
||||
label="操作时间"
|
||||
|
|
|
|||
|
|
@ -83,6 +83,20 @@
|
|||
prop="createBy"
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
<el-table-column
|
||||
label="实施单位"
|
||||
align="center"
|
||||
prop="impUnitName"
|
||||
width="150px"
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
<el-table-column
|
||||
label="合同主体单位"
|
||||
align="center"
|
||||
prop="contractPart"
|
||||
width="150px"
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
<el-table-column
|
||||
label="租赁单位"
|
||||
align="center"
|
||||
|
|
@ -97,13 +111,13 @@
|
|||
width="150px"
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
<el-table-column
|
||||
<!-- <el-table-column
|
||||
label="领料物资类型"
|
||||
align="center"
|
||||
prop="maTypeNames"
|
||||
width="110px"
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
/> -->
|
||||
<el-table-column
|
||||
label="协议号"
|
||||
align="center"
|
||||
|
|
@ -145,18 +159,18 @@
|
|||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
|
||||
<el-table-column
|
||||
<!-- <el-table-column
|
||||
label="领料人电话"
|
||||
align="center"
|
||||
prop="phone"
|
||||
width="120px"
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
/> -->
|
||||
|
||||
<el-table-column
|
||||
label="状态"
|
||||
align="center"
|
||||
prop="taskStatus"
|
||||
prop="taskStatus" width="120px"
|
||||
:show-overflow-tooltip="true"
|
||||
>
|
||||
<template slot-scope="scope">
|
||||
|
|
@ -174,7 +188,7 @@
|
|||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
|
||||
<el-table-column label="操作" align="center" width="270">
|
||||
<el-table-column label="操作" align="center" width="270" fixed="right">
|
||||
<template slot-scope="scope">
|
||||
<el-button
|
||||
size="mini"
|
||||
|
|
|
|||
|
|
@ -72,7 +72,7 @@
|
|||
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
|
||||
</el-row>
|
||||
|
||||
<el-table v-loading="loading" :data="tableList" @selection-change="handleSelectionChange" >
|
||||
<el-table v-loading="loading" :data="tableList" border @selection-change="handleSelectionChange" >
|
||||
<el-table-column type="selection" width="55" align="center" :selectable="selectable"/>
|
||||
<el-table-column label="序号" align="center" width="80" type="index">
|
||||
<template slot-scope="scope">
|
||||
|
|
|
|||
|
|
@ -84,7 +84,7 @@
|
|||
></right-toolbar>
|
||||
</el-row>
|
||||
|
||||
<el-table v-loading="loading" :data="testedList" ref="multipleTable" row-key="taskId" @selection-change="handleSelectionChange">
|
||||
<el-table v-loading="loading" :data="testedList" border ref="multipleTable" row-key="taskId" @selection-change="handleSelectionChange">
|
||||
<el-table-column type="selection" width="55" align="center" :selectable="selectable"/>
|
||||
<el-table-column label="序号" align="center" width="80" type="index">
|
||||
<template slot-scope="scope">
|
||||
|
|
|
|||
|
|
@ -124,6 +124,8 @@
|
|||
<el-table-column label="工程名称" align="center" prop="proName" :show-overflow-tooltip="true"/>
|
||||
<el-table-column label="往来单位" align="center" prop="unitName" :show-overflow-tooltip="true"/>
|
||||
<el-table-column label="协议号" align="center" prop="agreementCode" :show-overflow-tooltip="true"/>
|
||||
<el-table-column label="实施单位" align="center" prop="impUnitName" width="150px" :show-overflow-tooltip="true"/>
|
||||
<el-table-column label="合同主体单位" align="center" prop="contractPart" width="150px" :show-overflow-tooltip="true"/>
|
||||
<el-table-column label="物资名称" align="center" prop="typeName" :show-overflow-tooltip="true"/>
|
||||
<el-table-column label="规格型号" align="center" prop="typeModelName" :show-overflow-tooltip="true"/>
|
||||
<el-table-column label="设备编码" align="center" prop="maCode" :show-overflow-tooltip="true"/>
|
||||
|
|
|
|||
|
|
@ -118,6 +118,8 @@
|
|||
<el-table-column label="协议号" align="center" prop="agreementCode" :show-overflow-tooltip="true"/>
|
||||
<el-table-column label="工程名称" align="center" prop="proName" :show-overflow-tooltip="true"/>
|
||||
<el-table-column label="往来单位" align="center" prop="unitName" :show-overflow-tooltip="true"/>
|
||||
<el-table-column label="实施单位" align="center" prop="impUnitName" width="150px" :show-overflow-tooltip="true"/>
|
||||
<el-table-column label="合同主体单位" align="center" prop="contractPart" width="150px" :show-overflow-tooltip="true"/>
|
||||
<el-table-column label="物资名称" align="center" prop="typeName" :show-overflow-tooltip="true"/>
|
||||
<el-table-column label="规格型号" align="center" prop="typeModelName" :show-overflow-tooltip="true"/>
|
||||
<el-table-column label="计量单位" align="center" prop="unit" :show-overflow-tooltip="true"/>
|
||||
|
|
|
|||
Loading…
Reference in New Issue