diff --git a/src/components/TaskSelect/taskSelectSingle.vue b/src/components/TaskSelect/taskSelectSingle.vue
new file mode 100644
index 0000000..334633f
--- /dev/null
+++ b/src/components/TaskSelect/taskSelectSingle.vue
@@ -0,0 +1,278 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+
+
+
+ {{""}}
+
+
+
+
+
+
+
+
+
+
+ {{ parseTime(scope.row.startTime,'{y}-{m}-{d} {h}') }}
+
+
+
+
+
+ {{ parseTime(scope.row.endTime,'{y}-{m}-{d} {h}') }}
+
+
+
+
+
+
+
+
+
+ 修改
+ 删除
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/index.vue b/src/views/index.vue
index 6b581d1..f0df5c0 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -33,7 +33,7 @@
-
+
diff --git a/src/views/mes/md/workstation/index.vue b/src/views/mes/md/workstation/index.vue
index af8b60f..f94c6d7 100644
--- a/src/views/mes/md/workstation/index.vue
+++ b/src/views/mes/md/workstation/index.vue
@@ -207,17 +207,7 @@
>
-
-
-
-
-
-
-
+
diff --git a/src/views/mes/pro/feedback/index.vue b/src/views/mes/pro/feedback/index.vue
index 3d4049f..26beb89 100644
--- a/src/views/mes/pro/feedback/index.vue
+++ b/src/views/mes/pro/feedback/index.vue
@@ -136,14 +136,6 @@
- 执行入库
-
-
-
+
+
+
-
+
@@ -285,7 +277,7 @@
@@ -297,9 +289,10 @@ import { listFeedback, getFeedback, delFeedback, addFeedback, updateFeedback, ex
import WorkorderSelect from "@/components/workorderSelect/single.vue"
import WorkstationSelect from "@/components/workstationSelect/simpletableSingle.vue"
import UserSingleSelect from "@/components/userSelect/single.vue"
+import ProtaskSelect from "@/components/TaskSelect/taskSelectSingle.vue"
export default {
name: "Feedback",
- components: {WorkorderSelect,WorkstationSelect,UserSingleSelect},
+ components: {WorkorderSelect,WorkstationSelect,UserSingleSelect,ProtaskSelect},
dicts: ['mes_order_status', 'mes_feedback_type'],
data() {
return {
@@ -406,6 +399,9 @@ export default {
workstationId: null,
workstationCode: null,
workstationName: null,
+ processId: null,
+ processCode: null,
+ processName: null,
workorderId: null,
workorderCode: null,
workorderName: null,
@@ -508,8 +504,8 @@ export default {
});
},
//执行
- handleExecute(row){
- const recordIds = row.recordId || this.ids;
+ handleExecute(){
+ const recordIds = this.form.recordId;
this.$modal.confirm('确认执行报工?').then(function() {
return execute(recordIds)//执行报工
}).then(() => {
@@ -539,6 +535,7 @@ export default {
},
onWorkorderSelected(row){
if(row != undefined && row != null){
+ debugger;
this.form.workorderId = row.workorderId;
this.form.workorderCode = row.workorderCode;
this.form.workorderName = row.workorderName;
@@ -549,14 +546,21 @@ export default {
this.form.unitOfMeasure = row.unitOfMeasure;
}
},
- handleWorkstationSelect(){
- this.$refs.wsSelect.showFlag = true;
+ handleTaskSelect(){
+ this.$refs.taskSelect.showFlag = true;
+ this.$refs.taskSelect.getList();
},
- onWorkstationSelected(row){
+ onTaskSelected(row){
if(row != undefined && row != null){
+ this.form.taskId = row.taskId;
+ this.form.taskCode = row.taskCode;
+ this.form.taskName = row.taskName;
this.form.workstationId = row.workstationId;
this.form.workstationCode = row.workstationCode;
this.form.workstationName = row.workstationName;
+ this.form.processId = row.processId;
+ this.form.processCode = row.processCode;
+ this.form.processName = row.processName;
}
},
//点击人员选择按钮