+
+ 生产进度
+
-
+
@@ -341,10 +342,11 @@ export default {
hideDo:true,
activeName:'8车间',
dataList:[
- {number:'rwbh2023',name:'玻璃棒',xh:'',count:100,count1:100,start_date:'2023-10-15',end_date:'2023-10-15', count01:100, count02:200, count03:300 },
- {number:'rwbh2023',name:'玻璃棒',xh:'',count:100,count1:100,start_date:'2023-10-15',end_date:'2023-10-15', count01:100, count02:250, count03:300 },
+ // {number:'rwbh2023',name:'玻璃棒',xh:'',count:100,count1:100,start_date:'2023-10-15',end_date:'2023-10-15', count01:100, count02:200, count03:300 },
+ // {number:'rwbh2023',name:'玻璃棒',xh:'',count:100,count1:100,start_date:'2023-10-15',end_date:'2023-10-15', count01:100, count02:250, count03:300 },
],
- columList:['10.15','10.16','10.17'],
+ // columList:['10.15','10.16','10.17'],
+ columList:[],
selection: [],
selectedIds:[],
state_: {
@@ -426,13 +428,13 @@ export default {
this.$confirm(`确定终止该任务吗？`, "提示", {
type: "warning",
}).then(() => {
- // this.$API.pm.utask.delete.req(row.id).then((res) => {
- // this.$message.success("删除成功");
- // this.$refs.table7.refresh();
- // return res;
- // }).catch((err) => {
- // return err;
- // });
+ this.$API.pm.utask.stop.req(row.id).then((res) => {
+ this.$message.success("操作成功");
+ this.$refs.table10.refresh();
+ return res;
+ }).catch((err) => {
+ return err;
+ });
}).catch(() => {});
},
//本地更新数据
@@ -477,13 +479,19 @@ export default {
utaskDepuse(){
let that = this;
if(that.selectedIds.length>0){
+ let ids =that.selectedIds;
that.isloading = true;
- that.$API.pm.utask.scheduemtasks.req({ids:that.selectedIds}).then(res=>{
- that.$message.success('任务分解成功');
- that.isloading = false;
- that.$refs.table7.refresh();
- that.$refs.table8.refresh();
- that.$refs.table10.refresh();
+ that.$API.pm.utask.scheduemtasks.req({ids:ids}).then(res=>{
+ that.$API.pm.utask.assgin.req({ids:ids}).then(res=>{
+ that.$message.success('下达任务成功');
+ that.isloading = false;
+ that.$refs.table7.refresh();
+ that.$refs.table8.refresh();
+ that.$refs.table10.refresh();
+ }).catch(()=>{
+ that.isloading = false;
+ })
+
}).catch(()=>{
that.isloading = false;
})
diff --git a/src/views/pm/mtask2.vue b/src/views/pm/mtask2.vue
index 53fcd542..c423b0f4 100644
--- a/src/views/pm/mtask2.vue
+++ b/src/views/pm/mtask2.vue
@@ -69,33 +69,6 @@
-
@@ -353,13 +326,33 @@ export default {
//获取 mtask
let that = this;
that.tasks.data = [];
+ let objItem = {};
+ objItem.id=row.id;
+ objItem.type='utask';
+ objItem.number=row.number;
+ objItem.count=row.count;
+ objItem.text =row.number,
+ objItem.cate='',
+
+ objItem.duration = 10;
+ objItem.progress = 1;
+ objItem.count_ok=row.count_ok;
+ objItem.count_real=row.count_real;
+ objItem.count_notok=row.count_notok;
+ objItem.state =row.state;
+ objItem.start_date =row.start_date;
+ objItem.mgroup_name = '';
+ objItem.material_name = '';
+ objItem.specification = '';
+ that.tasks.data.push(objItem)
this.$API.pm.mtask.list.req({utask:row.id}).then(res=>{
// console.log(res.results)//获取甘特图数据
let data = res.results;
- let arr = [];
data.forEach(item=>{
let obj = {};
obj.id=item.id;
+ obj.type='mtask';
+ obj.parent=row.id;
obj.number=item.number;
obj.count=item.count;
obj.text = "一天任务",
@@ -379,25 +372,6 @@ export default {
that.tasks.data.push(obj)
})
console.log(that.tasks.data)
- // data.forEach(item=>{
- // let obj = {};
- // let progress = 0;
- // progress = item.count_ok/item.count;
- // obj.text = "一天任务",
- // obj.count_ok=item.count_ok;
- // obj.count_real=item.count_real;
- // obj.count_notok=item.count_notok;
- // obj.start_date=item.start_date;
- // obj.end_date=item.end_date;
- // obj.state = item.state;
- // obj.utask = item.utask;
- // obj.mgroup_name = item.mgroup_name;
- // obj.material_name = item.material_out_.name;
- // obj.specification = item.material_out_.specification;
- // arr.push(obj)
- // })
- // console.log(arr)
- // that.tasks.data = res.results;
console.log('tasks:',that.tasks)
// 数据解析:将数据解析到gantt列数据中
gantt.parse(that.tasks);
diff --git a/src/views/pum/order_form.vue b/src/views/pum/order_form.vue
index 29fe77b5..3239a967 100644
--- a/src/views/pum/order_form.vue
+++ b/src/views/pum/order_form.vue
@@ -79,15 +79,13 @@ export default {
loading: false,
mode: "add",
titleMap: {
- add: "新增仓库",
- edit: "编辑仓库",
- show: "查看仓库",
+ add: "新增采购订单",
+ edit: "编辑采购订单",
+ show: "查看采购订单",
},
form: {},
rules: {
- name: [{required: true, message: "请输入仓库名称", trigger: "blur"}],
- number: [{required: true, message: "请输入仓库编号", trigger: "blur"}],
- place: [{required: true, message: "请输入仓库地点", trigger: "blur"}]
+ number: [{required: true, message: "请输入采购订单编号", trigger: "blur"}]
},
visible: false,
isSaveing: false,
diff --git a/src/views/pum/plan_form.vue b/src/views/pum/plan_form.vue
index 096d61ff..c2de7263 100644
--- a/src/views/pum/plan_form.vue
+++ b/src/views/pum/plan_form.vue
@@ -55,13 +55,13 @@
loading: false,
mode: "add",
titleMap: {
- add: "新增仓库",
- edit: "编辑仓库",
- show: "查看仓库",
+ add: "新增采购计划",
+ edit: "编辑采购计划",
+ show: "查看采购计划",
},
form: {},
rules: {
- number: [{required: true, message: "请输入编号", trigger: "blur"}],
+ number: [{required: true, message: "请输入采购计划编号", trigger: "blur"}],
},
visible: false,
isSaveing: false,
diff --git a/src/views/qm/income.vue b/src/views/qm/income.vue
index c5063c85..90d563b4 100644
--- a/src/views/qm/income.vue
+++ b/src/views/qm/income.vue
@@ -2,7 +2,6 @@
-
-
新增
+ 提交
@@ -680,6 +681,9 @@ export default {
}
}
},
+ //提交退火
+ submittuihuo(){},
+
//编辑
table_edit(row) {
this.dialog.save = true;