From 6ffbd44cf50ff47b1a023408e5820586a1a3ef65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com>
Date: Tue, 18 Apr 2023 16:06:38 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E7=B1=BB=E5=9E=8B=E7=95=8C?=
=?UTF-8?q?=E9=9D=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/basic/busOriginType.js | 9 ++
src/views/basic/busType/bussinessType.vue | 24 ++-
.../basic/busType/bussinessTypeModify.vue | 140 ++++++++++++++----
3 files changed, 138 insertions(+), 35 deletions(-)
diff --git a/src/api/basic/busOriginType.js b/src/api/basic/busOriginType.js
index fc7fdd2..9976638 100644
--- a/src/api/basic/busOriginType.js
+++ b/src/api/basic/busOriginType.js
@@ -44,3 +44,12 @@ export function getOriginJoinBusType(query) {
params: query
});
}
+
+export function selectList(query) {
+ return axios({
+ url: "/udiwms/busType/selectList",
+ method: "get",
+ params: query
+ });
+}
+
diff --git a/src/views/basic/busType/bussinessType.vue b/src/views/basic/busType/bussinessType.vue
index 7c776a2..0799129 100644
--- a/src/views/basic/busType/bussinessType.vue
+++ b/src/views/basic/busType/bussinessType.vue
@@ -226,7 +226,7 @@ export default {
originAction: null,
checkBalance: null,
secCheckBalance: null,
- preInBack: true,
+ preInBack: false,
vailDispatch: false,
vailGroupBuy: 0,
inStock: false,
@@ -243,7 +243,8 @@ export default {
thrCheckChange: null,
thrCheckBalance: null,
thrCheckCopy: null,
- checkVailDate: false, //校验近效期
+ advancePreIn:false,
+ checkVailDate: 0, //校验近效期
checkExpire: true, //校验过期
checkCertExpire: false, //校验证书过期
@@ -338,6 +339,18 @@ export default {
this.$message.error("请选择是否更改库存！");
return;
}
+
+ if(this.inputQuery.preInBack==1){
+ if(isBlank(this.inputQuery.backPreinType)){
+ this.$message.error("请选择预验收剩余库存退库方式！");
+ return;
+ }
+ if(isBlank(this.inputQuery.preInBackAction)){
+ this.$message.error("请选择预验收退库单据类型！");
+ return;
+ }
+
+ }
// if (isBlank(this.inputQuery.busType)) {
// this.$message.error("请选择特定页面！");
// return;
@@ -472,7 +485,7 @@ export default {
advanceType: null,
preIn: null,
originAction: null,
- preInBack: true,
+ preInBack: false,
vailDispatch: false,
vailGroupBuy: 0,
inStock: false,
@@ -488,10 +501,11 @@ export default {
thrCheckChange: null,
thrCheckBalance: null,
thrCheckCopy: null,
-
- checkVailDate: false, //校验近效期
+ advancePreIn:false,
+ checkVailDate: 0, //校验近效期
checkExpire: true, //校验过期
checkCertExpire: false, //校验证书过期
+ backPreinType:1,
}
this.addDialogVisible = true;
},
diff --git a/src/views/basic/busType/bussinessTypeModify.vue b/src/views/basic/busType/bussinessTypeModify.vue
index 1f12f0d..ecf1371 100644
--- a/src/views/basic/busType/bussinessTypeModify.vue
+++ b/src/views/basic/busType/bussinessTypeModify.vue
@@ -154,8 +154,9 @@
-
-
+
+
+
@@ -309,29 +310,6 @@
-
-
-
- 预验收使用结束退回
-
-
-
-
-
-
-
-
-
-
- 预验收使用结束退回
-
-
-
@@ -359,7 +337,7 @@
@@ -372,6 +350,26 @@
+
+
+ 寄售使用禁止无库存出库
+
+
+
+
+
+
+
+
+
+
+ 寄售使用禁止无库存出库
+
+
+
+
是否只允许有库存产品出库
@@ -379,7 +377,7 @@
@@ -414,6 +412,69 @@
+
+
+ 预验收剩余库存自动退库
+
+
+
+
+
+
+
+
+
+
+ 预验收剩余库存自动退库
+
+
+
+
+
+ 预验收剩余库存退库方式
+
+
+
+
+
+
+
+
+
+
+ 预验收剩余库存退库方式
+
+
+
+
+
+
+ 预验收退库单据类型
+
+
+
+
+
+ {{ item.name }}
+
+
+
+
+
+ 预验收退库单据类型
+
+
+
+
@@ -1067,7 +1128,7 @@
import {candidateBusType} from '@/api/basic/busType'
import busTypeAdvancedSettings from '@/views/basic/busType/busTypeAdvancedSettings.vue'
import {isBlank} from '@/utils/strUtil'
-import {getOriginBusType} from '@/api/basic/busOriginType'
+import {getOriginBusType,selectList} from '@/api/basic/busOriginType'
import {getBasicUnitMaintains2} from '@/api/basic/basicUnitMaintain'
export default {
@@ -1114,6 +1175,7 @@ export default {
isBuType: true,
isFilterBind: true
},
+ preInBackList: [],
orderTypeList: [],
fromSpecialOptions: [],
originTypes: [],
@@ -1201,6 +1263,19 @@ export default {
},
+ selectBussinessList(){
+ selectList().then((res) => {
+ this.preInBackList=res.data;
+ })
+ },
+ getPreInBack(){
+ if(this.inputQuery.preInBack==false){
+ this.inputQuery.preInBackAction=null;
+ this.inputQuery.backPreinType='';
+ }else{
+ this.inputQuery.backPreinType=1;
+ }
+ },
//获取单据类型
getOrderType() {
this.orderTypeList = []
@@ -1281,9 +1356,14 @@ export default {
}
this.getList()
this.findSpecialMethod()
+ this.selectBussinessList()
this.oldData = Object.assign({}, this.inputQuery)
- this.inputQuery.codeFillCheck=false;
- this.inputQuery.preInBack=false;
+ debugger
+ if(this.inputQuery.id==null || this.inputQuery.id==''){
+ this.inputQuery.codeFillCheck=false;
+ this.inputQuery.preInBack=false;
+ }
+
}
}