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

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
dev
郑明梁 2 years ago
parent edfd5d5a26 d41c2d1f77
commit a5dc9a870d
3 changed files with 127 additions and 129 deletions
Show Stats Download Patch File Download Diff File

248
src/views/inout/DialogcChangeNewOrder.vue
Unescape Escape View File

@ -5,8 +5,8 @@
<el-button-group style="display: flex;margin: -40px 0 20px 80%; height: 35px"> <el-button-group style="display: flex;margin: -40px 0 20px 80%; height: 35px">
<el-button <el-button
type="primary" type="primary"
@click.native="submit('0')" @click.native="submit('0')"
>生成单据 >生成单据
</el-button </el-button
> >
@ -22,11 +22,11 @@
<el-col :span="11"> <el-col :span="11">
<el-form-item prop="actDate" label="单据时间"> <el-form-item prop="actDate" label="单据时间">
<el-date-picker <el-date-picker
v-model="formData.actDate" v-model="formData.actDate"
type="datetime" type="datetime"
placeholder="日期" placeholder="日期"
:disabled="true" :disabled="true"
style="width: 90%; " style="width: 90%; "
> >
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
@ -37,10 +37,10 @@
<el-form-item prop="locStorageCode" label="当前仓库"> <el-form-item prop="locStorageCode" label="当前仓库">
<el-select v-model="formData.invCode" placeholder="当前仓库信息" @change="locCHange" style="width: 90%"> <el-select v-model="formData.invCode" placeholder="当前仓库信息" @change="locCHange" style="width: 90%">
<el-option <el-option
v-for="item in curInvOptions" v-for="item in curInvOptions"
:key="item.name" :key="item.name"
:label="item.name" :label="item.name"
:value="item.code"> :value="item.code">
<span style="float: left">{{ item.name }}</span> <span style="float: left">{{ item.name }}</span>
</el-option> </el-option>
</el-select> </el-select>
@ -51,10 +51,10 @@
<el-select v-model="formData.action" placeholder="请选择单据类型" style="width: 90%" <el-select v-model="formData.action" placeholder="请选择单据类型" style="width: 90%"
@change="actionChange"> @change="actionChange">
<el-option <el-option
v-for="item in busTypeOptions" v-for="item in busTypeOptions"
:key="item.name" :key="item.name"
:label="item.name" :label="item.name"
:value="item.action"> :value="item.action">
<span style="float: left">{{ item.name }}</span> <span style="float: left">{{ item.name }}</span>
</el-option> </el-option>
</el-select> </el-select>
@ -66,21 +66,21 @@
<el-form-item class="query-form-item" prop="fromCorp" label="往来信息" <el-form-item class="query-form-item" prop="fromCorp" label="往来信息"
v-if="curAction.corpType === 0 || curAction.corpType === 2 || (curAction.corpType === 1 && !curAction.genUnit)"> v-if="curAction.corpType === 0 || curAction.corpType === 2 || (curAction.corpType === 1 && !curAction.genUnit)">
<el-select <el-select
v-model="formData.fromCorp" v-model="formData.fromCorp"
filterable filterable
remote remote
clearable="true" clearable="true"
style="width: 90%" style="width: 90%"
reserve-keyword reserve-keyword
placeholder="请输入往来单位" placeholder="请输入往来单位"
:remote-method="findMethod" :remote-method="findMethod"
:loading="loading" :loading="loading"
> >
<el-option <el-option
v-for="item in fromOptions" v-for="item in fromOptions"
:key="item.erpId" :key="item.erpId"
:label="item.name" :label="item.name"
:value="item.erpId" :value="item.erpId"
> >
<span style="float: left">{{ item.name }}</span> <span style="float: left">{{ item.name }}</span>
</el-option> </el-option>
@ -91,10 +91,10 @@
<el-select v-model="formData.fromInvCode" placeholder="请选择往来仓库信息" clearable="true" style="width: 90%" <el-select v-model="formData.fromInvCode" placeholder="请选择往来仓库信息" clearable="true" style="width: 90%"
> >
<el-option <el-option
v-for="item in fromInvOptions" v-for="item in fromInvOptions"
:key="item.code" :key="item.code"
:label="item.name" :label="item.name"
:value="item.code"> :value="item.code">
<span style="float: left">{{ item.name }}</span> <span style="float: left">{{ item.name }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ <span style="float: right; color: #8492a6; font-size: 13px">{{
item.code item.code
@ -130,52 +130,52 @@
style="width: 100%; margin-top: 20px;"> style="width: 100%; margin-top: 20px;">
<el-table-column label="序号" type="index"></el-table-column> <el-table-column label="序号" type="index"></el-table-column>
<el-table-column <el-table-column
label="物资名称" label="物资名称"
prop="coName" prop="coName"
show-overflow-tooltip show-overflow-tooltip
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="规格型号" label="规格型号"
prop="spec" prop="spec"
show-overflow-tooltip show-overflow-tooltip
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="批次号" label="批次号"
prop="batchNo" prop="batchNo"
show-overflow-tooltip show-overflow-tooltip
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="生产日期" label="生产日期"
prop="productDate" prop="productDate"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="失效日期" label="失效日期"
prop="expireDate" prop="expireDate"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="单据数量" label="单据数量"
prop="count" prop="count"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="价格" label="价格"
prop="price" prop="price"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="生产企业" label="生产企业"
prop="manufacturer" prop="manufacturer"
show-overflow-tooltip show-overflow-tooltip
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="注册/备案凭证号" label="注册/备案凭证号"
prop="certCode" prop="certCode"
show-overflow-tooltip show-overflow-tooltip
></el-table-column> ></el-table-column>
<el-table-column label="操作" width="100" prop="price" fixed="right"> <el-table-column label="操作" width="100" prop="price" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
type="text" type="text"
size="small" size="small"
@click="deleteOrderDetail(scope.$index, scope.row)" @click="deleteOrderDetail(scope.$index, scope.row)"
>删除 >删除
</el-button> </el-button>
</template> </template>
@ -260,29 +260,27 @@ export default {
this.$message.warning("请选择单据类型！"); this.$message.warning("请选择单据类型！");
return; return;
} }
if ((this.curAction.corpType === 0 || this.curAction.corpType === 2 || (this.curAction.corpType === 1 && !this.curAction.genUnit)) && this.$isBlank(this.formData.fromCorp)) {
this.$message.error('当前往来信息不能为空');
return;
}
if (this.$isBlank(this.formData.invCode)) { if (this.$isBlank(this.formData.invCode)) {
this.$message.error("当前分库不能为空"); this.$message.error("当前分库不能为空");
return; return;
} }
if (this.curAction.corpType === 1 && this.$isBlank(this.formData.fromCorp)) {
if (this.curAction.corpType === 0 || this.curAction.corpType === 2 || (this.curAction.corpType === 1 && !this.curAction.genUnit && this.$isBlank(this.formData.fromCorp))) { this.$message.error('往来单位不能为空');
return;
}
if ((this.curAction.corpType === 2 && this.$isBlank(this.formData.fromCorp))) {
this.$message.error("往来单位不能为空"); this.$message.error("往来单位不能为空");
return; return;
} }
if ((this.curAction.corpType === 4 && this.$isBlank(this.formData.fromCorp))) {
if (this.curAction.corpType == 3 && this.$isBlank(this.formData.fromInvCode)) {
this.$message.error("往来单位不能为空"); this.$message.error("往来单位不能为空");
return; return;
} }
if (this.curAction.corpType == 3 && this.$isBlank(this.formData.fromInvCode)) {
if (this.curAction.corpType === 1 && this.$isBlank(this.formData.fromCorp)) { this.$message.error("往来单位不能为空");
this.$message.error('往来单位不能为空');
return; return;
} }
if (this.detailList.length == 0) { if (this.detailList.length == 0) {
this.$message.error("产品列表不能为空"); this.$message.error("产品列表不能为空");
return; return;
@ -317,15 +315,15 @@ export default {
products: products products: products
}; };
stockOrderChange(tQuery) stockOrderChange(tQuery)
.then((response) => { .then((response) => {
if (response.code === 20000) { if (response.code === 20000) {
this.$message.success("提交成功"); this.$message.success("提交成功");
this.closeDialog(); this.closeDialog();
} else { } else {
this.$message.error(response.message); this.$message.error(response.message);
} }
this.loading = false; this.loading = false;
}); });
}, },
@ -333,15 +331,15 @@ export default {
findInvListByUser() { findInvListByUser() {
this.curInvOptions = []; this.curInvOptions = [];
findInvByUser() findInvByUser()
.then(response => { .then(response => {
this.curInvOptions = response.data || []; this.curInvOptions = response.data || [];
if (this.curInvOptions != null && this.curInvOptions.length > 0 && this.formData.invWarehouseCode == null) { if (this.curInvOptions != null && this.curInvOptions.length > 0 && this.formData.invWarehouseCode == null) {
this.formData.invWarehouseCode = this.curInvOptions[0].code; this.formData.invWarehouseCode = this.curInvOptions[0].code;
this.getBusTypeByInv() this.getBusTypeByInv()
} }
}) })
.catch(() => { .catch(() => {
}); });
}, },
@ -351,11 +349,11 @@ export default {
code: this.formData.invCode, code: this.formData.invCode,
}; };
findByInvUser(query) findByInvUser(query)
.then((response) => { .then((response) => {
this.busTypeOptions = response.data || []; this.busTypeOptions = response.data || [];
}) })
.catch(() => { .catch(() => {
}); });
}, },
@ -371,11 +369,11 @@ export default {
pcode: invCode pcode: invCode
}; };
filterSubByInv(query) filterSubByInv(query)
.then((response) => { .then((response) => {
this.subInvList = response.data || []; this.subInvList = response.data || [];
}) })
.catch(() => { .catch(() => {
}); });
}, },
findStorageMethod(query) { findStorageMethod(query) {
@ -386,11 +384,11 @@ export default {
locInvCode: this.formData.locStorageCode, locInvCode: this.formData.locStorageCode,
}; };
filterAllByLoc(cQuery) filterAllByLoc(cQuery)
.then((response) => { .then((response) => {
this.fromStorageOptions = response.data || []; this.fromStorageOptions = response.data || [];
}) })
.catch(() => { .catch(() => {
}); });
}, },
findMethod(query) { findMethod(query) {
this.fromOptions = []; this.fromOptions = [];
@ -410,13 +408,13 @@ export default {
cQuery.corpType = 2; cQuery.corpType = 2;
} else return; } else return;
getBasicUnitMaintains(cQuery) getBasicUnitMaintains(cQuery)
.then((response) => { .then((response) => {
this.loading = false; this.loading = false;
this.fromOptions = response.data.list || []; this.fromOptions = response.data.list || [];
}) })
.catch(() => { .catch(() => {
this.loading = false; this.loading = false;
}); });
}, },
@ -451,14 +449,14 @@ export default {
locInvCode: this.formData.invCode, locInvCode: this.formData.invCode,
}; };
findByFrom(cQuery) findByFrom(cQuery)
.then((response) => { .then((response) => {
this.fromInvOptions = response.data || []; this.fromInvOptions = response.data || [];
if (val == 1) { if (val == 1) {
this.formData.fromInvCode = this.fromInvOptions[0].code; this.formData.fromInvCode = this.fromInvOptions[0].code;
} }
}) })
.catch(() => { .catch(() => {
}); });
}, },
changeFun(row) { changeFun(row) {
@ -475,14 +473,14 @@ export default {
orderIdFk: orderId orderIdFk: orderId
} }
getBizDetailList(query) getBizDetailList(query)
.then((response) => { .then((response) => {
this.detailLoading = false; this.detailLoading = false;
this.detailList = response.data.list || []; this.detailList = response.data.list || [];
}) })
.catch(() => { .catch(() => {
this.detailLoading = false; this.detailLoading = false;
this.detailList = []; this.detailList = [];
}); });
}, },
deleteOrderDetail(index) { deleteOrderDetail(index) {
for (let i = 0; i < this.detailList.length; i++) { for (let i = 0; i < this.detailList.length; i++) {

4
src/views/purchase/purOrder/purOrderAudit.vue
Unescape Escape View File

@ -182,8 +182,8 @@ export default {
formName: null, formName: null,
invCodebe: null, invCodebe: null,
formMap: { formMap: {
add: "新增采购计划", add: "新增采购订单",
update: "采购计划审核", update: "采购订单审核",
}, },
statusMap: { statusMap: {
1: "草稿", 1: "草稿",

4
src/views/purchase/purOrder/purOrderDetailDialog.vue
Unescape Escape View File

@ -261,9 +261,9 @@ export default {
saveOrder(status) { saveOrder(status) {
let tip = ""; let tip = "";
if (status == "3") { if (status == "3") {
tip = "是否确定通过该采购计划？"; tip = "是否确定通过该采购订单？";
} else { } else {
tip = "是否确定拒绝该采购计划？"; tip = "是否确定拒绝该采购订单？";
} }
this.$confirm(tip, "提示", { this.$confirm(tip, "提示", {
confirmButtonText: "确定", confirmButtonText: "确定",

Write Preview
Loading…
Cancel
Save