diff --git a/sgzb-ui/src/views/claimAndRefund/receive/receiveApplyAdd.vue b/sgzb-ui/src/views/claimAndRefund/receive/receiveApplyAdd.vue
index 4d7e3668..e2e4e195 100644
--- a/sgzb-ui/src/views/claimAndRefund/receive/receiveApplyAdd.vue
+++ b/sgzb-ui/src/views/claimAndRefund/receive/receiveApplyAdd.vue
@@ -549,6 +549,10 @@ export default {
return
}
this.queryParams.leaseApplyDetails.forEach(item=>{
+ if(item.num==0){
+ this.$message.error('机具类型库存量为零无法领料');
+ return
+ }
if(item.preNum==''){
this.$message.error('请填写预领数量');
return
@@ -602,8 +606,11 @@ export default {
},
checkNum(row){
+ let maxNum = row.num
if(row.preNum<=1){
row.preNum = 1
+ }else if(row.preNum>=maxNum){
+ row.preNum = maxNum
}
},
/////// 设备类型树 切换
diff --git a/sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveApplyAddByCq.vue b/sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveApplyAddByCq.vue
index a7c3894d..dfd1af0b 100644
--- a/sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveApplyAddByCq.vue
+++ b/sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveApplyAddByCq.vue
@@ -123,7 +123,7 @@
-
+
{
+ if(item.num==0){
+ this.$message.error('机具类型库存量为零无法领料');
+ canSave = false
+ return
+ }
if(item.preNum==''){
+ canSave = false
this.$message.error('请填写预领数量');
return
}
})
+ if(!canSave){return false}
this.queryParams.createBy = this.user.userName
this.queryParams.companyId = this.user.companyId
let res;
@@ -635,8 +643,11 @@ export default {
},
checkNum(row){
+ let maxNum = row.num
if(row.preNum<=1){
row.preNum = 1
+ }else if(row.preNum>=maxNum){
+ row.preNum = maxNum
}
},
/////// 设备类型树 切换
diff --git a/sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveExamineByCq.vue b/sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveExamineByCq.vue
index d99a4f02..71455a61 100644
--- a/sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveExamineByCq.vue
+++ b/sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveExamineByCq.vue
@@ -169,13 +169,13 @@ export default {
// },
{
id:31,
- name:'分管部门审核',
+ name:'机具分公司审核',
remarkKey:'deptAuditRemark',
authorKey:'deptAuditBy',
timeKey:'deptAuditTime'
},{
id:32,
- name:'施工管理部审核',
+ name:'施工部审核',
remarkKey:'directAuditRemark',
authorKey:'directAuditBy',
timeKey:'directAuditTime'
diff --git a/sgzb-ui/src/views/claimAndRefund/return/returnApply.vue b/sgzb-ui/src/views/claimAndRefund/return/returnApply.vue
index 2bb6da18..231480e8 100644
--- a/sgzb-ui/src/views/claimAndRefund/return/returnApply.vue
+++ b/sgzb-ui/src/views/claimAndRefund/return/returnApply.vue
@@ -442,12 +442,12 @@
prop="typeCode"
:show-overflow-tooltip="true"
/>
-
+ /> -->
{
console.log(res)
this.loadingList = res.data.rows
+ this.loadingList.forEach(item=>{
+ getUseNumByTypeId({ typeId:item.typeId }).then(res=>{
+ item.useNum = res.data
+ })
+
+ })
this.loadingTotal = res.data.total
})
},
diff --git a/sgzb-ui/src/views/claimAndRefund/return/returnApplyAdd.vue b/sgzb-ui/src/views/claimAndRefund/return/returnApplyAdd.vue
index 56a2a6e5..4522cd20 100644
--- a/sgzb-ui/src/views/claimAndRefund/return/returnApplyAdd.vue
+++ b/sgzb-ui/src/views/claimAndRefund/return/returnApplyAdd.vue
@@ -140,7 +140,7 @@
:data="leaseApplyDetails"
@selection-change="handleSelectionChange"
>
-
+
=maxNum){
+ row.num = maxNum
}
},
@@ -774,7 +788,6 @@ export default {
if (nodes[0].level != 4) {
return
}
-
this.leaseApplyDetails.push(
this.handelTableItemData(nodes[0])
)
diff --git a/sgzb-ui/src/views/claimAndRefund/return/returnApplyAddByCq.vue b/sgzb-ui/src/views/claimAndRefund/return/returnApplyAddByCq.vue
index 07897bc9..8e7a2d42 100644
--- a/sgzb-ui/src/views/claimAndRefund/return/returnApplyAddByCq.vue
+++ b/sgzb-ui/src/views/claimAndRefund/return/returnApplyAddByCq.vue
@@ -758,8 +758,11 @@ export default {
},
checkNum(row){
+ let maxNum = row.useNum
if(row.num<=1){
row.num = 1
+ }else if(row.num>=maxNum){
+ row.num = maxNum
}
},
diff --git a/sgzb-ui/src/views/claimAndRefund/return/returnApplyByCq.vue b/sgzb-ui/src/views/claimAndRefund/return/returnApplyByCq.vue
index 5413528e..c017f0e4 100644
--- a/sgzb-ui/src/views/claimAndRefund/return/returnApplyByCq.vue
+++ b/sgzb-ui/src/views/claimAndRefund/return/returnApplyByCq.vue
@@ -448,12 +448,12 @@
prop="typeCode"
:show-overflow-tooltip="true"
/>
-
+ /> -->
{
// console.log(res)
this.loadingList = res.data.rows
+ this.loadingList.forEach(item=>{
+ getUseNumByTypeId({ typeId:item.typeId }).then(res=>{
+ item.useNum = res.data
+ })
+
+ })
this.loadingTotal = res.data.total
})
},
diff --git a/sgzb-ui/src/views/claimAndRefund/return/returnExamine.vue b/sgzb-ui/src/views/claimAndRefund/return/returnExamine.vue
index 92ed1eb9..66ed72d0 100644
--- a/sgzb-ui/src/views/claimAndRefund/return/returnExamine.vue
+++ b/sgzb-ui/src/views/claimAndRefund/return/returnExamine.vue
@@ -857,8 +857,11 @@
}
},
checkNum(row){
+ const maxNum = row.num;
if(row.num<=1){
- row.num = 1
+ row.num = 1;
+ }else if(row.num>=maxNum){
+ row.num = maxNum;
}
},
handleExam() {
diff --git a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesCode.vue b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesCode.vue
index c8e2aca9..f568c133 100644
--- a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesCode.vue
+++ b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesCode.vue
@@ -79,12 +79,6 @@
v-if="scope.row.bindNum绑定编码
-
@@ -413,9 +407,11 @@ export default {
/** 提交按钮 */
submitForm: function() {
// console.log(this.codeList)
- if(this.hasDuplicateField(this.codeList, 'assetsCode')){
- this.$modal.msgError("固定资产编码绑定失败,存在重复编码，请重新输入");
- return false
+ if(this.form.fixCode==0){
+ if(this.hasDuplicateField(this.codeList, 'assetsCode')){
+ this.$modal.msgError("固定资产编码绑定失败,存在重复编码，请重新输入");
+ return false
+ }
}
if(this.codeList.length==0){
this.$modal.msgError("无新增编码绑定");
@@ -475,29 +471,9 @@ export default {
const obj = { path: "/store/newBuy/newDevicesList" }
this.$tab.closeOpenPage(obj);
},
- /** 删除按钮操作 */
- handleDelete(row) {
- const dictIds = row.maId ;
- this.$modal.confirm('是否确认删除该数据项？').then(function() {
- return delMacode(dictIds);
- }).then(() => {
- this.getList();
- this.$modal.msgSuccess("删除成功");
- }).catch(() => {});
- },
- /** 导出按钮操作 */
- handleExport() {
- this.download('system/dict/type/export', {
- ...this.queryParams
- }, `type_${new Date().getTime()}.xlsx`)
- },
- /** 刷新缓存按钮操作 */
- handleRefreshCache() {
- refreshCache().then(() => {
- this.$modal.msgSuccess("刷新成功");
- this.$store.dispatch('dict/cleanDict');
- });
- }
+
+
+
}
};