diff --git a/src/views/udi/trace/manu/index.vue b/src/views/udi/trace/manu/index.vue
index 28b6415..e252cf0 100644
--- a/src/views/udi/trace/manu/index.vue
+++ b/src/views/udi/trace/manu/index.vue
@@ -2,66 +2,66 @@
-
-
+
+
-
+
-
+
-
-
+
+
-
+
-
+
-
-
+
+
@@ -88,17 +88,12 @@
+
-
-
-
-
-
-
- 单据 {{ currentRow == null ? '' : currentRow.billNo }}-业务详情
+ 单据 {{ currentRow == null ? '' : currentRow.billNo }}-关联关系
-
-
-
-
+
+
+
+
-
-
-
-
-
+
+
+
+
import {isBlank} from "@/utils/strUtil";
-import {getTraceManuOrderList,getManuCodeRelList} from "@/api/udi/udiTrace";
+import {getTraceManuOrderList, getManuCodeRelList} from "@/api/udi/udiTrace";
export default {
data() {
@@ -443,26 +437,26 @@ export default {
}
},
methods: {
- formaterPackState(row){
+ formaterPackState(row) {
if (row.packState == 1) {
this.formatePackState = "满箱"
return "满箱"
- }else if (row.packState == 2){
+ } else if (row.packState == 2) {
this.formatePackState = "零箱"
return "零箱"
- }else if (row.packState == 3){
+ } else if (row.packState == 3) {
this.formatePackState = "拼箱满箱"
return "拼箱满箱"
- }else {
+ } else {
this.formatePackState = "拼箱零箱"
return "拼箱零箱"
}
},
- formaterTraceType(row){
+ formaterTraceType(row) {
if (row.traceType == 1) {
this.formateTraceType = "源头查询"
return "源头查询"
- }else {
+ } else {
this.formateTraceType = "现场检查查询"
return "现场检查查询"
}
@@ -475,7 +469,7 @@ export default {
this.currentRow = val;
this.getManuCodeRel();
},
- getManuCodeRel(){
+ getManuCodeRel() {
if (this.currentRow == null || isBlank(this.currentRow.billNo)) {
this.$message.error("请先选择需要查询的单据！")
return;
@@ -500,7 +494,7 @@ export default {
this.codeRelTotal = 0;
})
},
- handleView(row){
+ handleView(row) {
this.listOrder.forEach(obj => {
if (row.id == obj.id) {
this.formView = obj
@@ -509,7 +503,7 @@ export default {
console.log(this.formView)
this.openManuOrder = true
},
- handleViewCoderel(row){
+ handleViewCoderel(row) {
this.listCodeRel.forEach(obj => {
if (this.listCodeRel[0]) {
this.formViewCodeRel = obj
@@ -518,7 +512,7 @@ export default {
console.log(this.formViewCodeRel)
this.openManuCodeRel = true
},
- onReset(){
+ onReset() {
this.$router.push({
path: "",
});
@@ -535,9 +529,9 @@ export default {
};
this.currentRow.billNo = null
this.listCodeRel = null,
- this.getManuOrderList();
+ this.getManuOrderList();
},
- onSubmit(){
+ onSubmit() {
this.currentRow.billNo = null
this.filterQuery.page = 1;
this.getManuOrderList()
@@ -576,6 +570,7 @@ export default {
border-radius: 4px;
flex-wrap: wrap;
}
+
.query-form-item {
display: block !important;
margin-right: 10px;
diff --git a/src/views/udi/trace/search/index.vue b/src/views/udi/trace/search/index.vue
index 2b8f7fd..7c2547a 100644
--- a/src/views/udi/trace/search/index.vue
+++ b/src/views/udi/trace/search/index.vue
@@ -11,7 +11,7 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -20,7 +20,8 @@
-
+
@@ -31,7 +32,7 @@
@@ -42,7 +43,7 @@
@@ -51,7 +52,7 @@
@@ -61,7 +62,7 @@
@@ -69,7 +70,7 @@
-
+
@@ -125,20 +126,11 @@
style="width: 100%"
highlight-current-row border>
-
{{ formatTaskType(scope.row) }}
-
-
-
-
-
-
-
-
@@ -148,22 +140,17 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
+
@@ -288,6 +275,7 @@
import {isBlank} from "@/utils/strUtil";
import {getTraceTaskList} from "@/api/udi/udiTrace";
+
const formJson = {
id: "",
passWord: "",
@@ -327,18 +315,18 @@ export default {
open: false,
openManuCodeRel: false,
formView: {
- taskType:null,
+ taskType: null,
status: null,
},
taskTypes: [
- { value: 1, label: '关联关系' },
- { value: 2, label: '入库' },
- { value: 3, label: '出库' },
+ {value: 1, label: '关联关系'},
+ {value: 2, label: '入库'},
+ {value: 3, label: '出库'},
],
taskStatus: [
- { value: 1, label: '未处理' },
- { value: 2, label: '正在处理' },
- { value: 3, label: '已处理' },
+ {value: 1, label: '未处理'},
+ {value: 2, label: '正在处理'},
+ {value: 3, label: '已处理'},
],
formViewCodeRel: {},
showSearch: true,
@@ -397,11 +385,11 @@ export default {
formatTaskType(row) {
switch (row.taskType) {
case 1:
- return '关联关系';
+ return '生产订单';
case 2:
- return '入库';
+ return '入库订单';
case 3:
- return '出库';
+ return '出库订单';
default:
return '任务类型有误！！';
}
@@ -420,7 +408,7 @@ export default {
},
//详情
- handleView(row){
+ handleView(row) {
this.taskList.forEach(obj => {
if (row.id == obj.id) {
this.formView = obj
@@ -429,7 +417,7 @@ export default {
console.log(this.formView)
this.open = true
},
- handleViewCoderel(row){
+ handleViewCoderel(row) {
this.listCodeRel.forEach(obj => {
if (this.listCodeRel[0]) {
this.formViewCodeRel = obj
@@ -439,7 +427,7 @@ export default {
this.openManuCodeRel = true
},
//重置
- onReset(){
+ onReset() {
this.$router.push({
path: "",
});
@@ -457,12 +445,12 @@ export default {
endAduditTime: null,
};
this.listCodeRel = null,
- this.auditDateRange = [];
+ this.auditDateRange = [];
this.actDateRange = [];
this.getTaskList();
},
//查询事件
- onSubmit(){
+ onSubmit() {
this.loading = true;
if (this.actDateRange !== null) {
this.filterQuery.startTime = this.actDateRange[0];
@@ -506,8 +494,8 @@ export default {
filters: {
statusFilterType(status) {
const statusMap = {
- 1: "gray",
- 2: "danger",
+ 1: "danger",
+ 2: "waring",
3: "success"
};
@@ -533,6 +521,7 @@ export default {
border-radius: 4px;
flex-wrap: wrap;
}
+
.query-form-item {
display: block !important;
margin-right: 10px;
diff --git a/src/views/userManage/onLineManage.vue b/src/views/userManage/onLineManage.vue
index d6b65a7..dd150bc 100644
--- a/src/views/userManage/onLineManage.vue
+++ b/src/views/userManage/onLineManage.vue
@@ -65,7 +65,7 @@
@@ -253,6 +253,7 @@ export default {
this.filterQuery.page = 1;
},
formSubmit() {
+ this.formData.companyId = this.formData.id;
updateCompanyConfig(this.formData)
.then((response) => {
this.formVisible = false;