@@ -110,6 +114,10 @@ export default {
// 上传前检查文件大小: Boolean
},
+ handleUploading() {
+ this.loadingStatus = true
+ },
+
handleBeforeUploadCheck(file) {
if (typeof file !== "object") return false;
if (!("name" in file) || !("type" in file)) return false;
@@ -129,7 +137,7 @@ export default {
handleSuccess(response, file, fileList) {
console.log("success response", response);
-
+ this.loadingStatus = false
try {
if ("code" in response && response.code === 500) {
this.$message({
@@ -168,6 +176,7 @@ export default {
},
handleError(err, file, fileList) {
+ this.loadingStatus = false
console.log("err", err);
},
diff --git a/src/components/Overlay.vue b/src/components/Overlay.vue
index 502bc7f..21ce5b2 100644
--- a/src/components/Overlay.vue
+++ b/src/components/Overlay.vue
@@ -1,6 +1,6 @@
-
请稍后......
+ 请稍后{{dot}}
@@ -9,15 +9,24 @@ export default {
name: "OverlayView",
props: {},
data() {
- return {};
+ return {
+ dot: '.',
+ timer: null
+ };
},
mounted() {
+ //
+ this.timer = setInterval(() => {
+ this.dot = this.dot.length > 5 ? '.' : this.dot + '.'
+ }, 600);
// 禁止页面滚动
- document.body.style.overflow = 'hidden'
+ document.body.style.overflow = "hidden";
},
beforeDestroy() {
- document.body.style.overflow = 'unset'
- }
+ if (this.timer) clearInterval(this.timer)
+ document.body.style.overflow = "unset";
+ },
+ methods: {},
};
@@ -30,16 +39,17 @@ export default {
top: 0;
left: 0;
z-index: 1000000;
+ background: rgba(0, 0, 0, 0.1);
}
.overlay-view h1 {
position: absolute;
- top: 50%;
+ top: 40%;
left: 50%;
font-size: 36px;
font-weight: bold;
letter-spacing: 10px;
- color: #cccc;
+ color: #777c;
user-select: none;
}
diff --git a/src/views/atomViews/ListView.vue b/src/views/atomViews/ListView.vue
index 4784a9e..03a8636 100644
--- a/src/views/atomViews/ListView.vue
+++ b/src/views/atomViews/ListView.vue
@@ -416,31 +416,46 @@ export default {
}
});
}
+
+ // const dataview = new DataView(new ArrayBuffer(8));
+ // dataview.setBigInt64(0, data);
+ // data = new Blob([dataview.buffer], { type: "application/octet-stream" });
case "sync": {
+ // console.log("sync ", data, typeof data, BigInt(data).toString());
// 同步配方详情
- return this.$http
- .post(this.urls.syncUrl, data, { headers: { "Content-Type": "application/json" } })
- .then(({ data: res }) => {
- if (res.code === 0) {
- this.$message({
- message: "同步成功",
- type: "success",
- duration: 1500,
- onClose: () => {
- this.getList();
- },
- });
- } else {
- throw new Error(res.msg);
- }
+ // data = BigInt(data).toString(2)
+ return (
+ this.$http({
+ url: this.urls.syncUrl,
+ method: "post",
+ data,
+ headers: {
+ "Content-Type": "text/plain",
+ },
})
- .catch((errMsg) => {
- this.$message({
- message: "同步失败: " + errMsg,
- type: "error",
- duration: 1500,
- });
- });
+ // .post(this.urls.syncUrl, data: `id=${data}`, { headers: { "Content-Type": "text/plain", "data-id": data } })
+ .then(({ data: res }) => {
+ if (res.code === 0) {
+ this.$message({
+ message: "同步成功",
+ type: "success",
+ duration: 1500,
+ onClose: () => {
+ this.getList();
+ },
+ });
+ } else {
+ throw new Error(res.msg);
+ }
+ })
+ .catch((errMsg) => {
+ this.$message({
+ message: "同步失败: " + errMsg,
+ type: "error",
+ duration: 1500,
+ });
+ })
+ );
}
}
},
diff --git a/src/views/atomViews/ListViewWithHead.vue b/src/views/atomViews/ListViewWithHead.vue
index fecb5e9..88ea7e8 100644
--- a/src/views/atomViews/ListViewWithHead.vue
+++ b/src/views/atomViews/ListViewWithHead.vue
@@ -336,6 +336,10 @@ export default {
this.openDialog(data, true);
break;
}
+ case 'toggle-attachment-dialog': {
+ alert('查看附件')
+ break;
+ }
case "view-blender-batch-details": {
this.$router.push({
name: "pms-blenderBatchDetails",
diff --git a/src/views/modules/pms/bomDetails/config.js b/src/views/modules/pms/bomDetails/config.js
index c134f33..2cb3a9a 100644
--- a/src/views/modules/pms/bomDetails/config.js
+++ b/src/views/modules/pms/bomDetails/config.js
@@ -215,7 +215,7 @@ export default function () {
urls: {
base: "/pms/bom",
page: "/pms/bom/pageVersion",
- syncUrl: "/pms/bom/bomSync",
+ syncUrl: "/pms/trans/bomSync",
copyUrl: "/pms/bom/copy",
subase: "/pms/bomMaterial",
subpage: "/pms/bomMaterial/page",
diff --git a/src/views/modules/pms/currentCarLocation/config.js b/src/views/modules/pms/currentCarLocation/config.js
index 790e709..281df4c 100644
--- a/src/views/modules/pms/currentCarLocation/config.js
+++ b/src/views/modules/pms/currentCarLocation/config.js
@@ -43,6 +43,18 @@ export default function () {
placeholder: "请输入窑车号",
},
},
+ {
+ prop: 'orderId',
+ label: '订单号',
+ fieldOptionLabel: 'code',
+ customLabel: 'cate',
+ select: [],
+ fn: () => this.$http.post("/pms/order/pageView", { page: 1, limit: 999 }),
+ bind: {
+ placeholder: '请选择订单号',
+ filterable: true
+ }
+ },
{
button: {
type: "primary",
diff --git a/src/views/modules/pms/order/components/ListSectionWithHead.vue b/src/views/modules/pms/order/components/ListSectionWithHead.vue
index 2b3e75d..a2b3649 100644
--- a/src/views/modules/pms/order/components/ListSectionWithHead.vue
+++ b/src/views/modules/pms/order/components/ListSectionWithHead.vue
@@ -5,6 +5,7 @@
**/
-->
+
{
- // this.$message({
- // message: errMsg,
- // type: "error",
- // duration: 2000,
- // });
+ console.log('ere...')
+ this.$message({
+ message: errMsg,
+ type: "error",
+ duration: 2000,
+ });
});
break;
}
@@ -332,7 +334,8 @@ export default {
if (res.code === 0) {
this.$message.success("删除成功!");
// 获取数据
- if (currenPageListLength == 1) this.listQuery.page = this.listQuery.page > 1 ? this.listQuery.page - 1 : 1;
+ if (currenPageListLength == 1)
+ this.listQuery.page = this.listQuery.page > 1 ? this.listQuery.page - 1 : 1;
this.getAList(Object.assign({}, this.listQuery, this.extraSearchConditions, this.params));
}
});
diff --git a/src/views/modules/pms/order/components/tabs/carDetail.vue b/src/views/modules/pms/order/components/tabs/carDetail.vue
index 27958e6..2c3674c 100644
--- a/src/views/modules/pms/order/components/tabs/carDetail.vue
+++ b/src/views/modules/pms/order/components/tabs/carDetail.vue
@@ -101,7 +101,7 @@ export default {
{ width: 80, prop: "orderCate", label: "订单子号" },
{ prop: "bomCode", label: "配方" },
{ prop: "shapeCode", label: "砖型" },
- { width: 80, prop: "qty", label: "订单数量" },
+ { width: 80, prop: "qty", label: "数量" },
{ width: 72, prop: "goodqty", label: "合格数" },
{ width: 72, prop: "badqty", label: "废砖数" },
],
diff --git a/src/views/modules/pms/shape/config.js b/src/views/modules/pms/shape/config.js
index ea46aae..9c9137a 100644
--- a/src/views/modules/pms/shape/config.js
+++ b/src/views/modules/pms/shape/config.js
@@ -14,6 +14,7 @@ export default function () {
{ prop: "description", label: "长描述" },
{ prop: "shortDesc", label: "短描述" },
{ prop: "remark", label: "备注" },
+ { prop: "toggle-attachment-dialog", label: "查看附件", actionName: 'toggle-attachment-dialog', buttonContent: '查看附件', subcomponent: TableTextComponent },
{ prop: "createTime", label: "添加时间", filter: timeFilter },
{
prop: "operations",