UDI
/
udiwms-vue
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

禅道bug修改

Browse Source
fengcang
anthonyywj2 3 years ago
parent e3bf58b980
commit a192f62a36
6 changed files with 177 additions and 153 deletions
Show Stats Download Patch File Download Diff File

14
src/views/basic/BussinessTypeThird.vue
Unescape Escape View File

@ -168,7 +168,7 @@ export default {
uploadFileUrl: null, uploadFileUrl: null,
loading: false, loading: false,
thirdSysDetail: {}, thirdSysDetail: {},
configParms:{}, configParms: {},
}; };
}, },
@ -246,10 +246,20 @@ export default {
onAddSubmit() { onAddSubmit() {
if (this.$isBlank(this.inputQuery.action)) { if (this.$isBlank(this.inputQuery.action.trim())) {
this.$message.error("单据类型代码不能为空！"); this.$message.error("单据类型代码不能为空！");
return; return;
} }
if (this.$isBlank(this.inputQuery.name.trim())) {
this.$message.error("单据类型名称不能为空！");
return;
}
if (this.$isBlank(this.inputQuery.thirdSys.trim())) {
this.$message.error("第三方系统不能为空");
return;
}
insertBussinessType(this.inputQuery) insertBussinessType(this.inputQuery)
.then((response) => { .then((response) => {
this.loading = false; this.loading = false;

245
src/views/basic/BussinessTypeThirdModify.vue
Unescape Escape View File

@ -1,156 +1,159 @@
<template> <template>
<div> <div>
<el-row :gutter="20" class="el-row" type="flex"> <el-row :gutter="20" class="el-row" type="flex">
<el-col :span="10" class="el-col"> <el-col :span="10" class="el-col">
<div class="text item"> <div class="text item">
<div class="itemTag"> <div class="itemTag">
<span>单据类型名称:&nbsp;</span> <span>单据类型名称:&nbsp;</span>
</div> </div>
<el-input <el-input
style="width: 200px" style="width: 200px"
size="small" size="small"
splaceholder="请输入内容" clearable
:disabled="!isAdd" splaceholder="请输入内容"
v-model="inputQuery.name" :disabled="!isAdd"
></el-input> v-model.trim="inputQuery.name"
</div> ></el-input>
</el-col> </div>
<el-col :span="10" class="el-col"> </el-col>
<div class="text item"> <el-col :span="10" class="el-col">
<div class="itemTag"> <div class="text item">
<span>单据类型代码:&nbsp;</span> <div class="itemTag">
</div> <span>单据类型代码:&nbsp;</span>
<el-input </div>
style="width: 200px" <el-input
:disabled="!isAdd" style="width: 200px"
size="small" :disabled="!isAdd"
splaceholder="请输入内容" clearable
v-model="inputQuery.action" size="small"
></el-input> splaceholder="请输入内容"
</div> v-model.trim="inputQuery.action"
</el-col>
</el-row>
<el-row :gutter="20" class="el-row" type="flex"> ></el-input>
<el-col :span="10" class="el-col"> </div>
<div class="text item"> </el-col>
<div class="itemTag"> </el-row>
<span>第三方系统:&nbsp;</span>
</div>
<el-select v-model="inputQuery.thirdSys" placeholder="请选择" clearable="true">
<el-option
v-for="item in thirdSys"
:key="item.value"
:label="item.thirdName"
:value="item.thirdId">
<span style="float: left">{{ item.thirdName }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.thirdId }}</span>
</el-option>
</el-select>
</div>
</el-col>
<el-col :span="10" class="el-col">
<div class="text item">
<div class="itemTag">
<span>备注:&nbsp;</span>
</div>
<el-input
style="width: 200px"
size="small"
splaceholder="请输入内容"
v-model="inputQuery.remark"
></el-input>
</div>
</el-col>
</el-row>
<el-divider></el-divider> <el-row :gutter="20" class="el-row" type="flex">
</div> <el-col :span="10" class="el-col">
<div class="text item">
<div class="itemTag">
<span>第三方系统:&nbsp;</span>
</div>
<el-select v-model="inputQuery.thirdSys" placeholder="请选择" clearable="true">
<el-option
v-for="item in thirdSys"
:key="item.value"
:label="item.thirdName"
:value="item.thirdId">
<span style="float: left">{{ item.thirdName }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.thirdId }}</span>
</el-option>
</el-select>
</div>
</el-col>
<el-col :span="10" class="el-col">
<div class="text item">
<div class="itemTag">
<span>备注:&nbsp;</span>
</div>
<el-input
style="width: 200px"
size="small"
splaceholder="请输入内容"
v-model="inputQuery.remark"
></el-input>
</div>
</el-col>
</el-row>
<el-divider></el-divider>
</div>
</template> </template>
<script> <script>
import { import {
getBasicThirdSys, getBasicThirdSys,
} from "../../api/basic/basicThirdSys"; } from "../../api/basic/basicThirdSys";
import { import {
getLocalBusType, getLocalBusType,
} from "../../api/basic/busLocalType"; } from "../../api/basic/busLocalType";
export default { export default {
name: "inputQuery", name: "inputQuery",
props: { props: {
inputQuery: { inputQuery: {
type: Object, type: Object,
required: true, required: true,
},
}, },
},
data() { data() {
return { return {
filterQuery: { filterQuery: {
enabled: true, enabled: true,
isBuType: true, isBuType: true,
}, },
thirdSys: [], thirdSys: [],
localTypes: [], localTypes: [],
isAdd: false, isAdd: false,
value: "", value: "",
} }
},
methods: {
getList() {
getBasicThirdSys(this.filterQuery)
.then((response) => {
this.thirdSys = response.data.list || [];
})
.catch(() => {
this.loading = false;
this.list = [];
});
getLocalBusType(this.filterQuery)
.then((response) => {
this.localTypes = response.data.list || [];
})
.catch(() => {
this.loading = false;
this.localTypes = [];
});
}, },
methods: {
getList() {
getBasicThirdSys(this.filterQuery)
.then((response) => {
this.thirdSys = response.data.list || [];
})
.catch(() => {
this.loading = false;
this.list = [];
});
getLocalBusType(this.filterQuery)
.then((response) => {
this.localTypes = response.data.list || [];
})
.catch(() => {
this.loading = false;
this.localTypes = [];
});
},
}, },
created() { created() {
if (this.inputQuery.action == "") { if (this.inputQuery.action == "") {
this.isAdd = true; this.isAdd = true;
} }
this.getList(); this.getList();
}, },
}; };
</script> </script>
<style scoped> <style scoped>
.itemTag { .itemTag {
float: left; float: left;
text-align: left; text-align: left;
margin-top: 10px; margin-top: 10px;
width: 100px; width: 100px;
} }
.text { .text {
font-size: 13px; font-size: 13px;
font-family: "Microsoft YaHei"; font-family: "Microsoft YaHei";
} }
.el-row { .el-row {
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
margin-bottom: 20px; margin-bottom: 20px;
} }
.el-col { .el-col {
border-radius: 4px; border-radius: 4px;
flex-wrap: wrap; flex-wrap: wrap;
} }
</style> </style>

15
src/views/inout/IOAddOrder.vue
Unescape Escape View File

@ -213,11 +213,9 @@
>出入库必须校验预验收库 >出入库必须校验预验收库
</el-checkbox> </el-checkbox>
<el-checkbox v-model="formData.vailInv" <el-checkbox v-model="formData.vailInv"
:disabled="corpOrderIdDisabled"
>是否查询库存 >是否查询库存
</el-checkbox> </el-checkbox>
<el-checkbox v-model="formData.codeFillCheck" <el-checkbox v-model="formData.codeFillCheck"
:disabled="corpOrderIdDisabled"
>采集UDI码时进行三期校验 >采集UDI码时进行三期校验
</el-checkbox> </el-checkbox>
</div> </div>
@ -479,6 +477,8 @@ export default {
invWarehouseCode: null, invWarehouseCode: null,
subInvCode: null, subInvCode: null,
fromSubInvCode: null, fromSubInvCode: null,
codeFillCheck: null,
vailInv: null,
}, },
editOriginCodeVisible: false, editOriginCodeVisible: false,
@ -879,6 +879,12 @@ export default {
this.busTypes = response.data.list || []; this.busTypes = response.data.list || [];
if (this.formData.action != null) { if (this.formData.action != null) {
this.curAction = this.getActionItem(this.formData.action); this.curAction = this.getActionItem(this.formData.action);
if (this.curAction != null) {
this.formData.vailInv = this.curAction.vailInv;
this.formData.codeFillCheck = this.curAction.codeFillCheck;
}
} }
}) })
.catch(() => { .catch(() => {
@ -1018,11 +1024,6 @@ export default {
this.$set(this.formData, "outChangeEnable", this.curAction.ullageFill); this.$set(this.formData, "outChangeEnable", this.curAction.ullageFill);
this.$set(this.formData, "codeFillCheck", this.curAction.codeFillCheck); this.$set(this.formData, "codeFillCheck", this.curAction.codeFillCheck);
// this.formData.vailIn = this.curAction.vailInv;
// this.formData.preCheck = this.curAction.scanPreIn;
// this.formData.outChangeEnable = this.curAction.ullageFill;
// this.formData.codeFillCheck = this.curAction.codeFillCheck;
}, },
//绑定数据 //绑定数据

1
src/views/inout/editCode.vue
Unescape Escape View File

@ -79,6 +79,7 @@
<el-form-item prop="count"> <el-form-item prop="count">
<el-input v-model="editData.count" auto-complete="off" <el-input v-model="editData.count" auto-complete="off"
type="number" type="number"
min="1"
:disabled="editData.serialNo!=null && editData.serialNo!='' "></el-input> :disabled="editData.serialNo!=null && editData.serialNo!='' "></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>

25
src/views/thrsys/ThrInvWarehouse.vue
Unescape Escape View File

@ -19,7 +19,7 @@
</el-form-item> </el-form-item>
<el-form-item class="query-form-item"> <el-form-item class="query-form-item">
<el-select v-model="query.thirdSysFk" placeholder="请选择第三方系统" <el-select v-model="query.thirdSysFk" placeholder="请选择第三方系统"
@change="thirdSysFkChange(query.thirdSysFk)"> @change="thirdSysFkChange()">
<el-option <el-option
v-for="item in thirdSys" v-for="item in thirdSys"
:key="item.thirdId" :key="item.thirdId"
@ -182,13 +182,13 @@
<el-form-item label="仓库编码" prop="title" class="query-form-item"> <el-form-item label="仓库编码" prop="title" class="query-form-item">
<el-input <el-input
v-model="formData.code" style="width: 80%" v-model.trim="formData.code" style="width: 80%"
auto-complete="off" auto-complete="off"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="仓库名称" prop="name" class="query-form-item"> <el-form-item label="仓库名称" prop="name" class="query-form-item">
<el-input <el-input
v-model="formData.name" style="width: 80%" v-model.trim="formData.name" style="width: 80%"
auto-complete="off" auto-complete="off"
></el-input> ></el-input>
</el-form-item> </el-form-item>
@ -268,6 +268,7 @@ export default {
isDefault: null, isDefault: null,
page: 1, page: 1,
limit: 20, limit: 20,
thirdSysFk: null,
}, },
mergeList: [], mergeList: [],
node: null, node: null,
@ -275,7 +276,10 @@ export default {
children: "children", children: "children",
label: "name" label: "name"
}, },
thirdSysDetail:{}, thirdSysDetail: {
enabled: false,
fromType: 0,
},
total: 0, total: 0,
treeList: [], treeList: [],
@ -607,8 +611,7 @@ export default {
this.$message.error("下载失败"); this.$message.error("下载失败");
}) })
}, },
thirdSysFkChange(thirdSysFk) { thirdSysFkChange() {
console.log(thirdSysFk);
this.getThirdSysDetail(); this.getThirdSysDetail();
}, },
@ -619,13 +622,19 @@ export default {
}; };
filterDetailByKey(query) filterDetailByKey(query)
.then((response) => { .then((response) => {
this.thirdSysDetail = response.data; if (response.code == 20000) {
if (response.data != null) {
this.thirdSysDetail = response.data;
} else {
}
}
}) })
.catch(() => { .catch(() => {
this.loading = false; this.loading = false;
this.list = []; this.list = [];
}); });
this.uploadData.thirdSys = this.query.thirdSysFk;
}, },
getSyncConfig() { getSyncConfig() {
findConfig() findConfig()

30
src/views/thrsys/ThrProductsAdd.vue
Unescape Escape View File

@ -41,7 +41,7 @@
style="width: 60%" style="width: 60%"
size="small" size="small"
placeholder="请输入内容" placeholder="请输入内容"
v-model="newProductData.code" v-model.trim="newProductData.code"
></el-input> ></el-input>
</div> </div>
</el-col> </el-col>
@ -54,7 +54,7 @@
style="width: 60%" style="width: 60%"
size="small" size="small"
placeholder="请输入内容" placeholder="请输入内容"
v-model="newProductData.name" v-model.trim="newProductData.name"
></el-input> ></el-input>
</div> </div>
</el-col> </el-col>
@ -72,7 +72,7 @@
style="width: 60%" style="width: 60%"
size="small" size="small"
placeholder="请输入内容" placeholder="请输入内容"
v-model="newProductData.spec" v-model.trim="newProductData.spec"
></el-input> ></el-input>
</div> </div>
</el-col> </el-col>
@ -86,7 +86,7 @@
style="width: 60%" style="width: 60%"
size="small" size="small"
placeholder="请输入内容" placeholder="请输入内容"
v-model="newProductData.measname" v-model.trim="newProductData.measname"
></el-input> ></el-input>
</div> </div>
</el-col> </el-col>
@ -104,7 +104,7 @@
style="width: 60%" style="width: 60%"
size="small" size="small"
placeholder="请输入内容" placeholder="请输入内容"
v-model="newProductData.manufactory" v-model.trim="newProductData.manufactory"
></el-input> ></el-input>
</div> </div>
</el-col> </el-col>
@ -117,7 +117,7 @@
style="width: 60%" style="width: 60%"
size="small" size="small"
placeholder="请输入内容" placeholder="请输入内容"
v-model="newProductData.registerNo" v-model.trim="newProductData.registerNo"
></el-input> ></el-input>
</div> </div>
</el-col> </el-col>
@ -133,7 +133,7 @@
style="width: 60%" style="width: 60%"
size="small" size="small"
placeholder="请输入内容" placeholder="请输入内容"
v-model="newProductData.ylqxzcrbarmc" v-model.trim="newProductData.ylqxzcrbarmc"
></el-input> ></el-input>
</div> </div>
</el-col> </el-col>
@ -146,7 +146,7 @@
style="width: 60%" style="width: 60%"
size="small" size="small"
placeholder="请输入内容" placeholder="请输入内容"
v-model="newProductData.ylqxzcrbarywmc" v-model.trim="newProductData.ylqxzcrbarywmc"
></el-input> ></el-input>
</div> </div>
</el-col> </el-col>
@ -162,7 +162,7 @@
style="width: 60%" style="width: 60%"
size="small" size="small"
placeholder="请输入内容" placeholder="请输入内容"
v-model="newProductData.cplb" v-model.trim="newProductData.cplb"
></el-input> ></el-input>
</div> </div>
</el-col> </el-col>
@ -175,7 +175,7 @@
style="width: 60%" style="width: 60%"
size="small" size="small"
placeholder="请输入内容" placeholder="请输入内容"
v-model="newProductData.flbm" v-model.trim="newProductData.flbm"
></el-input> ></el-input>
</div> </div>
</el-col> </el-col>
@ -192,7 +192,7 @@
style="width: 60%" style="width: 60%"
size="small" size="small"
placeholder="请输入内容" placeholder="请输入内容"
v-model="newProductData.sptm" v-model.trim="newProductData.sptm"
></el-input> ></el-input>
</div> </div>
</el-col> </el-col>
@ -205,7 +205,7 @@
style="width: 60%" style="width: 60%"
size="small" size="small"
placeholder="请输入内容" placeholder="请输入内容"
v-model="newProductData.ybbm" v-model.trim="newProductData.ybbm"
></el-input> ></el-input>
</div> </div>
</el-col> </el-col>
@ -221,7 +221,7 @@
style="width: 60%" style="width: 60%"
size="small" size="small"
placeholder="请输入内容" placeholder="请输入内容"
v-model="newProductData.tyshxydm" v-model.trim="newProductData.tyshxydm"
></el-input> ></el-input>
</div> </div>
</el-col> </el-col>
@ -234,7 +234,7 @@
style="width: 60%" style="width: 60%"
size="small" size="small"
placeholder="请输入内容" placeholder="请输入内容"
v-model="newProductData.qxlb" v-model.trim="newProductData.qxlb"
></el-input> ></el-input>
</div> </div>
</el-col> </el-col>
@ -254,7 +254,7 @@
size="mini" size="mini"
rows="4" rows="4"
placeholder="请输入内容" placeholder="请输入内容"
v-model="newProductData.cpms" v-model.trim="newProductData.cpms"
></el-input> ></el-input>
</div> </div>
</el-col> </el-col>

Write Preview
Loading…
Cancel
Save