diff --git a/src/api/inout/orderDetailBiz.js b/src/api/inout/orderDetailBiz.js
index 7b8795b..fc89016 100644
--- a/src/api/inout/orderDetailBiz.js
+++ b/src/api/inout/orderDetailBiz.js
@@ -51,5 +51,23 @@ export function getCheckDetailList(params) {
}
+export function updateOrder(params) {
+ return axios({
+ url: "/udiwms/inout/order/updateOrder",
+ method: "post",
+ data: params
+ });
+}
+
+export function filterBizOrderList(params) {
+ return axios({
+ url: "/udiwms/inout/bizDetail/filterBizOrderList",
+ method: "get",
+ params: params
+ });
+}
+
+
+
diff --git a/src/views/inout/InvoiceRegistration.vue b/src/views/inout/InvoiceRegistration.vue
index 4ec334b..3b9b1ce 100644
--- a/src/views/inout/InvoiceRegistration.vue
+++ b/src/views/inout/InvoiceRegistration.vue
@@ -171,6 +171,19 @@
+
+
+ {{
+ checkDateStatus[scope.row.checkStatus]
+ }}
+
+
+
+
+
+ 确认
+
+
+
+
+
+
+
@@ -432,7 +460,7 @@ import {getCodeList} from "@/api/inout/code";
import AcceptOrder from "@/views/inout/DialogReviewOrder";
import DialogInvoice from "@/views/inout/DialogInvoice";
import InvoiceRegister from "@/views/inout/InvoiceRegister";
-
+import InvoiceRegistrationDetermine from "@/views/inout/InvoiceRegistrationDetermine"
import {inspectionOrderPDFFromTemplateFile, orderPDFFromTemplateFile} from "@/api/itextpdf/orderPrint"
import {getDeptListByUser} from "@/api/auth/authDept";
import {getBasicUnitMaintains} from "@/api/basic/basicUnitMaintain";
@@ -467,7 +495,8 @@ export default {
endTime: null,
invCode: this.$store.getters.locInvCode,
},
-
+ determineVisible: false,
+ determineData:null,
corpLoading: false,
fromOptions: [],
@@ -490,6 +519,11 @@ export default {
8: "审核拒绝",
9: "正在处理", 10: "待审核",
},
+
+ checkDateStatus: {
+ 1: "确认",
+ 0: "未确认",
+ },
storageList: [],
invList: [],
deptList: [],
@@ -593,7 +627,7 @@ export default {
subRow: null,
};
},
- components: {AcceptOrder, DialogInvoice, InvoiceRegister, ElImageViewer},
+ components: {AcceptOrder, DialogInvoice, InvoiceRegister, ElImageViewer,InvoiceRegistrationDetermine},
methods: {
onReset() {
this.$router.push({
@@ -950,7 +984,10 @@ export default {
this.subRow = row;
this.getBizDetailList(row);
},
-
+ determine(row){
+ this.determineData=row;
+ this.determineVisible=true;
+ },
//单据撤回
rollback(row) {
@@ -984,6 +1021,12 @@ export default {
this.getBizDetailList(row);
},
+ //验收结束
+ closeDetermineDialog() {
+ this.determineVisible = false;
+ this.getList();
+ },
+
//开始验收
reviewOrder(row) {
this.acceptQuery = row;
diff --git a/src/views/inout/InvoiceRegistrationDetermine.vue b/src/views/inout/InvoiceRegistrationDetermine.vue
new file mode 100644
index 0000000..c5eb8a2
--- /dev/null
+++ b/src/views/inout/InvoiceRegistrationDetermine.vue
@@ -0,0 +1,497 @@
+
+
+
+
+
+
+
+ 确认
+ 取消
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 单据 {{ determineData.billNo }}-单据详情
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 单据 {{ determineData.billNo }}-发票信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 预览
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/vue.config.js b/vue.config.js
index 17b0105..d246608 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -35,7 +35,7 @@ module.exports = {
proxy: {
// detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: {
- target: `http://192.168.0.166:9993/`,
+ target: `http://192.168.0.43:9993/`,
changeOrigin: true,
pathRewrite: {
['^' + process.env.VUE_APP_BASE_API]: ''