价格先进先出,耗材字典问题

test
anthonywj 2 years ago
parent eb82334bbc
commit d20f4d533b

@ -6,7 +6,7 @@ ENV = 'production'
# VUE_APP_BASE_API = 'http://116.204.71.86:9150/UDI_WMS_MC/'
#林纪裕
VUE_APP_BASE_API = 'http://www.linjiyu.lol:82/UDI_SPMS_SERVER/'
# VUE_APP_BASE_API = 'http://www.linjiyu.lol:82/UDI_SPMS_SERVER/'
# VUE_APP_BASE_API = 'http://www.linjiyu.lol:84/UDI_SPMS_SERVER/'
# VUE_APP_BASE_API = 'http://127.0.0.1:9150/UDI_SPMS_SERVER/'
@ -15,13 +15,13 @@ VUE_APP_BASE_API = 'http://www.linjiyu.lol:82/UDI_SPMS_SERVER/'
# VUE_APP_BASE_API = 'http://116.204.106.103:9150/UDI_SPMS_SERVER/'
# 平潭
# VUE_APP_BASE_API = 'http://121.204.169.96:9150/UDI_SPMS_SERVER/'
VUE_APP_BASE_API = 'http://121.204.169.96:9150/UDI_SPMS_SERVER/'
# 文明懂
# VUE_APP_BASE_API = 'http://192.168.0.62:9150/UDI_SPMS_SERVER/'
# 刘恩典
# VUE_APP_BASE_API = 'http://192.168.0.235:9150/UDI_SPMS_SERVER/'
# VUE_APP_BASE_API = 'http://192.168.0.243:9150/UDI_SPMS_SERVER/'
# 漳州中医院
# VUE_APP_BASE_API = 'http://116.204.116.198:9150/UDI_SPMS_SERVER/'

@ -52,15 +52,6 @@ export function updatetUdiInfos(query) {
}
export function checkExitUdi(query) {
return axios({
url: "/udi/udirel/check/udi",
method: "post",
data: query
});
}
export function combineUdi(query) {
return axios({
url: "/udi/udirel/revleance",

@ -65,22 +65,27 @@
<div class="top-right-btn">
<el-button-group style="width: 600px">
<el-button icon="el-icon-view" type="primary" @click="hideSearch"
>显示/隐藏搜索栏</el-button
>显示/隐藏搜索栏
</el-button
>
<el-button type="primary" icon="el-icon-refresh" @click="onReset"
>重置</el-button
>重置
</el-button
>
<el-button type="primary" icon="el-icon-search" @click="search"
>查询</el-button
>查询
</el-button
>
<el-button type="primary" icon="el-icon-plus" @click="handleAddClick"
>新增</el-button
>新增
</el-button
>
<el-button
type="primary"
icon="el-icon-download"
@click="exportJsonFile"
>导出单据类型</el-button
>导出单据类型
</el-button
>
<el-upload
:action="uploadFileUrl"
@ -92,7 +97,8 @@
:file-list="fileList"
>
<el-button icon="el-icon-upload2" type="primary"
>导入单据类型</el-button
>导入单据类型
</el-button
>
</el-upload>
</el-button-group>
@ -139,13 +145,13 @@
<el-button
type="text"
@click.native.stop="handleModifyClick(scope.row)"
>编辑
>编辑
</el-button>
<el-button
type="text"
:disabled="!configParams.typeScan"
@click.native.stop="deleteDialog(scope.row)"
>删除
>删除
</el-button>
</template>
</el-table-column>
@ -165,9 +171,9 @@
<div slot="footer" class="dialog-footer">
<!-- :disabled="!configParams.typeScan"-->
<el-button type="primary" size="small" @click="onAddSubmit"
>提交
>提交
</el-button>
<el-button size="small" @click="cancelDialog"> </el-button>
<el-button size="small" @click="cancelDialog"></el-button>
</div>
</el-dialog>
@ -191,14 +197,14 @@
icon="search"
@click="onModifySubmit"
:disabled="!configParams.typeScan"
>提交
>提交
</el-button>
<el-button
type="primary"
size="small"
icon="search"
@click="cancelDialog"
>取消
>取消
</el-button>
</div>
</el-dialog>
@ -224,8 +230,8 @@ import {
import modifyDialog from "./bussinessTypeModify";
import axios from "axios";
import store from "@/store";
import { findConfig } from "@/api/sync/spsSyncStatus";
import { isBlank } from "@/utils/strUtil";
import {findConfig} from "@/api/sync/spsSyncStatus";
import {isBlank} from "@/utils/strUtil";
export default {
data() {
@ -312,6 +318,7 @@ export default {
checkVailDate: 0, //
checkExpire: true, //
checkCertExpire: false, //
editType: 2,
},
enableMap: {
true: "是",
@ -490,7 +497,7 @@ export default {
const binaryData = [];
binaryData.push(response);
let url = window.URL.createObjectURL(
new Blob(binaryData, { type: "application/json" })
new Blob(binaryData, {type: "application/json"})
);
this.loading = false;
const eleLink = document.createElement("a");
@ -579,6 +586,7 @@ export default {
checkVailDate: 0, //
checkExpire: 2, //
checkCertExpire: 0, //
editType: 2,
backPreinType: 1,
sortNum: 999,
};
@ -599,7 +607,8 @@ export default {
.then(() => {
this.deleteOrders(rowId);
})
.catch(() => {});
.catch(() => {
});
},
deleteOrders(data) {
@ -619,7 +628,8 @@ export default {
this.$message.error(response.message);
}
})
.catch(() => {});
.catch(() => {
});
},
handleChange(response, files, fileList) {
if (response.code != 20000) {
@ -644,13 +654,15 @@ export default {
this.configParams = response.data;
}
})
.catch(() => {});
.catch(() => {
});
},
},
components: {
modifyDialog,
},
mounted() {},
mounted() {
},
created() {
this.init();
this.getSyncConfig();

@ -394,6 +394,7 @@ export default {
erpName: "",
thirdName: null,
keys: [],
devKeys: [],
},
checked: true,
udidlList: [],
@ -561,6 +562,8 @@ export default {
if (this.relId != null) {
this.combineQuery.relId = this.relId;
this.combineQuery.keys.push(this.currentRow.uuid);
this.combineQuery.devKeys.push(this.currentRow.deviceRecordKey);
if (this.currentRow.check) {
selected = this.currentRow;
}
@ -573,6 +576,7 @@ export default {
selected = obj;
}
this.combineQuery.keys.push(obj.uuid);
this.combineQuery.devKeys.push(obj.deviceRecordKey);
});
}
if (selected != null) {

@ -134,6 +134,7 @@ export default {
erpName: "",
thirdName: null,
keys: [],
devKeys: [],
},
checked: true,
@ -201,11 +202,11 @@ export default {
},
checkCombine(row) {
this.combineQuery.keys = [];
if (this.relId != null) {
this.combineQuery.relId = this.relId;
this.combineQuery.keys.push(row.uuid);
this.combineQuery.devKeys.push(row.deviceRecordKey);
} else
return;
this.combineLoading = true;

@ -311,6 +311,9 @@ export default {
curAction: {
corpType: 0,
genUnit: false,
checkWebNew: null,
mainAction: null,
},
fromOptions: [],
isCodeAlive: true,

@ -21,6 +21,12 @@
width="120"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="价格"
prop="price"
width="120"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="扫码数量"
prop="count"

@ -59,7 +59,7 @@
</el-form-item>
</el-form>
<el-table v-loading="loading" :data="list" style="width: 100%"
:default-sort="defaultSort" @sort-change="handleSortChange" border>
:default-sort="defaultSort" @sort-change="handleSortChange" border>
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column
label="UDI码"
@ -90,6 +90,12 @@
width="120"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="价格"
prop="price"
width="120"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="入库数量"
prop="inCount"
@ -198,6 +204,7 @@ export default {
this.invPreProductDetailQuery.batchNo = this.inputQuery.batchNo;
this.invPreProductDetailQuery.deptCode = this.inputQuery.deptCode;
this.invPreProductDetailQuery.invCode = this.inputQuery.invCode;
this.invProductDetailQuery.price = this.inputQuery.price;
// this.invPreProductDetailQuery.nameCode = this.inputQuery.nameCode;
getInvPreInProductDetail(this.invPreProductDetailQuery).then((res) => {
this.loading = false;

@ -142,6 +142,7 @@
<el-table-column label="物资名称" prop="cpmctymc" width="180"></el-table-column>
<el-table-column label="规格型号" prop="ggxh" width="180" show-overflow-tooltip></el-table-column>
<el-table-column label="批次号" prop="batchNo" width="120"></el-table-column>
<el-table-column label="价格" prop="price" width="120"></el-table-column>
<el-table-column label="生产日期" prop="productionDate" width="120"></el-table-column>
<el-table-column label="失效日期" prop="expireDate" width="120"></el-table-column>
<el-table-column label="入库数量" prop="inCount" width="120"></el-table-column>
@ -250,7 +251,8 @@ export default {
expireDate: null,
supId: null,
deptCode: null,
invCode: null
invCode: null,
price: null,
}
};
},
@ -352,7 +354,8 @@ export default {
expireDate: row.expireDate,
supId: row.supId,
deptCode: row.deptCode,
invCode: row.invCode
invCode: row.invCode,
price: row.price
}
},
closeDetailDialog() {

@ -90,6 +90,12 @@
width="120"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="价格"
prop="price"
width="120"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="入库数量"
prop="inCount"
@ -198,6 +204,7 @@ export default {
this.invPreProductDetailQuery.batchNo = this.inputQuery.batchNo;
this.invPreProductDetailQuery.deptCode = this.inputQuery.deptCode;
this.invPreProductDetailQuery.invCode = this.inputQuery.invCode;
this.invProductDetailQuery.price = this.inputQuery.price;
// this.invPreProductDetailQuery.nameCode = this.inputQuery.nameCode;
getInvPreProductDetail(this.invPreProductDetailQuery).then((res) => {
this.loading = false;

@ -140,8 +140,9 @@
show-overflow-tooltip width="200"></el-table-column>
<el-table-column label="DI标识" prop="nameCode" width="140"></el-table-column>
<el-table-column label="物资名称" prop="cpmctymc" width="200"></el-table-column>
<el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip></el-table-column>
<el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip></el-table-column>
<el-table-column label="批次号" prop="batchNo" width="120"></el-table-column>
<el-table-column label="价格" prop="price" width="120"></el-table-column>
<!-- <el-table-column label="生产日期" prop="productionDate" width="120"></el-table-column>-->
<!-- <el-table-column label="失效日期" prop="expireDate" width="120"></el-table-column>-->
<!-- <el-table-column label="入库数量" prop="inCount" width="120"></el-table-column>-->
@ -270,7 +271,8 @@ export default {
expireDate: null,
supId: null,
deptCode: null,
invCode: null
invCode: null,
price:null,
},
addInvRemindSetDialogVisible: null,
invId: null
@ -375,7 +377,8 @@ export default {
expireDate: row.expireDate,
supId: row.supId,
deptCode: row.deptCode,
invCode: row.invCode
invCode: row.invCode,
price: row.price
}
},
closeDetailDialog() {

@ -88,6 +88,12 @@
width="120"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="价格"
prop="price"
width="120"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="入库数量"
prop="inCount"
@ -194,6 +200,7 @@ export default {
this.invProductDetailQuery.batchNo = this.inputQuery.batchNo;
this.invProductDetailQuery.deptCode = this.inputQuery.deptCode;
this.invProductDetailQuery.invCode = this.inputQuery.invCode;
this.invProductDetailQuery.price = this.inputQuery.price;
getInvProductDetail(this.invProductDetailQuery).then((res) => {
this.loading = false;
if (res.code === 20000) {

@ -129,6 +129,7 @@
<el-table-column label="物资名称" prop="cpmctymc" width="180" show-overflow-tooltip></el-table-column>
<el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip width="180"></el-table-column>
<el-table-column label="批次号" prop="batchNo" width="120"></el-table-column>
<el-table-column label="价格" prop="price" width="120"></el-table-column>
<el-table-column label="入库数量" prop="inCount" width="120"></el-table-column>
<el-table-column label="出库数量" prop="outCount" width="120"></el-table-column>
<el-table-column label="结余数量" prop="reCount" width="120"></el-table-column>
@ -229,7 +230,8 @@ export default {
expireDate: null,
supId: null,
deptCode: null,
invCode: null
invCode: null,
price: null,
}
};
},
@ -273,7 +275,7 @@ export default {
event.target.select();
},
clear(){
clear() {
this.findMethod();
},
@ -305,9 +307,9 @@ export default {
getInvListByUser(query)
.then((response) => {
this.invList = response.data || [];
for(var i=0;i< this.invList.length;i++){
if(this.invList[i].advanceType == 2){
this.filterQuery.invCode=this.invList[i].code;
for (var i = 0; i < this.invList.length; i++) {
if (this.invList[i].advanceType == 2) {
this.filterQuery.invCode = this.invList[i].code;
}
}
this.getList();
@ -348,7 +350,9 @@ export default {
expireDate: row.expireDate,
supId: row.supId,
deptCode: row.deptCode,
invCode: row.invCode
invCode: row.invCode,
invSpaceCode: row.invSpaceCode,
price: row.price
}
},
closeDetailDialog() {
@ -394,7 +398,7 @@ export default {
}
this.findMethod();
this.getInvList();
// this.getList();
// this.getList();
},
};
</script>

@ -128,6 +128,7 @@
<el-table-column label="物资名称" prop="cpmctymc" width="180" show-overflow-tooltip></el-table-column>
<el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip width="180"></el-table-column>
<el-table-column label="批次号" prop="batchNo" width="120"></el-table-column>
<el-table-column label="价格" prop="price" width="120"></el-table-column>
<el-table-column label="入库数量" prop="inCount" width="120"></el-table-column>
<el-table-column label="出库数量" prop="outCount" width="120"></el-table-column>
<el-table-column label="结余数量" prop="reCount" width="120"></el-table-column>
@ -228,7 +229,8 @@ export default {
expireDate: null,
supId: null,
deptCode: null,
invCode: null
invCode: null,
price: null,
}
};
},
@ -271,7 +273,7 @@ export default {
this.getList();
event.target.select();
},
clear(){
clear() {
this.findMethod();
},
@ -302,9 +304,9 @@ export default {
getInvListByUser(query)
.then((response) => {
this.invList = response.data || [];
for(var i=0;i< this.invList.length;i++){
if(this.invList[i].advanceType == 3){
this.filterQuery.invCode=this.invList[i].code;
for (var i = 0; i < this.invList.length; i++) {
if (this.invList[i].advanceType == 3) {
this.filterQuery.invCode = this.invList[i].code;
}
}
@ -346,7 +348,8 @@ export default {
expireDate: row.expireDate,
supId: row.supId,
deptCode: row.deptCode,
invCode: row.invCode
invCode: row.invCode,
price: row.price
}
},
closeDetailDialog() {

@ -129,6 +129,7 @@
<el-table-column label="物资名称" prop="cpmctymc" width="180" show-overflow-tooltip></el-table-column>
<el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip width="180"></el-table-column>
<el-table-column label="批次号" prop="batchNo" width="120"></el-table-column>
<el-table-column label="价格" prop="price" width="120"></el-table-column>
<el-table-column label="入库数量" prop="inCount" width="120"></el-table-column>
<el-table-column label="出库数量" prop="outCount" width="120"></el-table-column>
<el-table-column label="结余数量" prop="reCount" width="120"></el-table-column>
@ -251,7 +252,8 @@ export default {
expireDate: null,
supId: null,
deptCode: null,
invCode: null
invCode: null,
price: null,
},
addInvRemindSetDialogVisible: false,
invId: null
@ -282,7 +284,7 @@ export default {
this.getList();
event.target.select();
},
clear(){
clear() {
this.findMethod();
},
@ -324,7 +326,7 @@ export default {
getInvListByUser()
.then((response) => {
this.invLists = response.data || [];
this.invList = this.invLists.filter( item => item.code != 1000001 && item.code != 1000002)
this.invList = this.invLists.filter(item => item.code != 1000001 && item.code != 1000002)
this.getList();
})
.catch(() => {
@ -363,7 +365,9 @@ export default {
expireDate: row.expireDate,
supId: row.supId,
deptCode: row.deptCode,
invCode: row.invCode
invCode: row.invCode,
invSpaceCode: row.invSpaceCode,
price: row.price
}
},
closeDetailDialog() {

Loading…
Cancel
Save