@@ -164,10 +163,11 @@
- 检验报告预览
+ style="text-align:right" @click="showImgViewer">
+ 检验报告预览
-
+
@@ -183,11 +183,10 @@ import draggable from "vuedraggable";
import store from "@/store";
import {updateById} from '@/api/inout/orderDetailBiz'
import {updateOrderDetailBiz} from '@/api/inout/order'
-import { previewImage } from '@/api/purchase/supCompany'
+import {previewImage} from '@/api/purchase/supCompany'
import ElImageViewer from "element-ui/packages/image/src/image-viewer";
-
export default {
name: "DialogCheck",
props: {
@@ -208,19 +207,20 @@ export default {
},
data() {
return {
- imgList:[],
- imgViewerVisible:false,
+ imgList: [],
+ imgViewerVisible: false,
BASE_URL: process.env.VUE_APP_BASE_API,
+ IMAGE_URL: process.env.VUE_APP_SYNC_API,
code: "",
formData: {
- ggxh:"",
- cpmctymc:"",
- machineNo:"",
- invoiceCode:"",
- invoiceEncode:"",
- price:"",
- remark:"",
- licenseUrl:""
+ ggxh: "",
+ cpmctymc: "",
+ machineNo: "",
+ invoiceCode: "",
+ invoiceEncode: "",
+ price: "",
+ remark: "",
+ licenseUrl: ""
},
// formRules: {
// name: [
@@ -239,20 +239,20 @@ export default {
};
},
components: {
- draggable,ElImageViewer
+ draggable, ElImageViewer
},
methods: {
submitUpload() {
- updateById(this.inputQuery).then((res) =>{
- if(res.code==20000){
- this.$message({
- type: "success",
- message: "修改成功！",
- });
- this.closeDialog();
- }
+ updateById(this.inputQuery).then((res) => {
+ if (res.code == 20000) {
+ this.$message({
+ type: "success",
+ message: "修改成功！",
+ });
+ this.closeDialog();
+ }
- } )
+ })
},
@@ -299,8 +299,8 @@ export default {
//
// },
uploadHandleRemove(file, fileList) {
- this.inputQuery.filePath=null;
- this.inputQuery.checkFileName=null;
+ this.inputQuery.filePath = null;
+ this.inputQuery.checkFileName = null;
console.log(file, fileList);
},
uploadHandlePreview(file) {
@@ -311,7 +311,7 @@ export default {
this.$message.warning(`当前限制选择 1 个文件，本次选择了 ${files.length} 个文件，共选择了 ${files.length + fileList.length} 个文件`);
},
uploadOnchange(file, fileList) {
- this.inputQuery.checkFileName=file.name;
+ this.inputQuery.checkFileName = file.name;
let fileName = file.name;
let uid = file.uid
let pos = fileName.lastIndexOf(".");
@@ -340,7 +340,7 @@ export default {
uploadHandleSuccess(response, file, fileList) {
if (response.code === 20000) {
this.inputQuery.filePath = response.data.name;
- // this.onSubmit();
+ // this.onSubmit();
} else {
this.$message.error("文件上传失败：" + response.message);
}
@@ -349,24 +349,28 @@ export default {
},
- showImgViewer(row){
- this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name=";
- this.imgList=[];
- previewImage({imageUrl:this.inputQuery.filePath,certFileUrl:this.certFileUrl}).then(response => {
+ showImgViewer(row) {
+ this.certFileUrl = this.IMAGE_URL + "/mapi" + "/udiwms/image/register/file/getImage?type=image2&name=";
+ this.imgList = [];
+ previewImage({imageUrl: this.inputQuery.filePath, certFileUrl: this.certFileUrl}).then(response => {
if (response.code === 20000) {
- this.imgList=response.data;
+ this.imgList = response.data;
}
console.log(this.imgList)
this.imgViewerVisible = true;
});
- const m = (e) => { e.preventDefault() };
+ const m = (e) => {
+ e.preventDefault()
+ };
document.body.style.overflow = 'hidden';
document.addEventListener("touchmove", m, false); // 禁止页面滑动
},
- closeImgViewer(){
+ closeImgViewer() {
this.imgViewerVisible = false;
- const m = (e) => { e.preventDefault() };
+ const m = (e) => {
+ e.preventDefault()
+ };
document.body.style.overflow = 'auto';
document.removeEventListener("touchmove", m, true);
},
diff --git a/src/views/inout/InvoiceCkeck.vue b/src/views/inout/InvoiceCkeck.vue
index 27271b70..76982252 100644
--- a/src/views/inout/InvoiceCkeck.vue
+++ b/src/views/inout/InvoiceCkeck.vue
@@ -166,7 +166,7 @@
row-key="id"
highlight-current-row
>
-
+
@@ -264,7 +264,7 @@ import AcceptOrder from "@/views/inout/DialogReviewOrder";
import DialogInvoice from "@/views/inout/DialogInvoice";
import InvoiceRegister from "@/views/inout/InvoiceRegister";
-import { previewImage } from "@/api/purchase/supCompany";
+import {previewImage} from "@/api/purchase/supCompany";
import ElImageViewer from "element-ui/packages/image/src/image-viewer";
import store from "@/store";
@@ -318,6 +318,7 @@ export default {
imgList: [],
imgViewerVisible: false,
BASE_URL: process.env.VUE_APP_BASE_API,
+ IMAGE_URL: process.env.VUE_APP_SYNC_API,
showSearch: true,
filterQuery: {
id: "",
@@ -341,16 +342,16 @@ export default {
},
formRules: {
machineNo: [
- { required: true, message: "请输入机械编码", trigger: "blur" },
+ {required: true, message: "请输入机械编码", trigger: "blur"},
],
invoiceCode: [
- { required: true, message: "请输入发票代码", trigger: "blur" },
+ {required: true, message: "请输入发票代码", trigger: "blur"},
],
invoiceEncode: [
- { required: true, message: "请输入发票编码", trigger: "blur" },
+ {required: true, message: "请输入发票编码", trigger: "blur"},
],
- price: [{ required: true, message: "请输入发票价格", trigger: "blur" }],
- invoiceDate: [{ required: true, message: "请输入日期", trigger: "blur" }],
+ price: [{required: true, message: "请输入发票价格", trigger: "blur"}],
+ invoiceDate: [{required: true, message: "请输入日期", trigger: "blur"}],
},
certFileUrl: "",
Upinvoice: false,
@@ -471,7 +472,7 @@ export default {
subRow: null,
};
},
- components: { AcceptOrder, DialogInvoice, InvoiceRegister, ElImageViewer },
+ components: {AcceptOrder, DialogInvoice, InvoiceRegister, ElImageViewer},
methods: {
onSubmit() {
if (this.invoiceRow == null) {
@@ -517,7 +518,8 @@ export default {
});
},
- uploadHandleError() {},
+ uploadHandleError() {
+ },
uploadHandleSuccess(response, file, fileList) {
debugger;
if (response.code === 20000) {
@@ -646,11 +648,12 @@ export default {
.then((res) => {
this.closeDialog();
})
- .catch((error) => {});
+ .catch((error) => {
+ });
},
showImgViewer(row) {
this.certFileUrl =
- this.BASE_URL +
+ this.IMAGE_URL + "/mapi" +
"/udiwms/image/register/file/getImage?type=image2&name=";
this.imgList = [];
previewImage({
diff --git a/src/views/inout/InvoiceRegistration.vue b/src/views/inout/InvoiceRegistration.vue
index 1e36cefe..812b3870 100644
--- a/src/views/inout/InvoiceRegistration.vue
+++ b/src/views/inout/InvoiceRegistration.vue
@@ -196,7 +196,9 @@
- 确认
+ 确认
+
@@ -225,7 +227,7 @@
单据 {{ currentRow.billNo }}-单据详情
-
@@ -325,7 +327,7 @@
:total="codeTotal"
:page.sync="codeQuery.page"
:limit.sync="codeQuery.limit"
- @pagination="getOrderDetails"
+ @pagination="getCodeDetailList"
/>
@@ -337,11 +339,14 @@
单据 {{ currentRow.billNo }}-发票信息
-
-
+
-
+
-
-
-
import {
deleteByOrderId,
- getOrderList, rollUnReceivebackOrder, filterInvoice, filterOrder,filterOrderList
+ getOrderList, rollUnReceivebackOrder, filterInvoice, filterOrder, filterOrderList
} from '../../api/inout/order'
import {getLocalJoinByUser} from "@/api/basic/busType";
import {getInvListByUser} from "@/api/system/invWarehouse";
@@ -552,13 +551,14 @@ export default {
name: "IoCheckSuccessOrder",
data() {
return {
- savebillno:null,
- invoiceRow:[],
- inputInv:[],
- checkInvoice:false,
+ savebillno: null,
+ invoiceRow: [],
+ inputInv: [],
+ checkInvoice: false,
imgList: [],
imgViewerVisible: false,
BASE_URL: process.env.VUE_APP_BASE_API,
+ IMAGE_URL: process.env.VUE_APP_SYNC_API,
showSearch: true,
filterQuery: {
id: "",
@@ -572,17 +572,17 @@ export default {
endTime: null,
invCode: this.$store.getters.locInvCode,
},
- Refresh:{
- id:"",
- orderIdFk:null,
- bizIdFk:"",
+ Refresh: {
+ id: "",
+ orderIdFk: null,
+ bizIdFk: "",
},
determineVisible: false,
- determineData:null,
+ determineData: null,
corpLoading: false,
fromOptions: [],
- regId:null,
- par:[],
+ regId: null,
+ par: [],
formName: 1,
formMap: {
@@ -711,7 +711,7 @@ export default {
subRow: null,
};
},
- components: {AcceptOrder, DialogInvoice, InvoiceRegister, ElImageViewer,InvoiceRegistrationDetermine,checkInvoice},
+ components: {AcceptOrder, DialogInvoice, InvoiceRegister, ElImageViewer, InvoiceRegistrationDetermine, checkInvoice},
methods: {
// upData(data){
// this.invoiceRow = data;
@@ -732,21 +732,21 @@ export default {
endTime: null,
invCode: this.$store.getters.locInvCode,
};
- this.actDateRange=[];
- this.auditDateRange=[];
+ this.actDateRange = [];
+ this.auditDateRange = [];
this.getList();
},
- InvoiceRegister1(row){
- this.savebillno=row.billNo
- this.inputInv=row;
- this.checkInvoice=true;
+ InvoiceRegister1(row) {
+ this.savebillno = row.billNo
+ this.inputInv = row;
+ this.checkInvoice = true;
},
- closecheckInvoice(){
- this.checkInvoice=false;
+ closecheckInvoice() {
+ this.checkInvoice = false;
this.getList();
- this.currentRow.billNo=this.savebillno;
- this.bizQuery.orderIdFk=this.savebillno;
- this.codeQuery.orderIdFk=this.savebillno;
+ this.currentRow.billNo = this.savebillno;
+ this.bizQuery.orderIdFk = this.savebillno;
+ this.codeQuery.orderIdFk = this.savebillno;
this.getCodeDetailList();
this.getBizDetailListInv();
@@ -777,7 +777,7 @@ export default {
this.showSearch = !this.showSearch;
},
showImgViewer(row) {
- this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name=";
+ this.certFileUrl = this.IMAGE_URL + "/mapi" + "/udiwms/image/register/file/getImage?type=image2&name=";
this.imgList = [];
previewImage({imageUrl: row.licenseUrl, certFileUrl: this.certFileUrl}).then(response => {
if (response.code === 20000) {
@@ -836,8 +836,8 @@ export default {
type: "warning",
})
.then(() => {
- this.par=row;
- this.par.regId=this.regId;
+ this.par = row;
+ this.par.regId = this.regId;
deleteById(row)
.then((response) => {
if (response.code == 20000) {
@@ -1039,11 +1039,11 @@ export default {
return;
}
this.bizDetailLoading = true;
- if(row != null) {
- this.bizQuery.orderIdFk=row.orderIdFk;
+ if (row != null) {
+ this.bizQuery.orderIdFk = row.orderIdFk;
this.bizQuery.batchNo = row.batchNo;
this.bizQuery.relId = row.bindRlFk;
- // this.bizQuery.bizIdFk = row.id;
+ // this.bizQuery.bizIdFk = row.id;
}
filterListInvoice(this.bizQuery).then((res) => {
this.bizDetailLoading = false;
@@ -1065,14 +1065,14 @@ export default {
BizDetail(row) {
- this.regId=row.id;
+ this.regId = row.id;
this.bizQuery.page = 1;
this.subRow = row;
this.getBizDetailListInv(row);
},
- determine(row){
- this.determineData=row;
- this.determineVisible=true;
+ determine(row) {
+ this.determineData = row;
+ this.determineVisible = true;
},
//单据撤回
@@ -1134,9 +1134,9 @@ export default {
return statusMap[status];
},
- getNewInv (row){
- this.Refresh.orderIdFk=row.billNo;
- addBizProduct(this.Refresh).then( (res) => {
+ getNewInv(row) {
+ this.Refresh.orderIdFk = row.billNo;
+ addBizProduct(this.Refresh).then((res) => {
if (res.code === 20000) {
this.$message.success("刷新成功!");
this.getList();
diff --git a/src/views/inout/receive/DialogNewReceive.vue b/src/views/inout/receive/DialogNewReceive.vue
index b96a73f2..ca10d3df 100644
--- a/src/views/inout/receive/DialogNewReceive.vue
+++ b/src/views/inout/receive/DialogNewReceive.vue
@@ -440,33 +440,34 @@ export default {
}
},
deleteCodeArray(index, row) {
+ let _this = this
this.$confirm("此操作将永久删除该数据, 是否继续?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
}).then(() => {
- if (this.orderEditor) {
- this.detailLoading = true;
- if (this.$isNotBlank(row.id)) {
+ if (_this.formData.billNo) {
+ _this.detailLoading = true;
+ if (_this.$isNotBlank(row.id)) {
delReceiveDetail({id: row.id})
.then(response => {
- this.detailLoading = false;
+ _this.detailLoading = false;
if (response.code === 20000) {
- this.getOrderDetailList();
+ _this.getOrderDetailList();
} else {
- this.$message.error(response.message);
+ _this.$message.error(response.message);
}
})
.catch(() => {
- this.detailLoading = false;
+ _this.detailLoading = false;
})
} else {
- this.$message.success('删除成功');
- this.codeArray.splice(index, 1);
+ _this.$message.success('删除成功');
+ _this.codeArray.splice(index, 1);
}
} else {
- this.$message.success('删除成功');
- this.codeArray.splice(index, 1);
+ _this.$message.success('删除成功');
+ _this.codeArray.splice(index, 1);
}
}).catch(() => {
diff --git a/src/views/inventory/InvCheckPlace.vue b/src/views/inventory/InvCheckPlace.vue
new file mode 100644
index 00000000..e7ed1905
--- /dev/null
+++ b/src/views/inventory/InvCheckPlace.vue
@@ -0,0 +1,318 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.name }}
+
+
+
+
+
+
+
+
+ {{ item.name }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 显示/隐藏搜索栏
+ 重置
+ 查询
+ 货位变更
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.name }}
+
+
+
+
+
+
+
+
+ {{ item.name }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 显示/隐藏搜索栏
+ 重置
+ 查询
+ 物资下架
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+