1:东山nginx转发问题(头部参数修改);

2:再次领用;再次申购问题;
zyy_db
anthonywj 1 year ago
parent 266cf0c93c
commit b0b9786274

@ -5,7 +5,7 @@ VUE_APP_TITLE = UDI管理系统
ENV = 'development'
# 开发环境
VUE_APP_BASE_API = 'http://192.168.0.166:9991'
VUE_APP_BASE_API = 'http://127.0.0.1:9991'
VUE_APP_SYNC_API ="http://127.0.0.1:10001"

@ -14,10 +14,12 @@ ENV = 'production'
# 刘恩典
# VUE_APP_BASE_API = 'http://192.168.0.127:9150/UDI_WMS_MC/'
# VUE_APP_BASE_API = 'http://192.168.0.127:9160/UDI_WMS_MC/'
# 吴雨泽
# VUE_APP_BASE_API = 'http://192.168.0.67:9150/UDI_WMS_MC/'
# VUE_APP_BASE_API = 'http://192.168.0.127:9170/UDI_WMS_MC/'
# VUE_APP_BASE_API = 'http://dm.xmglxp.com:8082/UDI_WMS_MC/'
# VUE_APP_BASE_API = 'http://dm.xmglxp.com:82/UDI_WMS_MC/'
VUE_APP_BASE_API = 'http://dm.xmglxp.com:8001/UDI_WMS_MC/'
# 诏安总医院
# VUE_APP_BASE_API = 'http://192.168.8.58:9150/UDI_WMS_MC/'
@ -36,7 +38,6 @@ ENV = 'production'
# 平和县医院
# VUE_APP_BASE_API = 'http://192.168.0.43:9150/UDI_WMS_MC/'
# VUE_APP_BASE_API = 'http://127.0.0.1:9150/UDI_WMS_MC/'
# 长泰医院
@ -65,8 +66,16 @@ ENV = 'production'
# VUE_APP_BASE_API = 'http://192.168.0.67:9150/UDI_WMS_MC/'
# 东山
# VUE_APP_BASE_API = 'http://https://mudi.dsxyy.org/UDI_WMS_MC/'
VUE_APP_BASE_API = 'http://192.168.10.225:9150/UDI_WMS_MC/'
# VUE_APP_BASE_API = 'https://mudi.dsxyy.org/UDI_WMS_MC/'
# VUE_APP_BASE_API = 'http://151.122.122.146:9150/UDI_WMS_MC/'
# 南靖
# VUE_APP_BASE_API = 'http://192.168.10.225:9150/UDI_WMS_MC/'
# VUE_APP_BASE_API = 'http://192.168.73.128:9150/UDI_WMS_MC/'
# 测试NIGINX
# VUE_APP_BASE_API = 'https://test.udims.com/UDI_WMS_MC/'
# 应用访问路径 例如使用前缀 /admin/
VUE_APP_CONTEXT_PATH = '/UDI_WMS_NEW/'

@ -19,6 +19,14 @@ export function addDetail(query) {
});
}
export function repeatAdd(query) {
return axios({
url: "/udiwms/thrsys/order/repeatAdd",
method: "post",
data: query
});
}
export function getOrderDetail(query) {
return axios({

@ -34,8 +34,8 @@ service.interceptors.request.use(config => {
config.headers = {
ADMIN_ID: getAdminId(),
ADMIN_TOKEN: getToken()
ADMINID: getAdminId(),
ADMINTOKEN: getToken()
};

@ -617,8 +617,8 @@ export default {
init() {
this.uploadFileUrl = process.env.VUE_APP_BASE_API + '/udiwms/bussinessType/file/upload'
this.headers = {
ADMIN_ID: store.getters.adminId,
ADMIN_TOKEN: store.getters.token
ADMINID: store.getters.adminId,
ADMINTOKEN: store.getters.token
}
},
getSyncConfig() {

@ -206,8 +206,8 @@ export default {
this.inputQuery.inspectImage = null
this.uploadUrl = this.BASE_URL + "/udiwms/upload/register/file";
this.headers = {
ADMIN_ID: store.getters.adminId,
ADMIN_TOKEN: store.getters.token,
ADMINID: store.getters.adminId,
ADMINTOKEN: store.getters.token,
};
},
}

@ -559,8 +559,8 @@ export default {
}
this.uploadUrl = this.BASE_URL + "/udiwms/upload/register/file";
this.headers = {
ADMIN_ID: store.getters.adminId,
ADMIN_TOKEN: store.getters.token,
ADMINID: store.getters.adminId,
ADMINTOKEN: store.getters.token,
};
this.repairOrder.uploadImage = null;
this.getDeptList();

@ -640,8 +640,8 @@ export default {
created() {
this.uploadUrl = this.BASE_URL + "/udiwms/upload/register/file";
this.headers = {
ADMIN_ID: store.getters.adminId,
ADMIN_TOKEN: store.getters.token,
ADMINID: store.getters.adminId,
ADMINTOKEN: store.getters.token,
};
this.repairOrder.deptCode = this.$store.getters.locDeptCode
this.repairOrder.invCode = this.$store.getters.locInvCode

@ -483,8 +483,8 @@ export default {
created() {
this.uploadUrl = this.BASE_URL + "/udiwms/upload/register/file";
this.headers = {
ADMIN_ID: store.getters.adminId,
ADMIN_TOKEN: store.getters.token,
ADMINID: store.getters.adminId,
ADMINTOKEN: store.getters.token,
};
this.repairOrder.repariImage = null;
this.getDeptList();

@ -288,8 +288,8 @@ export default {
// }
this.getBasicUnitMaintainsList();
this.headers = {
ADMIN_ID: store.getters.adminId,
ADMIN_TOKEN: store.getters.token,
ADMINID: store.getters.adminId,
ADMINTOKEN: store.getters.token,
};
},
components: {

@ -286,8 +286,8 @@ export default {
// }
this.getBasicUnitMaintainsList();
this.headers = {
ADMIN_ID: store.getters.adminId,
ADMIN_TOKEN: store.getters.token,
ADMINID: store.getters.adminId,
ADMINTOKEN: store.getters.token,
};
},
components: {

@ -285,8 +285,8 @@ export default {
// }
this.getBasicUnitMaintainsList();
this.headers = {
ADMIN_ID: store.getters.adminId,
ADMIN_TOKEN: store.getters.token,
ADMINID: store.getters.adminId,
ADMINTOKEN: store.getters.token,
};
},
components: {

@ -564,8 +564,8 @@ export default {
created() {
this.uploadUrl = this.BASE_URL + "/udiwms/upload/register/file";
this.headers = {
ADMIN_ID: store.getters.adminId,
ADMIN_TOKEN: store.getters.token,
ADMINID: store.getters.adminId,
ADMINTOKEN: store.getters.token,
};
if (this.formData.formData == null) {
this.formData = {}

@ -326,8 +326,8 @@ export default {
created() {
this.uploadUrl = this.BASE_URL + "/udiwms/upload/register/file";
this.headers = {
ADMIN_ID: store.getters.adminId,
ADMIN_TOKEN: store.getters.token,
ADMINID: store.getters.adminId,
ADMINTOKEN: store.getters.token,
};
if (this.formData.formData == null) {
this.formData = {}

@ -730,8 +730,8 @@ export default {
created() {
this.uploadUrl = this.BASE_URL + "/udiwms/upload/register/file";
this.headers = {
ADMIN_ID: store.getters.adminId,
ADMIN_TOKEN: store.getters.token,
ADMINID: store.getters.adminId,
ADMINTOKEN: store.getters.token,
};
this.getOrderDetail();
},

@ -768,8 +768,8 @@ export default {
created() {
this.uploadUrl = this.BASE_URL + "/udiwms/upload/register/file";
this.headers = {
ADMIN_ID: store.getters.adminId,
ADMIN_TOKEN: store.getters.token,
ADMINID: store.getters.adminId,
ADMINTOKEN: store.getters.token,
};
this.getOrderDetail();
},

@ -785,8 +785,8 @@ export default {
created() {
this.uploadUrl = this.BASE_URL + '/udiwms/upload/register/file'
this.headers = {
ADMIN_ID: store.getters.adminId,
ADMIN_TOKEN: store.getters.token
ADMINID: store.getters.adminId,
ADMINTOKEN: store.getters.token
}
if(this.curInvoice.id!=null){
this.inputQuery=this.curInvoice

@ -125,7 +125,7 @@
<el-table-column label="批次号" prop="batchNo" width="120" show-overflow-tooltip="true"></el-table-column>
<el-table-column label="价格" prop="price" width="100" show-overflow-tooltip="true"></el-table-column>
<el-table-column label="计量单位" prop="measname" show-overflow-tooltip="true" width="100"></el-table-column>
<el-table-column label="领用数量" width="160">
<el-table-column label="领用数量" width="160">
<template slot-scope="scope">
<el-input v-model="scope.row.count"
placeholder="请输入数量" style="width: 80%"
@ -139,7 +139,7 @@
<el-table-column label="注册/备案号" prop="zczbhhzbapzbh" width="180"></el-table-column>
<el-table-column label="生产厂家" prop="manufactory" width="180"></el-table-column>
<el-table-column label="供应商" prop="supName" width="180"></el-table-column>
<el-table-column label="操作" width="150" fixed="right">
<el-table-column label="操作" width="150" fixed="right">
<template slot-scope="scope">
<el-button type="text" size="small" :disabled="!ischeck || scope.row.index != selectedIndex"
@click.stop="true"
@ -183,8 +183,9 @@ import {getBusChange} from "@/api/basic/busTypeChange";
import {inserThrOrderWeb, updateReceive, updateReceiveDetail, delReceiveDetail} from "@/api/thrsys/thrOrderReceive";
import {filterSubByInv, findByFrom, findByUp, findInvByUser, findLyInv} from "@/api/system/invSubWarehouse";
import dialogInvProduct from "../DialogSelectInvProduct";
import {getOrderDetail} from "@/api/inout/receiveOrder";
import {addDetail, getOrderDetail, repeatAdd} from "@/api/inout/receiveOrder";
import {parseTime} from "@/utils/coTools";
import {listApplyDetail} from "@/api/purchase/purApply";
export default {
name: "idQuery",
@ -205,6 +206,10 @@ export default {
type: Object,
required: true,
},
isRepeat: {
type: Boolean,
required: true,
},
},
data() {
return {
@ -269,6 +274,7 @@ export default {
type: 1,
Receive: null,
ischeck: false,
};
},
components: {
@ -527,6 +533,29 @@ export default {
this.total = 0;
});
},
getDetailByRepeat(value) {
this.query = {
orderIdFk: value
}
getOrderDetail(this.query) //
.then((response) => {
this.codeArray = response.data.list || [];
this.total = response.data.total || 0;
this.loading = false;
this.codeArray.forEach(item => {
item.orderIdFk = this.pId
})
})
.catch(() => {
this.loading = false;
this.list = [];
this.total = 0;
});
}
},
filters: {},
mounted() {
@ -547,17 +576,54 @@ export default {
} else {
this.editType = false;
let date = new Date();
this.formData = {
invCode: this.$store.getters.locInvCode,
targetInvCode: null,
billType: "HCLY",
billNo: null,
createTime: parseTime(
date,
"{y}-{m}-{d} {h}:{i}:{s}"
),
};
this.orderEditor = false;
if (this.isRepeat) {
this.formData = this.idQuery.formData;
let query = {
orderIdFk: this.formData.billNo
}
getOrderDetail(query) //
.then((response) => {
let codeArray = response.data.list || [];
this.loading = false;
let repeatQuery = {
purReceiveEntity: this.formData,
datas: codeArray
}
repeatAdd(repeatQuery).then((response) => {
this.loading = false;
if (response.code === 20000) {
this.formData = response.data;
this.getOrderDetailList()
} else {
this.$message.error(response.message);
}
}).catch(() => {
this.loading = false;
});
// codeArray.forEach(item => {
//
// })
})
.catch(() => {
this.loading = false;
this.list = [];
this.total = 0;
});
} else {
this.formData = {
invCode: this.$store.getters.locInvCode,
targetInvCode: null,
billType: "HCLY",
billNo: null,
createTime: parseTime(
date,
"{y}-{m}-{d} {h}:{i}:{s}"
),
};
this.orderEditor = false;
}
}
this.getBusType();

@ -160,12 +160,7 @@
</div>
</template>
<script>
import {delThrOrders, delAll, downloadAll} from "@/api/thrsys/thrOrder";
import {getLocalJoinByUser} from "@/api/basic/busType";
import {getOriginBusType} from "@/api/basic/busOriginType";
import {delReceive} from "@/api/thrsys/thrOrderReceive";
import {filterDetailByKey} from "@/api/basic/basicThirdSys";
import {selectIp} from "@/api/param/systemParamConfig";
import thrOrderNew from "./DialogNewReceive";
import {getOrderDetail, getReceiveOrder, printOrder} from "@/api/inout/receiveOrder";
import {getBusChange} from "@/api/basic/busTypeChange";

@ -125,11 +125,12 @@
<el-table-column label="审核时间" prop="auditTime"
sortable="custom" :sort-orders="['ascending', 'descending']"></el-table-column>
<el-table-column label="操作">
<el-table-column label="操作" width="140">
<template slot-scope="scope">
<el-button type="text" size="small" @click.native.stop="printOrder(scope.row)"
>打印
</el-button>
<el-button type="text" size="small" @click.native.stop="repeatOrder(scope.row)">再次领用</el-button>
</template>
</el-table-column>
@ -169,6 +170,23 @@
:idQuery="idQuery"
></auditDetail>
</el-dialog>
<el-dialog
title="编辑领用单"
:visible.sync="pureApplyEditVisible"
width="80%"
v-if="pureApplyEditVisible"
@close='closeDialog'
:close-on-click-modal="false"
:close-on-press-escape="false"
>
<dialogNewReceive
:closeDialog="closeDialog"
:idQuery="idQuery"
:isRepeat=true
></dialogNewReceive>
</el-dialog>
</div>
</template>
<script>
@ -177,6 +195,7 @@ import {getOrderDetail, getReceiveOrder, printOrder} from "@/api/inout/receiveOr
import auditDetail from "@/views/inout/receive/receiveAuditDetail"
import {delReceive} from "@/api/thrsys/thrOrderReceive";
import {filterSubAll, findInvByUser} from "@/api/system/invSubWarehouse";
import dialogNewReceive from "./DialogNewReceive";
export default {
data() {
@ -201,10 +220,11 @@ export default {
3: "已审核",
4: "已拒绝"
},
idQuery: null,
idQuery: {},
invList: [],
invCodebe: null,
newSpDistributionVisible: false,
pureApplyEditVisible: false,
total: 0,
thirdSys: [],
thirdSysDetail: null,
@ -458,14 +478,26 @@ export default {
});
},
/**
* 再次领用
* @param row
*/
repeatOrder(row) {
this.idQuery.formData = row;
this.pureApplyEditVisible = true;
},
closeDialog() {
this.newSpDistributionVisible = false;
this.pureApplyEditVisible = false;
},
},
components: {
auditDetail
auditDetail, dialogNewReceive
},
mounted() {
},

@ -364,8 +364,8 @@ export default {
created() {
this.uploadUrl = this.BASE_URL + "/udiwms/upload/register/file";
this.headers = {
ADMIN_ID: store.getters.adminId,
ADMIN_TOKEN: store.getters.token,
ADMINID: store.getters.adminId,
ADMINTOKEN: store.getters.token,
};
if (this.inputQuery.formData == null) {
this.formData = {}

@ -359,8 +359,8 @@ export default {
created() {
this.uploadUrl = this.BASE_URL + "/udiwms/upload/register/file";
this.headers = {
ADMIN_ID: store.getters.adminId,
ADMIN_TOKEN: store.getters.token,
ADMINID: store.getters.adminId,
ADMINTOKEN: store.getters.token,
};
if (this.inputQuery.formData == null) {
this.formData = {}

@ -422,8 +422,8 @@ export default {
}
this.getBasicUnitMaintainsList();
this.headers = {
ADMIN_ID: store.getters.adminId,
ADMIN_TOKEN: store.getters.token,
ADMINID: store.getters.adminId,
ADMINTOKEN: store.getters.token,
};
this.inputQuery=this.inputEdit
if (this.inputQuery.areaCode != null)

@ -528,7 +528,7 @@ export default {
this.total = response.data.total || 0;
this.loading = false;
this.codeArray.forEach(item => {
item.orderIdFk = value
item.orderIdFk = this.pId
})
})
@ -550,7 +550,6 @@ export default {
};
},
created() {
debugger
if (this.$isNotBlank(this.idQuery.id)) {
this.query.limit = 100;
this.pId = this.idQuery.id;
@ -573,9 +572,7 @@ export default {
if (response.code === 20000) {
this.pId = response.data
this.formData.id = this.pId
this.$nextTick(res => {
this.getDetailByRepeat(orderId)
});
this.getDetailByRepeat(orderId)
}
}).catch(() => {

@ -489,6 +489,7 @@ export default {
closeDialog() {
this.newSpDistributionVisible = false;
this.pureApplyEditVisible = false;
this.getList();
this.detailList = [];
},

@ -1144,8 +1144,8 @@ export default {
},
created() {
this.headers = {
ADMIN_ID: store.getters.adminId,
ADMIN_TOKEN: store.getters.token,
ADMINID: store.getters.adminId,
ADMINTOKEN: store.getters.token,
};
this.getBusType();

@ -394,8 +394,8 @@ export default {
components: {},
created() {
this.headers = {
ADMIN_ID: store.getters.adminId,
ADMIN_TOKEN: store.getters.token,
ADMINID: store.getters.adminId,
ADMINTOKEN: store.getters.token,
};
this.getSyncConfig();
this.getList();

@ -345,8 +345,8 @@ export default {
},
created() {
this.headers = {
ADMIN_ID: store.getters.adminId,
ADMIN_TOKEN: store.getters.token,
ADMINID: store.getters.adminId,
ADMINTOKEN: store.getters.token,
};
this.getList();
this.getConfig();

@ -283,8 +283,8 @@ export default {
created() {
this.uploadUrl = this.BASE_URL + "/udiwms/upload/register/file";
this.headers = {
ADMIN_ID: store.getters.adminId,
ADMIN_TOKEN: store.getters.token,
ADMINID: store.getters.adminId,
ADMINTOKEN: store.getters.token,
};
if( isBlank(this.from.id)){

@ -747,8 +747,8 @@ export default {
this.getModuleList();
this.uploadUrl = this.BASE_URL + "/udiwms/upload/pdf/template";
this.headers = {
ADMIN_ID: store.getters.adminId,
ADMIN_TOKEN: store.getters.token,
ADMINID: store.getters.adminId,
ADMINTOKEN: store.getters.token,
};
}
};

@ -748,8 +748,8 @@ export default {
this.getModuleList();
this.uploadUrl = this.BASE_URL + "/udiwms/upload/pdf/template";
this.headers = {
ADMIN_ID: store.getters.adminId,
ADMIN_TOKEN: store.getters.token,
ADMINID: store.getters.adminId,
ADMINTOKEN: store.getters.token,
};
}
};

@ -747,8 +747,8 @@ export default {
this.getModuleList();
this.uploadUrl = this.BASE_URL + "/udiwms/upload/pdf/template";
this.headers = {
ADMIN_ID: store.getters.adminId,
ADMIN_TOKEN: store.getters.token,
ADMINID: store.getters.adminId,
ADMINTOKEN: store.getters.token,
};
}
};

@ -747,8 +747,8 @@ export default {
this.getModuleList();
this.uploadUrl = this.BASE_URL + "/udiwms/upload/pdf/template";
this.headers = {
ADMIN_ID: store.getters.adminId,
ADMIN_TOKEN: store.getters.token,
ADMINID: store.getters.adminId,
ADMINTOKEN: store.getters.token,
};
}
};

@ -818,8 +818,8 @@ export default {
this.uploadUrl = this.BASE_URL + "/udiwms/upload/pdf/template/jasper";
this.uploadJrxmlUrl = this.BASE_URL + "/udiwms/upload/pdf/template/jrxml";
this.headers = {
ADMIN_ID: this.$store.getters.adminId,
ADMIN_TOKEN: this.$store.getters.token,
ADMINID: this.$store.getters.adminId,
ADMINTOKEN: this.$store.getters.token,
};
}
};

Loading…
Cancel
Save