Merge branch 'master' into hzt

pro
anthonywj 2 years ago
commit 189fab8d15

@ -8,11 +8,10 @@ ENV = 'production'
#林纪裕cd
# VUE_APP_BASE_API = 'http://101.43.77.55:9150/UDI_WMS_MC/'
# VUE_APP_BASE_API = 'http://116.204.106.103:9150/UDI_WMS_MC/'
# VUE_APP_BASE_API = 'http://r.jiyuudims.cloud:5004/UDI_WMS_MC/'
# VUE_APP_SYNC_API ="http://r.jiyuudims.cloud:5008/SP_SYNC_SERVER"
VUE_APP_BASE_API = 'http://r.jiyuudims.cloud:5003/UDI_WMS_MC/'
# VUE_APP_BASE_API = 'http://127.0.0.1:9150/UDI_WMS_MC/'
# 测试服务器
# VUE_APP_BASE_API = 'http://192.168.0.66:9150/UDI_WMS_MC/'
@ -22,8 +21,11 @@ ENV = 'production'
# VUE_APP_BASE_API = 'http://192.168.0.61:9150/UDI_WMS_MC/'
# VUE_APP_SYNC_API ="http://192.168.0.62:9150/SP_SYNC_SERVER"
刘恩典
# VUE_APP_BASE_API = 'http://192.168.0.54:9150/UDI_WMS_MC/'
# 平潭正式
VUE_APP_BASE_API = 'http://55.55.0.62:9150/UDI_WMS_MC/'
# VUE_APP_BASE_API = 'http://55.55.0.62:9150/UDI_WMS_MC/'
# VUE_APP_SYNC_API ="http://55.55.0.24:9150/SP_SYNC_SERVER"
# 吴总测试服务器

@ -146,4 +146,12 @@ export function getDetailList(params) {
});
}
export function filterSupList(data) {
return request({
url: "/purchase/order/filterSupList",
method: 'post',
data: data
})
}

@ -22,13 +22,24 @@
>草稿保存
</el-button>
<el-button size="mini" type="primary" @click.native="submit()"
v-if="curAction.checkWebNew != 2 || viewType !=1"
v-if="(viewType != 5 && viewType != 6)&&(curAction.checkWebNew != 2 || viewType !=1)"
>立即提交
</el-button>
<el-button size="mini" type="primary" @click.native="submit(1)"
v-if="curAction.checkWebNew > 1 && viewType == 1"
>待配货提交
</el-button>
<el-button size="mini" type="primary" @click.native="submit(1)"
v-if="viewType == 5"
>完成验收
</el-button>
<el-button size="mini" type="primary" @click.native="submit(1)"
v-if=" viewType == 6"
>完成验收
</el-button>
</el-button-group>
<el-row>
<el-col :span="11">
@ -374,7 +385,7 @@
</el-form>
</el-card>
<el-tabs type="border-card" style="margin: 5px">
<el-tab-pane label="业务详情" v-if="bizShow && viewBizVisible">
<el-tab-pane label="业务详情" v-if="bizShow && viewBizVisible || (viewType ==5 || viewType==6)">
<biz-detail-panel
:idQuery="orderFormData"
:refreshPanel="refreshCodesPanel"
@ -518,7 +529,7 @@ export default {
required: true,
},
viewType: {
//12.3,4.
//12.3,4.,5:,6:
type: Object,
required: true,
},
@ -718,8 +729,8 @@ export default {
.then((response) => {
this.busTypeOptions = response.data || [];
this.curAction = this.getActionItem(this.orderFormData.action);
if(isBlank(this.curAction)){
this.curAction={
if (isBlank(this.curAction)) {
this.curAction = {
corpType: 0,
genUnit: false,
checkWebNew: null
@ -1372,9 +1383,7 @@ export default {
if (this.$isNotBlank(this.orderFormData.checkPreInOrders)) {
this.checkPreInArray = this.orderFormData.split(",");
}
this.curAction={
}
this.curAction = {}
this.refreshCodesPanel();
//
this.findInvListByUser();

@ -22,7 +22,7 @@
</el-col>
<el-col :span="8">
<el-form-item class="query-form-item" label="单据号:" >
<el-form-item class="query-form-item" label="单据号:">
<el-input
style="width: 90%"
v-model="listQuery.billNo"

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

@ -164,13 +164,13 @@
<!-- </el-button-->
<!-- >-->
<!-- 暂时隐藏-->
<el-button
type="text"
size="small"
@click.native.stop="rollback(scope.row)"
>撤回
</el-button
>
<!-- <el-button-->
<!-- type="text"-->
<!-- size="small"-->
<!-- @click.native.stop="rollback(scope.row)"-->
<!-- >撤回-->
<!-- </el-button-->
<!-- >-->
<el-button
type="text"

@ -0,0 +1,686 @@
<template>
<div>
<el-card class="el-card">
<el-form :model="filterQuery" class="query-form" size="mini" label-width="100px" v-show="showSearch">
<el-row>
<el-col :span="8">
<el-form-item class="query-form-item" label="单号:">
<el-input v-model="filterQuery.billNo" placeholder="单号"
style="width: 90%"
clearable="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="query-form-item" label="出入库类型:">
<el-select v-model="filterQuery.mainAction" placeholder="请选择出入库类型" style="width: 90%">
<el-option label="全部" value=""></el-option>
<el-option label="入库" value="WareHouseIn"></el-option>
<el-option label="出库" value="WareHouseOut"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="query-form-item" label="单据类型:">
<el-select v-model="filterQuery.action" placeholder="请选择单据类型"
style="width: 90%"
clearable>
<el-option
v-for="item in busTypes"
:key="item.name"
:label="item.name"
:value="item.action">
<span style="float: left">{{ item.name }}</span>
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item class="query-form-item" label="所属仓库:">
<el-select v-model="filterQuery.invCode" placeholder="请选择所属仓库" clearable="true"
style="width: 90%"
@change="invChange"
>
<el-option
v-for="item in invList"
:key="item.name"
:label="item.name"
:value="item.code">
<span style="float: left">{{ item.name }}</span>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="query-form-item" label="创建时间:">
<el-date-picker
:picker-options="pickerOptions"
v-model="actDateRange"
type="daterange"
format="yyyy 年 MM 月 dd 日"
value-format="yyyy-MM-dd"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
style="width: 90%"
>
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div class="top-right-btn">
<el-button-group>
<el-button icon="el-icon-view" type="primary" @click="hideSearch">/</el-button>
<el-button
type="primary"
icon="el-icon-refresh"
@click="onReset"
>重置
</el-button>
<el-button type="primary" icon="el-icon-search" @click="onSubmit"
>查询
</el-button
>
</el-button-group>
</div>
<el-divider style="margin: 15px"></el-divider>
<el-table v-loading="loading" :data="list" style="width: 100%"
highlight-current-row
@row-click="handleSelectionChange"
border
>
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="单据号" prop="billNo" show-overflow-tooltip width="180"></el-table-column>
<el-table-column label="单据类型" prop="billTypeName" width="150">
</el-table-column>
<el-table-column label="创建时间" prop="createTime" width="150" show-overflow-tooltip>
<template slot-scope="scope">
<i class="el-icon-time"></i>
<span>{{ scope.row.createTime }}</span>
</template>
</el-table-column>
<el-table-column label="往来单位" prop="fromName" width="220">
</el-table-column>
<el-table-column label="所属部门" prop="deptName" width="120">
</el-table-column>
<el-table-column label="所属仓库" prop="invName" width="120">
</el-table-column>
<el-table-column label="来源单号" prop="corpOrderId" show-overflow-tooltip width="180"></el-table-column>
<el-table-column label="来源" prop="fromType" width="140">
<template slot-scope="scope">
<span>{{ fromTypeMap[scope.row.fromType] }}</span>
</template>
</el-table-column>
<el-table-column label="单据状态" prop="status" width="100">
<template slot-scope="scope">
<el-tag :type="statusFilterType(scope.row.status)">{{
checkStatus[scope.row.status]
}}
</el-tag>
</template>
</el-table-column>
<el-table-column label="操作" width="150" fixed="right">
<template slot-scope="scope">
<el-button
type="text"
size="small"
@click.native.stop="addOrders(scope.row)"
>编辑
</el-button
>
<el-button
type="text"
size="small"
@click.native.stop="deleteDialog(scope.row.billNo)"
>删除
</el-button
>
<el-button
type="text"
size="small"
@click.native.stop="onUpload(scope.row.billNo)"
>审核提交
</el-button
>
</template>
</el-table-column>
</el-table>
<el-dialog
title="编辑单据"
:visible.sync="addOrderVisible"
width="85%"
append-to-body
:close-on-click-modal="false"
:close-on-press-escape="false"
v-if="addOrderVisible"
@close='closeDialog'
>
<addOrder
:closeDialog="closeDialog"
:orderQuery="idQuery"
:viewType="viewType"
></addOrder>
</el-dialog>
<el-dialog
title="单号详情"
:visible.sync="codeDetailVisible"
:close-on-click-modal="false"
:close-on-press-escape="false"
width="80%"
v-if="codeDetailVisible"
>
<codeDetail
:idQuery="idQuery"
v-on:closeDetailDialog="closeDetailDialog"
></codeDetail>
</el-dialog>
<pagination
v-show="total>0"
:total="total"
:page.sync="filterQuery.page"
:limit.sync="filterQuery.limit"
@pagination="getList"
/>
</el-card>
<el-tabs type="border-card" style="margin: 15px">
<!--单据业务详情-->
<el-tab-pane>
<span slot="label">单据 {{ currentRow == null ? '' : currentRow.billNo }}-业务扫码校验结果</span>
<!--<el-form :inline="true" :model="bizQuery" class="query-form" size="mini">-->
<!-- <el-form-item class="query-form-item" label="物资名称:">-->
<!-- <el-input-->
<!-- v-model="bizQuery.productName"-->
<!-- placeholder="请输入物资名称"-->
<!-- clearable-->
<!-- >-->
<!-- </el-input>-->
<!-- </el-form-item>-->
<!-- <el-form-item>-->
<!-- <el-button-group>-->
<!-- <el-button-->
<!-- type="primary"-->
<!-- icon="el-icon-refresh"-->
<!-- @click="onBizReset"-->
<!-- >重置-->
<!-- </el-button>-->
<!-- <el-button type="primary" @click="onBizSubmit"-->
<!-- icon="el-icon-search"-->
<!-- >查询-->
<!-- </el-button>-->
<!-- </el-button-group>-->
<!-- </el-form-item>-->
<!--</el-form>-->
<el-table v-loading="bizDetailLoading" :data="bizDetailList" style="width: 100%" border
:row-style="rowStyle"
row-key="id"
>
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column
label="物资名称" width="150"
prop="coName"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="规格型号" width="150"
prop="spec"
></el-table-column>
<el-table-column label="批次号" header-align="center">
<el-table-column header-align="center"
label="手录" width="100"
prop="bbatchNo"
show-overflow-tooltip
></el-table-column>
<el-table-column header-align="center"
label="扫码"
prop="sbatchNo" width="100"
show-overflow-tooltip
></el-table-column>
</el-table-column>
<el-table-column label="生产日期" header-align="center">
<el-table-column header-align="center"
label="手录" width="100"
prop="bproductDate"
show-overflow-tooltip
></el-table-column>
<el-table-column header-align="center"
label="扫码" width="100"
prop="sproductDate"
show-overflow-tooltip
></el-table-column>
</el-table-column>
<el-table-column label="失效日期" header-align="center">
<el-table-column header-align="center"
label="手录" width="100"
prop="bexpireDate"
show-overflow-tooltip
></el-table-column>
<el-table-column header-align="center"
label="扫码" width="100"
prop="sexpireDate"
show-overflow-tooltip
></el-table-column>
</el-table-column>
<el-table-column label="数量" header-align="center">
<el-table-column
header-align="center"
label="单据数量" width="100"
prop="count"
></el-table-column>
<el-table-column
header-align="center"
label="扫码数量" width="100"
prop="scanCount"
></el-table-column>
</el-table-column>
<el-table-column
label="价格"
prop="price" width="100"
></el-table-column>
<el-table-column width="100" label="计量单位" prop="measname">
</el-table-column>
<el-table-column
label="生产企业"
prop="manufacturer" width="160"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="注册/备案号" width="160"
prop="certCode"
show-overflow-tooltip
></el-table-column>
</el-table>
</el-tab-pane>
</el-tabs>
</div>
</template>
<script>
import {
deleteByOrderId,
submitOrderWeb,
getOrderList
} from "../../api/inout/order";
import addOrder from "./DialogCreateOrder";
import {getInvListByUser} from "@/api/system/invWarehouse";
import {getLocalJoinByUser} from "@/api/basic/busType";
import {isBlank} from "@/utils/strUtil";
import {getBizDetailList, getCheckDetailList} from "@/api/inout/orderDetailBiz";
export default {
name: "IoCheckAuditBusOrder",
data() {
return {
showSearch: true,
filterQuery: {
id: "",
billNo: null,
mainAction: null,
action: null,
statusType: "unCheck",
page: 1,
limit: 10,
startTime: null,
endTime: null,
invCode: this.$store.getters.locInvCode,
},
viewType: 3,
checkStatus: {
1: "草稿",
2: "等待处理",
3: "等待校验",
4: "处理异常",
5: "校验成功",
6: "校验异常",
7: "审核通过",
8: "审核拒绝",
9: "正在处理", 10: "待审核", 11: "待配货",
},
curIndex: "",
idQuery: {},
storageList: [],
invList: [],
list: [],
codeDetailVisible: false,
addOrderVisible: false,
total: 0,
loading: false,
index: null,
formName: null,
errorDetail: "",
formMap: {
add: "新增",
edit: "编辑",
},
enableDept: false,
fromTypeMap: {
"1": "UDIMS平台",
"2": "网页新增",
"3": "pda即时校验",
"4": "pda未校验",
"5": "pc端扫码精灵",
"6": "流转自动补单",
"7": "UDI供应商平台",
"8": "平衡补录单据",
"10": "手动补单",
"11": "仓库盘点",
"12": "采购计划",
"13": "领用单据",
"14": "第三方系统单据",
},
deleteData: {
billNo: "",
status: 10,
},
dialogTableVisible: false,
formLoading: false,
deleteLoading: false,
busTypes: [],
actDateRange: [],
pickerOptions: {
shortcuts: [
{
text: "最近一周",
onClick(picker) {
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
picker.$emit("pick", [start, end]);
},
},
{
text: "最近一个月",
onClick(picker) {
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
picker.$emit("pick", [start, end]);
},
},
{
text: "最近三个月",
onClick(picker) {
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
picker.$emit("pick", [start, end]);
},
},
],
},
currentRow: {
billNo: ""
},
bizQuery: {
productName: null,
orderIdFk: null,
page: 1,
limit: 10
},
bizTotal: 0,
bizDetailLoading: false,
bizDetailList: [],
};
},
components: {
addOrder,
},
methods: {
onReset() {
this.$router.push({
path: "",
});
this.filterQuery = {
id: "",
billNo: null,
mainAction: null,
action: null,
statusType: "unCheck",
page: 1,
limit: 10,
startTime: null,
endTime: null,
invCode: this.$store.getters.locInvCode,
};
this.actDateRange = [];
this.getList();
},
onSubmit() {
if (this.actDateRange !== null) {
this.filterQuery.startTime = this.actDateRange[0];
this.filterQuery.endTime = this.actDateRange[1];
} else {
this.filterQuery.startTime = null;
this.filterQuery.endTime = null;
}
this.filterQuery.page = 1;
this.getList();
},
hideSearch() {
this.showSearch = !this.showSearch;
},
handleSizeChange(val) {
this.filterQuery.limit = val;
this.getList();
},
handleCurrentChange(val) {
this.filterQuery.page = val;
this.getList();
},
closeDetailDialog(val) {
this.codeDetailVisible = false;
},
getBusType() {
let query = {
code: this.filterQuery.invCode,
enabled: true,
vueType: "supDelivery",
};
getLocalJoinByUser(query)
.then((response) => {
this.busTypes = response.data.list || [];
this.getList();
})
.catch(() => {
});
},
addOrders(row) {
this.currentRow = row;
this.idQuery = {};
this.idQuery = row;
this.addOrderVisible = true;
},
closeDialog() {
this.addOrderVisible = false;
this.addHosOrderVisible = false;
this.getList();
},
//
getList() {
this.loading = true;
getOrderList(this.filterQuery)
.then((response) => {
this.loading = false;
if (response.code === 20000) {
this.list = response.data.list || [];
this.total = response.data.total || 0;
if (this.list.length == 0) {
this.bizDetailList = [];
}
} else {
this.$message.error(response.message);
}
})
.catch((error) => {
this.$message.error(error.message)
this.loading = false;
this.list = [];
this.total = 0;
});
},
deleteOrders(data) {
this.loading = true;
this.deleteData.billNo = data;
deleteByOrderId(this.deleteData)
.then((response) => {
if (response.code == 20000) {
this.getList();
this.$message({
type: "success",
message: "删除成功!",
});
} else if (response.code == 520) {
this.$message.error("新增扫码单据列表已不存在该扫码单据!");
this.getList();
} else {
this.$message.error(response.message);
this.getList();
}
})
.catch(() => {
});
},
deleteDialog(rowId) {
this.$confirm("此操作将永久删除该订单, 是否继续?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
this.deleteOrders(rowId);
this.currentRow = null;
this.bizDetailList = [];
})
.catch(() => {
});
},
onUpload(data) {
this.loading = true;
var idQuery = {
billNo: "",
};
idQuery.billNo = data;
submitOrderWeb(idQuery)
.then((response) => {
this.loading = false;
if (response.code === 20000) {
this.$message.success("提交成功");
this.getList();
this.bizDetailList = [];
} else {
this.$message.error(response.message);
}
this.loading = false;
});
},
getInvList() {
getInvListByUser()
.then((response) => {
this.invList = response.data || [];
})
.catch(() => {
});
},
invChange() {
this.filterQuery.action = null;
this.getBusType();
},
statusFilterType(status) {
const statusMap = {
2: "warning",
1: "warning",
4: "danger",
3: "success",
};
return statusMap[status];
},
rowStyle({row, rowIndex}) {
let rowBackground = {};
if (!this.$isNotBlank(row.supId) || !this.$isNotBlank(row.bindRlFk)) {
rowBackground.color = '#f60303';
return rowBackground;
}
if (!row.checkSuccess) {
rowBackground.color = '#f60303';
}
return rowBackground;
},
onBizReset() {
this.bizQuery = {
productName: null,
orderIdFk: null,
page: 1,
limit: 10
};
this.getBizDetailList();
},
onBizSubmit() {
this.bizQuery.page = 1;
this.getBizDetailList();
},
handleSelectionChange(val) {
this.currentRow = val;
this.getBizDetailList();
},
getBizDetailList() {
if (this.currentRow == null || isBlank(this.currentRow.billNo)) {
this.$message.error("请先选择需要查询的单据!")
return;
}
this.bizDetailLoading = true;
this.bizQuery.orderIdFk = this.currentRow.billNo;
getCheckDetailList(this.bizQuery).then((res) => {
this.bizDetailLoading = false;
if (res.code === 20000) {
this.bizDetailList = res.data || [];
} else {
this.$message.error(res.message);
this.bizDetailList = [];
}
}).catch((error) => {
this.bizDetailLoading = false;
this.$message.error(error.message);
this.bizDetailList = [];
this.bizTotal = 0;
})
},
},
mounted() {
document.body.ondrop = function (event) {
event.preventDefault();
event.stopPropagation();
};
},
created() {
this.getInvList();
this.getBusType();
this.getList();
},
};
</script>
<style type="text/scss" lang="scss">
</style>

@ -0,0 +1,531 @@
<template>
<div>
<el-card class="el-card">
<el-form :model="filterQuery"
:rules="rules"
ref="form"
class="query-form" size="mini" label-width="100px" v-show="showSearch">
<el-row>
<el-col :span="8">
<el-form-item class="query-form-item" label="单号:">
<el-input v-model="filterQuery.billNo" placeholder="单号"
style="width: 90%"
clearable="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="query-form-item" label="出入库类型:" prop="mainAction">
<el-select v-model="filterQuery.mainAction" placeholder="请选择出入库类型" style="width: 90%">
<el-option label="全部" value=""></el-option>
<el-option label="入库" value="WareHouseIn"></el-option>
<el-option label="出库" value="WareHouseOut"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="query-form-item" label="单据类型:">
<el-select v-model="filterQuery.action" placeholder="请选择单据类型"
style="width: 90%"
clearable>
<el-option
v-for="item in busTypes"
:key="item.name"
:label="item.name"
:value="item.action">
<span style="float: left">{{ item.name }}</span>
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item class="query-form-item" label="所属仓库:">
<el-select v-model="filterQuery.invCode" placeholder="请选择所属仓库" clearable="true"
style="width: 90%"
@change="invChange"
>
<el-option
v-for="item in invList"
:key="item.name"
:label="item.name"
:value="item.code">
<span style="float: left">{{ item.name }}</span>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="query-form-item" label="创建时间:">
<el-date-picker
:picker-options="pickerOptions"
v-model="actDateRange"
type="daterange"
format="yyyy 年 MM 月 dd 日"
value-format="yyyy-MM-dd"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
style="width: 90%"
>
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div class="top-right-btn">
<el-button-group>
<el-button icon="el-icon-view" type="primary" @click="hideSearch">/</el-button>
<el-button
type="primary"
icon="el-icon-refresh"
@click="onReset"
>重置
</el-button>
<el-button type="primary" icon="el-icon-search" @click="onSubmit"
>查询
</el-button
>
<el-button type="primary" icon="el-icon-bottom-left" @click="selectThrOrderFunction()"
:loading="loading">选入第三方单据
</el-button>
</el-button-group>
</div>
<el-divider style="margin: 15px"></el-divider>
<el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row
border
>
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="单据号" prop="billNo" show-overflow-tooltip width="140"></el-table-column>
<el-table-column label="单据类型" prop="billTypeName" width="160"></el-table-column>
<el-table-column label="创建时间" prop="createTime" width="140" show-overflow-tooltip>
</el-table-column>
<el-table-column label="往来单位" prop="fromName" width="220">
</el-table-column>
<el-table-column label="所属部门" prop="deptName" width="120">
</el-table-column>
<el-table-column label= prop="invName" width="120">
</el-table-column>
<el-table-column label="来源单据号" prop="corpOrderId" show-overflow-tooltip width="140"></el-table-column>
<el-table-column label="来源" prop="fromType" width="140">
<template slot-scope="scope">
<span>{{ fromTypeMap[scope.row.fromType] }}</span>
</template>
</el-table-column>
<el-table-column label="单据状态" prop="status" width="100">
<template slot-scope="scope">
<el-tag :type="statusFilterType(scope.row.status)">{{
checkStatus[scope.row.status]
}}
</el-tag>
</template>
</el-table-column>
<el-table-column label="操作" width="150" fixed="right">
<template slot-scope="scope">
<el-button
type="text"
size="small"
@click.native.stop="editOrder(scope.row)"
>编辑
</el-button
>
<el-button
type="text"
size="small"
@click.native.stop="deleteDialog(scope.row.billNo)"
>删除
</el-button
>
<el-button
type="text"
size="small"
v-if="scope.row.status == 1"
@click.native.stop="onUpload(scope.row.billNo)"
>提交审核
</el-button
>
</template>
</el-table-column>
</el-table>
<el-dialog
:title="titleMap[title]"
:visible.sync="addOrderVisible"
width="85%"
append-to-body
:close-on-click-modal="false"
:close-on-press-escape="false"
v-if="addOrderVisible"
@close='closeDialog'
>
<addOrder
:closeDialog="closeDialog"
:orderQuery="idQuery"
:viewType="viewType"
></addOrder>
</el-dialog>
<el-dialog
title="选入第三方单据"
:visible.sync="selectThrOrderVisible"
:close-on-click-modal="false"
:close-on-press-escape="false"
width="85%"
v-if="selectThrOrderVisible"
>
<selectThrOrder
:closeDialog="closeDialog"
:data="thisData"
></selectThrOrder>
</el-dialog>
<el-dialog
title="选入领用单据"
:visible.sync="selectReceiveVisible"
:close-on-click-modal="false"
:close-on-press-escape="false"
width="85%"
v-if="selectReceiveVisible"
>
<selectReceiveOrderDialog
:closeDialog="closeDialog"
:data="thisData"
></selectReceiveOrderDialog>
</el-dialog>
<pagination
v-show="total>0"
:total="total"
:page.sync="filterQuery.page"
:limit.sync="filterQuery.limit"
@pagination="getList"
/>
</el-card>
</div>
</template>
<script>
import {
deleteByOrderId,
submitOrderWeb,
getOrderList, submitBiz
} from "../../api/inout/order";
import addOrder from "./DialogCreateOrder";
import {getInvListByUser} from "@/api/system/invWarehouse";
import {getLocalJoinByUser} from "@/api/basic/busType";
import {selectSysParamByKey} from "@/api/param/systemParamConfig";
import selectThrOrder from "./DialogSelectThrOrder";
import selectReceiveOrderDialog from "./DialogSelectReceiveOrder";
export default {
name: "IoCheckAuditNewOrder",
data() {
return {
showSearch: true,
titleMap: {
add: "新增单据",
edit: "编辑单据",
},
title: "add",
filterQuery: {
id: "",
billNo: null,
mainAction: null,
action: null,
statusType: "new_biz",
page: 1,
limit: 10,
startTime: null,
endTime: null,
invCode: this.$store.getters.locInvCode,
},
checkStatus: {
1: "草稿",
2: "等待处理",
3: "等待校验",
4: "处理异常",
5: "校验成功",
6: "校验异常",
7: "已审核",
8: "审核拒绝",
9: "正在处理", 10: "待审核", 11: "待配货",
},
curIndex: "",
idQuery: {},
storageList: [],
invList: [],
list: [],
addOrderVisible: false,
total: 0,
loading: false,
index: null,
formName: null,
errorDetail: "",
formMap: {
add: "新增",
edit: "编辑",
},
enableDept: false,
fromTypeMap: {
"1": "UDIMS平台",
"2": "网页新增",
"3": "pda即时校验",
"4": "pda未校验",
"5": "pc端扫码精灵",
"6": "流转自动补单",
"7": "UDI供应商平台",
"8": "平衡补录单据",
"10": "手动补单",
"11": "仓库盘点",
"12": "采购计划",
"13": "领用单据",
"14": "第三方系统单据",
},
deleteData: {
billNo: "",
status: 10,
},
dialogTableVisible: false,
formLoading: false,
deleteLoading: false,
busTypes: [],
actDateRange: [],
pickerOptions: {
shortcuts: [
{
text: "最近一周",
onClick(picker) {
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
picker.$emit("pick", [start, end]);
},
},
{
text: "最近一个月",
onClick(picker) {
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
picker.$emit("pick", [start, end]);
},
},
{
text: "最近三个月",
onClick(picker) {
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
picker.$emit("pick", [start, end]);
},
},
],
},
viewType: 5,
thisData: {},
selectThrOrderVisible: false,
selectReceiveVisible: false,
lotType: "LOT",//
};
},
components: {
addOrder, selectThrOrder, selectReceiveOrderDialog
},
methods: {
onReset() {
this.filterQuery = {
id: "",
billNo: null,
mainAction: null,
action: null,
statusType: "new_biz",
page: 1,
limit: 10,
startTime: null,
endTime: null,
invCode: this.$store.getters.locInvCode,
};
this.actDateRange = [];
this.getList();
},
onSubmit() {
if (this.actDateRange !== null) {
this.filterQuery.startTime = this.actDateRange[0];
this.filterQuery.endTime = this.actDateRange[1];
} else {
this.filterQuery.startTime = null;
this.filterQuery.endTime = null;
}
this.filterQuery.page = 1;
this.getList();
},
hideSearch() {
this.showSearch = !this.showSearch;
},
getBusType() {
let query = {
code: this.filterQuery.invCode,
enabled: true,
};
getLocalJoinByUser(query)
.then((response) => {
this.busTypes = response.data.list || [];
this.getList();
})
.catch(() => {
});
},
addOrders() {
this.idQuery = {};
this.title = "add";
this.addOrderVisible = true;
},
editOrder(row) {
this.idQuery = row;
this.title = "edit";
this.addOrderVisible = true;
},
closeDialog() {
this.addOrderVisible = false;
this.addHosOrderVisible = false;
this.selectReceiveVisible = false;
this.selectThrOrderVisible = false;
this.getList();
},
//
getList() {
this.loading = true;
getOrderList(this.filterQuery)
.then((response) => {
this.loading = false;
if (response.code === 20000) {
this.list = response.data.list || [];
this.total = response.data.total || 0;
} else {
this.$message.error(response.message);
}
})
.catch((error) => {
this.$message.error(error.message)
this.loading = false;
this.list = [];
this.total = 0;
});
},
deleteOrders(data) {
this.loading = true;
this.deleteData.billNo = data;
deleteByOrderId(this.deleteData)
.then((response) => {
if (response.code == 20000) {
this.getList();
this.$message({
type: "success",
message: "删除成功!",
});
} else if (response.code == 520) {
this.$message.error("新增扫码单据列表已不存在该扫码单据!");
this.getList();
} else {
this.$message.error(response.message);
this.getList();
}
})
.catch(() => {
});
},
deleteDialog(rowId) {
this.$confirm("此操作将永久删除该订单, 是否继续?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
this.deleteOrders(rowId);
})
.catch(() => {
});
},
onUpload(data) {
this.loading = true;
var idQuery = {
billNo: "",
};
idQuery.billNo = data;
submitBiz(idQuery)
.then((response) => {
this.loading = false;
if (response.code === 20000) {
this.$message.success("提交成功");
this.getList();
} else {
this.$message.error(response.message);
}
this.loading = false;
});
},
getInvList() {
getInvListByUser()
.then((response) => {
this.invList = response.data || [];
this.getList();
})
.catch(() => {
});
},
invChange() {
this.filterQuery.action = null;
this.getBusType();
},
statusFilterType(status) {
const statusMap = {
2: "warning",
1: "warning",
4: "danger",
3: "success",
};
return statusMap[status];
},
selectThrOrderFunction() {
this.selectThrOrderVisible = true;
},
selectReceive() {
this.selectReceiveVisible = true;
},
},
mounted() {
document.body.ondrop = function (event) {
event.preventDefault();
event.stopPropagation();
};
},
created() {
this.getInvList();
this.getBusType();
this.getList();
this.lotType = this.$route.query.name;
debugger
if (this.lotType == 'NO_LOT') {
this.viewType = 5;
} else {
this.viewType = 6;
}
},
};
</script>
<style type="text/scss" lang="scss">
</style>

@ -152,13 +152,13 @@
<!-- 暂时隐藏-->
<el-button
type="text"
size="small"
@click.native.stop="rollback(scope.row)"
>撤回
</el-button
>
<!-- <el-button-->
<!-- type="text"-->
<!-- size="small"-->
<!-- @click.native.stop="rollback(scope.row)"-->
<!-- >撤回-->
<!-- </el-button-->
<!-- >-->
<el-button
type="text"
size="small"

@ -101,7 +101,7 @@
prop="manufacturer"
show-overflow-tooltip
></el-table-column>
<el-table-column label="操作" width="140" fixed="right">
<el-table-column label="操作" width="160" fixed="right">
<template slot-scope="scope">
<el-button
@ -132,6 +132,14 @@
</el-button
>
<el-button
type="text"
size="small"
@click.stop="true"
@click.native="deleteDetail(scope.row)"
>删除
</el-button
>
<el-button
type="text"
size="small"
@ -149,14 +157,6 @@
</el-button
>
<el-button
type="text"
size="small"
@click.stop="true"
@click.native="deleteDetail(scope.row)"
>删除
</el-button
>
</template>
</el-table-column>
</el-table>

@ -98,6 +98,7 @@
</el-tag>
</template>
</el-table-column>
<el-table-column label="备注" prop="remark"></el-table-column>
<el-table-column label="创建时间" prop="createTime"></el-table-column>
<el-table-column label="操作" width="120px">
<template slot-scope="scope">

@ -13,19 +13,19 @@
<el-row>
<el-col :span="6">
<el-form-item label="物资简称:" class="query-form-item">
<el-input v-model="listQuery.pinyinInitial" @input="search" style="width: 90%" placeholder="请输入拼音首字母"
<el-input v-model="listQuery.pinyinInitial" @input="search" style="width: 90%" placeholder="请输入物资拼音简写"
clearable="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="第三方产品编码:" class="query-form-item">
<el-input v-model="listQuery.thrPiId" style="width: 90%" placeholder="请输入第三方产品编码"
<el-form-item label="第三方物资编码:" class="query-form-item">
<el-input v-model="listQuery.thrPiId" style="width: 90%" placeholder="第三方物资编码"
clearable="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="物资编码:" class="query-form-item">
<el-input v-model="listQuery.code" style="width: 90%" placeholder="请输入三方物资分类"
<el-form-item label="分类编码:" class="query-form-item">
<el-input v-model="listQuery.mainId" style="width: 90%" placeholder="请输入三方物资分类"
clearable="true"></el-input>
</el-form-item>
</el-col>
@ -83,7 +83,7 @@
</el-table-column>
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="最小销售产品标识" prop="nameCode" width="140" show-overflow-tooltip></el-table-column>
<el-table-column label="物资编码" prop="thirdId" show-overflow-tooltip></el-table-column>
<el-table-column label="第三方物资编码" prop="thirdId" show-overflow-tooltip></el-table-column>
<el-table-column label="医疗器械注册人" prop="ylqxzcrbarmc"></el-table-column>
<el-table-column label="物资名称" prop="cpmctymc" show-overflow-tooltip></el-table-column>
<el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip></el-table-column>

@ -18,13 +18,13 @@
<el-col :span="11">
<el-form-item label="创建时间:" prop="createTime">
<el-date-picker
:disabled="true"
v-model="formData.createTime"
type="datetime"
placeholder="选择日期"
style="width: 100%"
:clearable="false"
value-format="yyyy-MM-dd HH:mm:ss"
:disabled="true"
v-model="formData.createTime"
type="datetime"
placeholder="选择日期"
style="width: 100%"
:clearable="false"
value-format="yyyy-MM-dd HH:mm:ss"
>
</el-date-picker>
</el-form-item>
@ -45,12 +45,12 @@
<el-col :span="11">
<el-form-item label="到货截止:" prop="arrivalTime">
<el-date-picker
v-model="formData.arrivalTime"
type="datetime"
placeholder="选择日期"
style="width: 100%"
:clearable="false"
value-format="yyyy-MM-dd HH:mm:ss"
v-model="formData.arrivalTime"
type="datetime"
placeholder="选择日期"
style="width: 100%"
:clearable="false"
value-format="yyyy-MM-dd HH:mm:ss"
>
</el-date-picker>
</el-form-item>
@ -64,10 +64,10 @@
<el-select v-model="formData.invCode" @change="setDeptCode" placeholder="采购仓库信息" style="width: 100%"
clearable>
<el-option
v-for="item in invCodeList"
:key="item.name"
:label="item.name"
:value="item.code">
v-for="item in invCodeList"
:key="item.name"
:label="item.name"
:value="item.code">
<span style="float: left">{{ item.name }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.warehouseName }}</span>
</el-option>
@ -77,25 +77,25 @@
<el-col :span="11">
<el-form-item
prop="supId"
label="供应商:"
prop="supId"
label="供应商:"
>
<el-select
v-model="formData.supId"
filterable
remote
:disabled="corpOrderIdDisabled"
clearable
reserve-keyword
style="width: 90%"
placeholder="请选择供应商"
:remote-method="findMethod"
v-model="formData.supId"
filterable
remote
:disabled="corpOrderIdDisabled"
clearable
reserve-keyword
style="width: 90%"
placeholder="请选择供应商"
:remote-method="findMethod"
>
<el-option
v-for="item in fromOptions"
:key="item.erpId"
:label="item.name"
:value="item.erpId"
v-for="item in fromOptions"
:key="item.erpId"
:label="item.name"
:value="item.erpId"
>
<span style="float: left">{{ item.name }}</span>
</el-option>
@ -127,7 +127,8 @@
<el-row type="flex" justify="end">
<el-button-group style="display: flex">
<el-button-group style="display: flex;margin-bottom: 15px; margin-right: 50px">
<el-button type="primary" @click.native.stop="selectProductFunction()" :loading="loading">产品录入</el-button>
<el-button type="primary" @click.native.stop="selectProductFunction()" :loading="loading">产品录入
</el-button>
<!-- <el-button type="primary" :loading="loading" @click.native.stop="selectApply()">选入采购单</el-button>-->
</el-button-group>
@ -154,7 +155,21 @@
</el-table-column>
<el-table-column label="注册/备案号" prop="zczbhhzbapzbh"></el-table-column>
<el-table-column label="生产厂家" prop="manufactory"></el-table-column>
<el-table-column label="供应商" prop="supName"></el-table-column>
<el-table-column label="供应商" prop="supName">
<template slot-scope="scope">
<el-select size="mini"
@change='tableCountChange(scope.row)'
v-model="scope.row.supName" clearable
:disabled="scope.row.index !== selectedIndex"
placeholder="请选择">
<el-option v-for="item in suppliers"
:key="item.erpId"
:label="item.name"
:value="item.name">
</el-option>
</el-select>
</template>
</el-table-column>
<el-table-column label="操作" width="120">
<template slot-scope="scope">
<el-button type="text" size="small" :disabled="scope.row.index === selectedIndex" @click.stop="true"
@ -170,36 +185,36 @@
</el-form>
<el-dialog
title="物资录入"
:visible.sync="selectProductVisible"
:close-on-click-modal="false"
:close-on-press-escape="false"
width="80%"
v-if="selectProductVisible"
:append-to-body='true'
title="物资录入"
:visible.sync="selectProductVisible"
:close-on-click-modal="false"
:close-on-press-escape="false"
width="80%"
v-if="selectProductVisible"
:append-to-body='true'
>
<purOrderProducts
:closeDialog="closeDialogC2"
:purType="1"
:pId="pId"
:supId="formData.supId"
:data="thisData"
:closeDialog="closeDialogC2"
:purType="1"
:pId="pId"
:supId="formData.supId"
:data="thisData"
></purOrderProducts>
</el-dialog>
<el-dialog
title="采购计划单据选入"
:visible.sync="selectApplyVisible"
:close-on-click-modal="false"
:close-on-press-escape="false"
width="80%"
append-to-body
v-if="selectApplyVisible"
title="采购计划单据选入"
:visible.sync="selectApplyVisible"
:close-on-click-modal="false"
:close-on-press-escape="false"
width="80%"
append-to-body
v-if="selectApplyVisible"
>
<select-plan-list-dialog
:data="thisData"
:pId="pId"
:closeDialog="closeDialogC2"
:data="thisData"
:pId="pId"
:closeDialog="closeDialogC2"
></select-plan-list-dialog>
</el-dialog>
</div>
@ -214,7 +229,8 @@ import {
listOrderDetail,
addOrderId,
selectOrderDetail,
updateDetail
updateDetail,
filterSupList
} from "@/api/purchase/purOrder";
import {filterSubByInv} from "@/api/system/invSubWarehouse";
import SelectPlanListDialog from "@/views/purchase/purPlan/selectPlanListDialog";
@ -267,6 +283,7 @@ export default {
formVisible: false,
deleteLoading: false,
orderNo: null,
suppliers: [],
statusMap: {
1: "草稿",
2: "未审核",
@ -364,18 +381,18 @@ export default {
type: 1,
}
inserThrOrderWeb(tQuery)
.then(response => {
this.loading = false;
if (response.code === 20000) {
this.$message.success(tMessage + "成功");
this.closeDialog(true);
} else {
this.$message.error(response.message);
}
})
.catch(() => {
this.loading = false;
})
.then(response => {
this.loading = false;
if (response.code === 20000) {
this.$message.success(tMessage + "成功");
this.closeDialog(true);
} else {
this.$message.error(response.message);
}
})
.catch(() => {
this.loading = false;
})
},
selectProductFunction() {
if (this.$isBlank(this.formData.supId)) {
@ -405,23 +422,30 @@ export default {
orderIdFk: this.pId
}
selectOrderDetail(this.query) //
.then((response) => {
this.codeArray = response.data.list || [];
this.total = response.data.total || 0;
if (this.total > 0) {
this.corpOrderIdDisabled = true;
}
this.loading = false;
})
.catch(() => {
this.loading = false;
this.list = [];
this.total = 0;
});
.then((response) => {
this.codeArray = response.data.list || [];
this.total = response.data.total || 0;
if (this.total > 0) {
this.corpOrderIdDisabled = true;
}
this.loading = false;
})
.catch(() => {
this.loading = false;
this.list = [];
this.total = 0;
});
},
rowChange(val) {
this.currentRow = val;
this.selectedIndex = val.index;
filterSupList({productId:val.productId}) //
.then((response) => {
this.suppliers = response.data.list || [];
})
.catch(() => {
});
},
tableCountChange(row) {
if (this.$isNotBlank(row)) {
@ -457,19 +481,19 @@ export default {
let delIds = [];
delIds.push(row.id)
delOrderDetail(delIds)
.then(response => {
this.detailLoading = false;
if (response.code === 20000) {
this.$message.success(response.data);
// this.getStockOrderDetailList();
this.codeArray.splice(index, 1);
} else {
this.$message.error(response.message);
}
})
.catch(() => {
this.detailLoading = false;
})
.then(response => {
this.detailLoading = false;
if (response.code === 20000) {
this.$message.success(response.data);
// this.getStockOrderDetailList();
this.codeArray.splice(index, 1);
} else {
this.$message.error(response.message);
}
})
.catch(() => {
this.detailLoading = false;
})
} else {
this.$message.success('删除成功');
this.codeArray.splice(index, 1);
@ -485,17 +509,17 @@ export default {
getStockOrderDetailList() {
this.loading = true;
listOrderDetail(this.query) //
.then((response) => {
console.log(response)
this.codeArray = response.data.list || [];
this.total = response.data.total || 0;
this.loading = false;
})
.catch(() => {
this.loading = false;
this.list = [];
this.total = 0;
});
.then((response) => {
console.log(response)
this.codeArray = response.data.list || [];
this.total = response.data.total || 0;
this.loading = false;
})
.catch(() => {
this.loading = false;
this.list = [];
this.total = 0;
});
},
findSubInvs() {
this.invCodeList = [];
@ -503,14 +527,14 @@ export default {
filter: 3
};
filterSubByInv(query)
.then((response) => {
this.invCodeList = response.data || [];
if (this.invCodeList != null && this.invCodeList.length == 1) {
this.formData.invCode = this.invCodeList[0].code;
}
})
.catch(() => {
});
.then((response) => {
this.invCodeList = response.data || [];
if (this.invCodeList != null && this.invCodeList.length == 1) {
this.formData.invCode = this.invCodeList[0].code;
}
})
.catch(() => {
});
},
selectApply() {
this.selectApplyVisible = true;
@ -538,13 +562,13 @@ export default {
limit: 20,
};
getBasicUnitMaintains(cQuery)
.then((response) => {
this.loading = false;
this.fromOptions = response.data.list || [];
})
.catch(() => {
this.loading = false;
});
.then((response) => {
this.loading = false;
this.fromOptions = response.data.list || [];
})
.catch(() => {
this.loading = false;
});
},
},
@ -577,8 +601,8 @@ export default {
deptCode: null,
incCode: null,
createTime: parseTime(
date,
"{y}-{m}-{d} {h}:{i}:{s}"
date,
"{y}-{m}-{d} {h}:{i}:{s}"
),
};
this.orderEditor = false;

Loading…
Cancel
Save