diff --git a/vue/src/components/Pagination/index.vue b/vue/src/components/Pagination/index.vue
index a7324e3c..ac5fe9f0 100644
--- a/vue/src/components/Pagination/index.vue
+++ b/vue/src/components/Pagination/index.vue
@@ -35,7 +35,7 @@ export default {
pageSizes: {
type: Array,
default() {
- return [15, 200, 300, 500]
+ return [15, 50, 100, 500]
}
},
layout: {
diff --git a/vue/src/router/index.js b/vue/src/router/index.js
index a9e99552..e5bf88ec 100644
--- a/vue/src/router/index.js
+++ b/vue/src/router/index.js
@@ -85,7 +85,7 @@ export const constantRoutes = [
children: [
{
path: 'dashboard',
- component: () => import('@/views/dashboard/admin/index'),
+ component: () => import('@/views/pg-fis/basedate/m100Online'),
name: 'Dashboard',
meta: {
title: '系统首页',
@@ -168,13 +168,13 @@ export const asyncRoutes = [
/** when your routing map is too long, you can split it into small modules **/
managerRouter,//系统首页
personRouter,//系统管理
- //basedataRouter,//基础数据维护
- //vwFisDataRouter,//结算与开票数据导入
- //billdataRouter,//销售结算与开票报表
+ basedataRouter,//基础数据维护
+ vwFisDataRouter,//结算与开票数据导入
+ billdataRouter,//销售结算与开票报表
//businessdataRouter,
- //wheeldataRouter,//大众看板和备件
+ wheeldataRouter,//大众看板和备件
pgfis,//派格fis
- //JobTimeDataRouter,//后台作业监控
+ JobTimeDataRouter,//后台作业监控
// 404 page must be placed at the end !!!
{ path: '*', redirect: '/404', hidden: true }
diff --git a/vue/src/views/pg-fis/basedate/m100Online/detailZHB.vue b/vue/src/views/pg-fis/basedate/m100Online/detailZHB.vue
index 74f99d12..daa9a919 100644
--- a/vue/src/views/pg-fis/basedate/m100Online/detailZHB.vue
+++ b/vue/src/views/pg-fis/basedate/m100Online/detailZHB.vue
@@ -461,7 +461,7 @@ export default {
ifr.setAttribute("name", "printPdf" + date);
ifr.src = window.URL.createObjectURL(blob);
document.body.appendChild(ifr);
- this.doPrint("printPdf" + date);
+ this.doPrint("printPdf" + date);alert("ifr.src:"+JSON.stringify(ifr.src))
window.URL.revokeObjectURL(ifr.src); // 释放URL 对象
this.dialogFormVisible = false;
},
@@ -567,12 +567,12 @@ export default {
} else {
this.fileQuery.dataname = JSON.stringify(response.item);
console.log(
- "柱板-调用Handlers/Handler1.ashx?report=menban传的值：" +
+ "柱板-调用Handlers/Handler1.ashx?report=zhuhuban传的值：" +
JSON.stringify(this.fileQuery.dataname)
);
this.$axios
.posts(
- "/Handlers/Handler1.ashx?report=menban",
+ "/Handlers/Handler1.ashx?report=zhuhuban",
qs.stringify(this.fileQuery)
)
.then((response) => {
diff --git a/vue/src/views/pg-fis/basedate/m100Online/index.vue b/vue/src/views/pg-fis/basedate/m100Online/index.vue
index dfc95444..3430678d 100644
--- a/vue/src/views/pg-fis/basedate/m100Online/index.vue
+++ b/vue/src/views/pg-fis/basedate/m100Online/index.vue
@@ -45,142 +45,148 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+ 其他搜索条件(单击折叠或伸展)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
- {{ item.name }}
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.name }}
+
+
+
+
+
+
柱护板重打和作废
+
@@ -1386,7 +1393,9 @@ export default {
this.hostPrintQuery
)
.then((response) => {
- console.log("重新或补打打印门板装箱单"+JSON.stringify(this.hostPrintQuery));
+ console.log(
+ "重新或补打打印门板装箱单" + JSON.stringify(this.hostPrintQuery)
+ );
console.log(response);
if (response.status === false) {
this.$message({
diff --git a/vue/src/views/ux/billManage/InvoiceSettledDetailDiff/index.vue b/vue/src/views/ux/billManage/InvoiceSettledDetailDiff/index.vue
index 293bb2b5..09029aad 100644
--- a/vue/src/views/ux/billManage/InvoiceSettledDetailDiff/index.vue
+++ b/vue/src/views/ux/billManage/InvoiceSettledDetailDiff/index.vue
@@ -480,7 +480,7 @@
v-model="formCount.kennCode"
style="width: 380px"
:rows="4"
- placeholder="请输入正确的KENN号！"
+ placeholder="多个KENN号，请以回车换行形式添加！"
/>
@@ -511,7 +511,7 @@
style="width: 450px"
type="textarea"
:rows="4"
- placeholder="请输入正确底盘号！"
+ placeholder="多个底盘号，请以回车换行形式添加！"
/>
@@ -528,7 +528,7 @@
style="width: 450px"
type="textarea"
:rows="4"
- placeholder="请输入正确的客户零件号！"
+ placeholder="多个客户零件号，请以回车换行形式添加！"
/>
@@ -544,7 +544,7 @@
style="width: 450px"
type="textarea"
:rows="4"
- placeholder="请输入正确厂内零件号！"
+ placeholder="多个厂内零件号，请以回车换行形式添加！"
/>
@@ -621,7 +621,6 @@ export default {
paster: "",
pasterValue: "",
JobVersionList: [],
- JobVersionValue: "",
rules: {
versionValue: [
{ required: true, message: "必须输入！", trigger: "change" },
@@ -747,6 +746,7 @@ export default {
listQuery: {
taskId: "",
name: "",
+ type:""
},
page: 1,
JobversionValue: "",
@@ -800,7 +800,11 @@ export default {
/* 主表头 */
getDefaultField() {
var tempsTabs = [];
-
+ tempsTabs.push({
+ label: "版本号",
+ prop: "type",
+ width: 85,
+ });
tempsTabs.push({
label: "单据流水号",
prop: "taskId",
@@ -821,11 +825,11 @@ export default {
prop: "createdAt",
width: 150,
});
- // tempsTabs.push({
- // label: "操作名称",
- // prop: "actionName",
- // width: 120,
- // });
+ tempsTabs.push({
+ label: "说明",
+ prop: "remark",
+ width: 220,
+ });
// tempsTabs.push({
// label: "状态",
// prop: "stateName",
@@ -835,6 +839,12 @@ export default {
},
},
methods: {
+ //版本下拉列表选择项
+ JobVersionValue(params) {
+ //版本下拉选择
+ this.JobversionValue = params.value;
+ this.getList();
+ },
getJobVersionInfo() {
//取版本列表信息
//this.listLoading = true;
@@ -891,22 +901,22 @@ export default {
}
},
//如果是要获得粘贴excel的内容，需要把粘贴的内容转换成二维数组
- pasteExcelToKennCode(e) {
- let source = e.clipboardData.getData("Text");
- // 首先对源头进行解析
- let rows = source.split("\r\n"); // 拆成很多行
- this.dataKenCode = "";
- for (let i = 0; i < rows.length; i++) {
- if (rows[i] != "") {
- // 如果某一行不是空，再按列拆分
- let columns = rows[i].split("\t"); // 已经按列划分
+ // pasteExcelToKennCode(e) {
+ // let source = e.clipboardData.getData("Text");
+ // // 首先对源头进行解析
+ // let rows = source.split("\r\n"); // 拆成很多行
+ // this.dataKenCode = "";
+ // for (let i = 0; i < rows.length; i++) {
+ // if (rows[i] != "") {
+ // // 如果某一行不是空，再按列拆分
+ // let columns = rows[i].split("\t"); // 已经按列划分
- for (let j = 0; j < columns.length; j++) {
- this.dataKenCode += columns[j] + ",";
- }
- }
- }
- },
+ // for (let j = 0; j < columns.length; j++) {
+ // this.dataKenCode += columns[j] + ",";
+ // }
+ // }
+ // }
+ // },
valueChange(data) {
this.getmaterialGroupValue = "";
this.getmaterialGroupValue += data + ",";
@@ -1040,29 +1050,29 @@ export default {
);
this.formLoading = false;
this.dialogFormVisible = false;
- // this.$axios
- // .gets(
- // "/api/settleaccount/ReportMakeService/InvoiceSettledDetailDiff-Make",
- // this.listExportQuery
- // )
- // .then((res) => {
- // let taskid = res;
- // if (Number.isInteger(taskid)) {
- // this.$notify({
- // title: "成功",
- // message: "任务生成成功！任务号:" + taskid,
- // type: "success",
- // duration: 2000,
- // });
- // }
- // this.getList();
- // this.formLoading = false;
- // this.dialogFormVisible = false;
- // })
- // .catch(() => {
- // this.formLoading = false;
- // this.dialogFormVisible = false;
- // });
+ this.$axios
+ .gets(
+ "/api/settleaccount/ReportMakeService/InvoiceSettledDetailDiff-Make",
+ this.listExportQuery
+ )
+ .then((res) => {
+ let taskid = res;
+ if (Number.isInteger(taskid)) {
+ this.$notify({
+ title: "成功",
+ message: "任务生成成功！任务号:" + taskid,
+ type: "success",
+ duration: 2000,
+ });
+ }
+ this.getList();
+ this.formLoading = false;
+ this.dialogFormVisible = false;
+ })
+ .catch(() => {
+ this.formLoading = false;
+ this.dialogFormVisible = false;
+ });
}
});
},
@@ -1202,6 +1212,7 @@ export default {
this.listLoading = true;
//导入界面中超链接过来的参数
this.listQuery.name = "大众发票与结算核对明细表";
+ this.listQuery.type = this.JobversionValue;
this.$axios
.posts("/api/settleaccount/Job/list", this.listQuery)
.then((response) => {
diff --git a/vue/src/views/ux/billManage/InvoiceSettledDiff/index.vue b/vue/src/views/ux/billManage/InvoiceSettledDiff/index.vue
index 8406a006..632ee8b7 100644
--- a/vue/src/views/ux/billManage/InvoiceSettledDiff/index.vue
+++ b/vue/src/views/ux/billManage/InvoiceSettledDiff/index.vue
@@ -5,6 +5,12 @@