bonus
/
bonus-ui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

领料退料

This commit is contained in:
bb_pan 2025-05-13 11:02:30 +08:00
parent 33d102ded2
commit 304038a788
6 changed files with 421 additions and 518 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/views/material/back/component/addReturn.vue
View File

@ -10,7 +10,7 @@
label-width="100px"
>
<el-row>
<el-form-item label="退料单位" prop="unitId">
<el-form-item label="退料班组" prop="unitId">
<treeselect
v-model="queryParams.unitId"
:disabled="backId != ''"
@ -91,7 +91,7 @@
<span style="color: red">*</span>
<span style="font-size: 14px; font-weight: 600; color: #606266">物品类型</span>
</el-col>
<el-col :span="6">
<el-col :span="7">
<el-select
ref="typeSelect"
v-model="tempDeviceType"
@ -1463,4 +1463,8 @@ export default {
}
}
}
.el-upload-list__item-thumbnail {
height: 145px !important;
}
</style>

3
src/views/material/back/component/home.vue
View File

@ -133,7 +133,8 @@
v-if="scope.row.taskStatus!=2&&scope.row.taskStatus!=1" @click="handleUpdate(scope.row)"
>编辑</el-button>
<el-button size="mini" type="success" plain icon="el-icon-refresh"
v-if="scope.row.taskStatus!=2&&scope.row.taskStatus!=1" @click="handleSubmit(scope.row)"
v-show="scope.row.taskStatus!=2&&scope.row.taskStatus!=1" @click="handleSubmit(scope.row)"
v-hasPermi="['back:info:submit']"
>提交</el-button>
<el-button size="mini" type="danger" icon="el-icon-delete"
v-if="scope.row.taskStatus!=2&&scope.row.taskStatus!=1"

62
src/views/material/equipment/equipmentRecord/index.vue
View File

@ -252,55 +252,6 @@ export default {
},
useRecordList: [], //在用设备列表
dialogUserTotal: 0,
//在修弹窗
openRepairRecord: false,
dialogRepairQuery: {
pageNum: 1,
pageSize: 10,
keyWord: undefined
},
repairRecordList: [], //在修设备列表
dialogRepairTotal: 0,
//新购待入库弹窗
openPurchaseRecord: false,
dialogPurchaseQuery: {
pageNum: 1,
pageSize: 10,
keyWord: undefined
},
purchaseRecordList: [], //新购待入库设备列表
dialogPurchaseTotal: 0,
//修试待入库弹窗
openTestedRecord: false,
dialogTestedQuery: {
pageNum: 1,
pageSize: 10,
keyWord: undefined
},
testedRecordList: [], //修试待入库设备列表
dialogTestedTotal: 0,
//待报废弹窗
openToScrapRecord: false,
dialogToScrapQuery: {
pageNum: 1,
pageSize: 10,
keyWord: undefined
},
toScrapRecordList: [], //待报废设备列表
dialogToScrapTotal: 0,
//已审核弹窗
openAuditedRecord: false,
dialogAuditedQuery: {
pageNum: 1,
pageSize: 10,
keyWord: undefined
},
auditedRecordList: [], //已审核设备列表
dialogAuditedTotal: 0
}
},
created() {
@ -399,19 +350,6 @@ export default {
`综合查询_保有设备总量_${new Date().getTime()}.xlsx`
)
},
//跳转维修
jumpRepair(code) {
this.$router.push({ path: '/repair/repairManage', query: { code: code } })
},
// 跳转新购待入库
jumpInput(code) {
this.$router.push({ path: '/purchase/goodsEntry', query: { code: code } })
},
// 跳转修试后入库
jumpRepairInput(code) {
this.$router.push({ path: '/repair/testedInBound', query: { code: code } })
},
// ------------------
//查看在库编码数据
openRecords(row) {
this.openRecord = true

816
src/views/material/lease/apply/component/addToolsApply.vue
View File

File diff suppressed because it is too large Load Diff

24
src/views/material/lease/apply/component/homeApply.vue
View File

@ -67,16 +67,6 @@
>领料申请
</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="success"
plain
icon="el-icon-plus"
size="mini"
@click="handleSendAll"
>发布
</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
@ -102,13 +92,15 @@
</el-table-column>
<el-table-column label="申请时间" align="center" prop="createTime" width="160" :show-overflow-tooltip="true"/>
<el-table-column label="申请人" align="center" prop="createBy" width="100" :show-overflow-tooltip="true"/>
<el-table-column label="实施单位" align="center" prop="impUnitName" width="120px" :show-overflow-tooltip="true"/>
<el-table-column label="领料班组" align="center" prop="departName" width="100" :show-overflow-tooltip="true"/>
<!-- <el-table-column label="实施单位" align="center" prop="impUnitName" width="120px" :show-overflow-tooltip="true"/>
<el-table-column label="合同主体" align="center" prop="contractPart" width="120px" :show-overflow-tooltip="true"/>
<el-table-column label="租赁单位" align="center" prop="leaseUnit" width="150px" :show-overflow-tooltip="true"/>
<el-table-column label="租赁单位" align="center" prop="leaseUnit" width="150px" :show-overflow-tooltip="true"/> -->
<el-table-column label="租赁工程" align="center" prop="leaseProject" width="150px" :show-overflow-tooltip="true"/>
<!-- <el-table-column label="领料物资类型" align="center" prop="maTypeNames" width="110px" :show-overflow-tooltip="true"/> -->
<el-table-column label="协议号" align="center" prop="agreementCode" width="140" :show-overflow-tooltip="true"/>
<el-table-column label="租赁申请单号" align="center" prop="code" width="140px" :show-overflow-tooltip="true"></el-table-column>
<!-- <el-table-column label="协议号" align="center" prop="agreementCode" width="140" :show-overflow-tooltip="true"/> -->
<!-- <el-table-column label="租赁申请单号" align="center" prop="code" width="140px" :show-overflow-tooltip="true"></el-table-column> -->
<el-table-column label="领料工器具类型" align="center" prop="leaseType" width="140px" :show-overflow-tooltip="true"></el-table-column>
<el-table-column label="领料人" align="center" prop="leasePerson" :show-overflow-tooltip="true"/>
<!-- <el-table-column label="领料人电话" align="center" prop="phone" width="120px" :show-overflow-tooltip="true"/> -->
<el-table-column label="状态" align="center" prop="taskStatus" :show-overflow-tooltip="true" width="150">
@ -125,9 +117,9 @@
<el-button size="mini" style="margin-bottom: 10px" type="primary"
@click="handleUpdate(scope.row)" v-if="scope.row.taskStatus != 4" v-hasPermi="['purchase:info:edit']"
>编辑</el-button>
<el-button size="mini" style="margin-bottom: 10px" type="success"
<!-- <el-button size="mini" style="margin-bottom: 10px" type="success"
@click="handleSend(scope.row)" v-if="scope.row.taskStatus == 1" v-hasPermi="['purchase:person:notice']"
>发布</el-button>
>发布</el-button> -->
<el-button size="mini" type="warning"
v-if="scope.row.taskStatus != 1" @click="handleLld(scope.row)"
>领料单</el-button>

26
src/views/material/lease/outBound/index.vue
View File

@ -65,26 +65,26 @@
<el-table-column align="center" width="100" label="申请时间" prop="createTime" />
<el-table-column label="申请人" width="100" align="center" prop="createBy" :show-overflow-tooltip="true" />
<el-table-column
label="实施单位"
label="领料班组"
align="center"
prop="impUnitName"
width="150px"
:show-overflow-tooltip="true"
/>
<el-table-column
<!-- <el-table-column
label="合同主体"
align="center"
prop="contractPart"
width="150px"
:show-overflow-tooltip="true"
/>
<el-table-column
/> -->
<!-- <el-table-column
label="租赁单位"
align="center"
prop="leaseUnit"
width="150px"
:show-overflow-tooltip="true"
/>
/> -->
<el-table-column
label="租赁工程"
align="center"
@ -92,14 +92,14 @@
width="150px"
:show-overflow-tooltip="true"
/>
<!-- <el-table-column
label="领料物资类型"
align="center"
prop="maTypeNames"
width="110px"
:show-overflow-tooltip="true"
/> -->
<el-table-column
label="领料工器具类型"
align="center"
prop="maTypeNames"
width="250px"
:show-overflow-tooltip="true"
/>
<!-- <el-table-column
label="协议号"
align="center"
prop="agreementCode"
@ -128,7 +128,7 @@
prop="alNum"
width="90px"
:show-overflow-tooltip="true"
></el-table-column>
></el-table-column> -->
<el-table-column label="领料人" align="center" prop="leasePerson" :show-overflow-tooltip="true" />