领用,发票,日月季年

20231126-yw
anthonywj 2 years ago
parent fdc60ee5f5
commit 84905777f7

@ -9,7 +9,7 @@ ENV = 'production'
#林纪裕cd #林纪裕cd
# VUE_APP_BASE_API = 'http://www.linjiyu.lol:81/UDI_WMS_MC/' # VUE_APP_BASE_API = 'http://www.linjiyu.lol:81/UDI_WMS_MC/'
VUE_APP_BASE_API = 'http://www.linjiyu.lol:83/UDI_WMS_MC/' # VUE_APP_BASE_API = 'http://www.linjiyu.lol:83/UDI_WMS_MC/'
# VUE_APP_BASE_API = 'http://127.0.0.1:9150/UDI_WMS_MC/' # VUE_APP_BASE_API = 'http://127.0.0.1:9150/UDI_WMS_MC/'
@ -30,7 +30,7 @@ VUE_APP_BASE_API = 'http://www.linjiyu.lol:83/UDI_WMS_MC/'
# VUE_APP_BASE_API = 'http://192.168.0.242:9150/UDI_WMS_MC/' # VUE_APP_BASE_API = 'http://192.168.0.242: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/'
# 吴总测试服务器. # 吴总测试服务器.

@ -39,6 +39,16 @@ export function findByFrom(query) {
} }
//获取上级仓库
export function findByUp(query) {
return axios({
url: "/spms/inv/warehouse/findByUp",
method: "get",
params: query
});
}
export function filterSubByInv(query) { export function filterSubByInv(query) {
return axios({ return axios({
url: "/spms/inv/warehouse/findByUser", url: "/spms/inv/warehouse/findByUser",

@ -360,7 +360,7 @@
<el-divider direction="vertical"></el-divider> <el-divider direction="vertical"></el-divider>
<el-col span="5"> <el-col span="5">
<el-select v-model="inputQuery.scanPreIn" style="width: 65%" <el-select v-model="inputQuery.scanPreIn" style="width: 65%"
:disabled=" inputQuery.mainAction == 'WareHouseIn' || inputQuery.corpType !== 1 || inputQuery.advancePreIn==1 || inputQuery.vailInv==1" :disabled=" inputQuery.advancePreIn==1 || inputQuery.vailInv==1"
@change="outChange" @change="outChange"
placeholder="是否启用"> placeholder="是否启用">
<el-option label="是" :value="true"></el-option> <el-option label="是" :value="true"></el-option>
@ -381,7 +381,7 @@
<el-divider direction="vertical"></el-divider> <el-divider direction="vertical"></el-divider>
<el-col span="5"> <el-col span="5">
<el-select v-model="inputQuery.advancePreIn" style="width: 65%" <el-select v-model="inputQuery.advancePreIn" style="width: 65%"
:disabled=" inputQuery.mainAction == 'WareHouseIn' || inputQuery.corpType !== 1 || inputQuery.scanPreIn==1 || inputQuery.vailInv==1" :disabled=" inputQuery.scanPreIn==1 || inputQuery.vailInv==1"
@change="outChange" @change="outChange"
placeholder="是否启用"> placeholder="是否启用">
<el-option label="是" :value="true"></el-option> <el-option label="是" :value="true"></el-option>
@ -446,7 +446,7 @@
<el-divider direction="vertical"></el-divider> <el-divider direction="vertical"></el-divider>
<el-col span="5"> <el-col span="5">
<el-select v-model="inputQuery.preInBack" <el-select v-model="inputQuery.preInBack"
:disabled="inputQuery.scanPreIn ==false " @change="getPreInBack" :disabled="inputQuery.scanPreIn ==false || inputQuery.corpType ==2 " @change="getPreInBack"
style="width: 65%" style="width: 65%"
placeholder="是否退回" placeholder="是否退回"
> >

@ -13,7 +13,7 @@
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item class="query-form-item" label="发票代码:"> <el-form-item class="query-form-item" label="发票代码:">
<el-input v-model="invoiceQuery.invoiceEncode" placeholder="请输入发票代码" style="width: 90%" <el-input v-model="invoiceQuery.invoiceCode" placeholder="请输入发票代码" style="width: 90%"
clearable="true" clearable="true"
></el-input> ></el-input>
</el-form-item> </el-form-item>
@ -451,7 +451,7 @@ export default {
imgList: [], imgList: [],
imgViewerVisible: false, imgViewerVisible: false,
cowEn:null, cowEn: null,
// //
orderLoading: false, orderLoading: false,
orderList: [], orderList: [],
@ -688,7 +688,7 @@ export default {
// this.resultDetailList = []; // this.resultDetailList = [];
}, },
handleInvoiceChange(val) { handleInvoiceChange(val) {
this.cowEn=val; this.cowEn = val;
this.getOrderList(val) this.getOrderList(val)
this.getProductDetailList(val) this.getProductDetailList(val)
}, },

@ -348,10 +348,9 @@
> >
<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="发票码" width="150" label="发票码" width="150"
prop="invoiceEncode" prop="invoiceEncode"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="物资名称" label="物资名称"
prop="cpmctymc" width="150" prop="cpmctymc" width="150"
@ -367,15 +366,15 @@
prop="batchNo" prop="batchNo"
show-overflow-tooltip show-overflow-tooltip
></el-table-column> ></el-table-column>
<el-table-column
label="发票代码" width="150"
prop="invoiceCode"
></el-table-column>
<el-table-column <el-table-column
label="机器编码" width="150" label="机器编码" width="150"
prop="machineNo" prop="machineNo"
show-overflow-tooltip show-overflow-tooltip
></el-table-column> ></el-table-column>
<el-table-column
label="发票编码" width="150"
prop="invoiceCode"
></el-table-column>
<el-table-column <el-table-column
label="开票日期" width="150" label="开票日期" width="150"
prop="invoiceDate" prop="invoiceDate"

@ -62,7 +62,7 @@
<el-form-item class="query-form-item" prop="targetInvCode" label="领用仓库:"> <el-form-item class="query-form-item" prop="targetInvCode" label="领用仓库:">
<el-select v-model="formData.targetInvCode" placeholder="请选择领用仓库" @change="getTargerType" <el-select v-model="formData.targetInvCode" placeholder="请选择领用仓库" @change="getTargerType"
clearable="true" clearable="true"
:disabled="codeArray.length>0" :disabled="true"
style="width: 100%" style="width: 100%"
> >
<el-option <el-option
@ -77,20 +77,20 @@
</el-row> </el-row>
<el-row :gutter="20"> <el-row :gutter="20">
<!-- <el-col :span="11">--> <!-- <el-col :span="11">-->
<!-- <el-form-item prop="billType" label="领用类型:">--> <!-- <el-form-item prop="billType" label="领用类型:">-->
<!-- <el-select v-model="formData.billType" placeholder="请选择领用类型" style="width: 100%"--> <!-- <el-select v-model="formData.billType" placeholder="请选择领用类型" style="width: 100%"-->
<!-- clearable>--> <!-- clearable>-->
<!-- <el-option--> <!-- <el-option-->
<!-- v-for="item in busTypes"--> <!-- v-for="item in busTypes"-->
<!-- :key="item.originAction"--> <!-- :key="item.originAction"-->
<!-- :label="item.originName"--> <!-- :label="item.originName"-->
<!-- :value="item.originAction">--> <!-- :value="item.originAction">-->
<!-- <span style="float: left">{{ item.originName }}</span>--> <!-- <span style="float: left">{{ item.originName }}</span>-->
<!-- </el-option>--> <!-- </el-option>-->
<!-- </el-select>--> <!-- </el-select>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<!-- </el-col>--> <!-- </el-col>-->
<el-col :span="11"> <el-col :span="11">
<el-form-item prop="remark" label="备注:"> <el-form-item prop="remark" label="备注:">
<el-input v-model="formData.remark" auto-complete="off"></el-input> <el-input v-model="formData.remark" auto-complete="off"></el-input>
@ -178,7 +178,7 @@
<script> <script>
import {getBusChange} from "@/api/basic/busTypeChange"; import {getBusChange} from "@/api/basic/busTypeChange";
import {inserThrOrderWeb, updateReceive, updateReceiveDetail, delReceiveDetail} from "@/api/thrsys/thrOrderReceive"; import {inserThrOrderWeb, updateReceive, updateReceiveDetail, delReceiveDetail} from "@/api/thrsys/thrOrderReceive";
import {filterSubByInv, findByFrom, findInvByUser} from "@/api/system/invSubWarehouse"; import {filterSubByInv, findByFrom, findByUp, findInvByUser} from "@/api/system/invSubWarehouse";
import dialogInvProduct from "../DialogSelectInvProduct"; import dialogInvProduct from "../DialogSelectInvProduct";
import {getOrderDetail} from "@/api/inout/receiveOrder"; import {getOrderDetail} from "@/api/inout/receiveOrder";
import {parseTime} from "@/utils/coTools"; import {parseTime} from "@/utils/coTools";
@ -265,7 +265,7 @@ export default {
invQueryData: {}, invQueryData: {},
type: 1, type: 1,
Receive: {}, Receive: {},
ischeck:false, ischeck: false,
}; };
}, },
components: { components: {
@ -289,11 +289,13 @@ export default {
findFromInv() { findFromInv() {
let cQuery = { let cQuery = {
locInvCode: this.formData.invCode, locInvCode: this.formData.invCode,
type:1,
}; };
findByFrom(cQuery) findByUp(cQuery)
.then((response) => { .then((response) => {
this.fromOptions = response.data || []; this.fromOptions = response.data || [];
if (this.fromOptions != null && this.fromOptions.length > 0) {
this.formData.targetInvCode = this.fromOptions[0].code;
}
}) })
.catch(() => { .catch(() => {
}); });
@ -314,8 +316,8 @@ export default {
hideSearch() { hideSearch() {
this.showSearch = !this.showSearch; this.showSearch = !this.showSearch;
}, },
getTargerType(){ getTargerType() {
this.formData.advanceType= this.fromOptions.find(item => item.code == this.formData.targetInvCode).advanceType this.formData.advanceType = this.fromOptions.find(item => item.code == this.formData.targetInvCode).advanceType
console.log(this.formData) console.log(this.formData)
}, },
saveOrder(status) { saveOrder(status) {
@ -416,7 +418,7 @@ export default {
this.getOrderDetailList(); this.getOrderDetailList();
}, },
save(){ save() {
if (this.$isNotBlank(this.Receive)) { if (this.$isNotBlank(this.Receive)) {
console.log("this.Receive:") console.log("this.Receive:")
console.log(this.Receive) console.log(this.Receive)
@ -425,8 +427,8 @@ export default {
updateReceiveDetail(this.Receive).then(res => { updateReceiveDetail(this.Receive).then(res => {
if (res.code == 20000) { if (res.code == 20000) {
this.loading = false; this.loading = false;
this.ischeck=false; this.ischeck = false;
this.selectedIndex=null; this.selectedIndex = null;
this.$message.success('修改成功'); this.$message.success('修改成功');
} else { } else {
this.$message.error(res.message); this.$message.error(res.message);
@ -436,7 +438,7 @@ export default {
} }
}, },
rowChange(val) { rowChange(val) {
this.Receive=val; this.Receive = val;
console.log("var:") console.log("var:")
console.log(this.Receive) console.log(this.Receive)
this.ischeck = true; this.ischeck = true;
@ -499,7 +501,7 @@ export default {
}); });
}, },
subStorageChange(item) { subStorageChange(item) {
this.formData.targetInvCode=''; this.formData.targetInvCode = '';
this.getBusType(); this.getBusType();
this.findFromInv(); this.findFromInv();
}, },

@ -46,6 +46,7 @@
@current-change="handleSelectionChange"> @current-change="handleSelectionChange">
<el-table-column type="selection" width="55"></el-table-column> <el-table-column type="selection" width="55"></el-table-column>
<el-table-column label="序号" type="index"></el-table-column> <el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="仓库" type="invName"></el-table-column>
<el-table-column label="记录号" prop="recordKey"></el-table-column> <el-table-column label="记录号" prop="recordKey"></el-table-column>
<el-table-column label="名称" prop="title"></el-table-column> <el-table-column label="名称" prop="title"></el-table-column>
<el-table-column label="汇总日期" prop="date"></el-table-column> <el-table-column label="汇总日期" prop="date"></el-table-column>
@ -192,7 +193,7 @@ export default {
page: 1, page: 1,
limit: 10 limit: 10
}, },
key:null, key: null,
detailLoading: false, detailLoading: false,
detailList: [], detailList: [],
detailTotal: 0, detailTotal: 0,
@ -285,13 +286,13 @@ export default {
this.detailTotal = 0; this.detailTotal = 0;
}, },
excel(){ excel() {
if(isBlank(this.currentRow.recordKey)){ if (isBlank(this.currentRow.recordKey)) {
return this.$message.error("请选择要导出的数据!"); return this.$message.error("请选择要导出的数据!");
} }
let params={billNo:this.currentRow.recordKey,key:"day"}; let params = {billNo: this.currentRow.recordKey, key: "day"};
excelImport(params ).then( res =>{ excelImport(params).then(res => {
let blob = new Blob([res],{type: "application/vnd.ms-excel"}); let blob = new Blob([res], {type: "application/vnd.ms-excel"});
let url = window.URL.createObjectURL(blob); // urlblob let url = window.URL.createObjectURL(blob); // urlblob
let a = document.createElement("a"); let a = document.createElement("a");
a.href = url; a.href = url;

@ -42,6 +42,7 @@
@current-change="handleSelectionChange"> @current-change="handleSelectionChange">
<el-table-column type="selection" width="55"></el-table-column> <el-table-column type="selection" width="55"></el-table-column>
<el-table-column label="序号" type="index"></el-table-column> <el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="仓库" type="invName"></el-table-column>
<el-table-column label="名称" prop="title"></el-table-column> <el-table-column label="名称" prop="title"></el-table-column>
<el-table-column label="记录号" prop="recordKey"></el-table-column> <el-table-column label="记录号" prop="recordKey"></el-table-column>
<el-table-column label="汇总日期" prop="date"></el-table-column> <el-table-column label="汇总日期" prop="date"></el-table-column>
@ -263,13 +264,13 @@ export default {
this.getList(); this.getList();
}, },
excel(){ excel() {
if(isBlank(this.currentRow.recordKey)){ if (isBlank(this.currentRow.recordKey)) {
return this.$message.error("请选择要导出的数据!"); return this.$message.error("请选择要导出的数据!");
} }
let params={billNo:this.currentRow.recordKey,key:"month"}; let params = {billNo: this.currentRow.recordKey, key: "month"};
excelImport(params ).then( res =>{ excelImport(params).then(res => {
let blob = new Blob([res],{type: "application/vnd.ms-excel"}); let blob = new Blob([res], {type: "application/vnd.ms-excel"});
let url = window.URL.createObjectURL(blob); // urlblob let url = window.URL.createObjectURL(blob); // urlblob
let a = document.createElement("a"); let a = document.createElement("a");
a.href = url; a.href = url;

@ -42,6 +42,7 @@
@current-change="handleSelectionChange"> @current-change="handleSelectionChange">
<el-table-column type="selection" width="55"></el-table-column> <el-table-column type="selection" width="55"></el-table-column>
<el-table-column label="序号" type="index"></el-table-column> <el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="仓库" type="invName"></el-table-column>
<el-table-column label="名称" prop="title"></el-table-column> <el-table-column label="名称" prop="title"></el-table-column>
<el-table-column label="记录号" prop="recordKey"></el-table-column> <el-table-column label="记录号" prop="recordKey"></el-table-column>
<el-table-column label="汇总日期" prop="date"></el-table-column> <el-table-column label="汇总日期" prop="date"></el-table-column>
@ -283,13 +284,13 @@ export default {
this.detailList = []; this.detailList = [];
this.detailTotal = 0; this.detailTotal = 0;
}, },
excel(){ excel() {
if(isBlank(this.currentRow.recordKey)){ if (isBlank(this.currentRow.recordKey)) {
return this.$message.error("请选择要导出的数据!"); return this.$message.error("请选择要导出的数据!");
} }
let params={billNo:this.currentRow.recordKey,key:"quarter"}; let params = {billNo: this.currentRow.recordKey, key: "quarter"};
excelImport(params ).then( res =>{ excelImport(params).then(res => {
let blob = new Blob([res],{type: "application/vnd.ms-excel"}); let blob = new Blob([res], {type: "application/vnd.ms-excel"});
let url = window.URL.createObjectURL(blob); // urlblob let url = window.URL.createObjectURL(blob); // urlblob
let a = document.createElement("a"); let a = document.createElement("a");
a.href = url; a.href = url;

@ -42,6 +42,7 @@
@current-change="handleSelectionChange"> @current-change="handleSelectionChange">
<el-table-column type="selection" width="55"></el-table-column> <el-table-column type="selection" width="55"></el-table-column>
<el-table-column label="序号" type="index"></el-table-column> <el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="仓库" type="invName"></el-table-column>
<el-table-column label="名称" prop="title"></el-table-column> <el-table-column label="名称" prop="title"></el-table-column>
<el-table-column label="记录号" prop="recordKey"></el-table-column> <el-table-column label="记录号" prop="recordKey"></el-table-column>
<el-table-column label="汇总日期" prop="date"></el-table-column> <el-table-column label="汇总日期" prop="date"></el-table-column>
@ -258,13 +259,13 @@ export default {
this.filterQuery.page = 1; this.filterQuery.page = 1;
this.getList(); this.getList();
}, },
excel(){ excel() {
if(isBlank(this.currentRow.recordKey)){ if (isBlank(this.currentRow.recordKey)) {
return this.$message.error("请选择要导出的数据!"); return this.$message.error("请选择要导出的数据!");
} }
let params={billNo:this.currentRow.recordKey,key:"year"}; let params = {billNo: this.currentRow.recordKey, key: "year"};
excelImport(params ).then( res =>{ excelImport(params).then(res => {
let blob = new Blob([res],{type: "application/vnd.ms-excel"}); let blob = new Blob([res], {type: "application/vnd.ms-excel"});
let url = window.URL.createObjectURL(blob); // urlblob let url = window.URL.createObjectURL(blob); // urlblob
let a = document.createElement("a"); let a = document.createElement("a");
a.href = url; a.href = url;

Loading…
Cancel
Save