Merge branch 'dev' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend-aps into dengfei

src/api/mainData/index.js

@@ -21,33 +21,77 @@ export async function teamPage(params) {
   return Promise.reject(new Error(res.data.message));
 }
 
+// 根据工作中心查班组
 
+export async function listByWorkCenterId(workCenterId) {
+  const res = await request.get(
+    `/main/team/listByWorkCenterId/${workCenterId}`
+  );
+  if (res.data.code == 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
 
-// 根据首工序id拿工位
-export async function listByFirstTaskId(firstTaskId) {
-  const res = await request.get(`/main/factoryworkstation/listByFirstTaskId/${firstTaskId}`);
+// 根据班组ids查所有人信息
+
+export async function listUserByIds(data) {
+  const res = await request.post('/main/team/listUserByIds', data);
   if (res.data.code == 0) {
     return res.data.data;
   }
   return Promise.reject(new Error(res.data.message));
 }
 
-// 根据工作中心查班组
+// 根据当前用户查工作中心跟班组
+export async function listWorkCenter(firstProduceTaskId) {
+  const res = await request.get(
+    `/aps/assign/listWorkCenterTeamsByProduceTaskId/${firstProduceTaskId}`
+  );
+  if (res.data.code == 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
 
-export async function listByWorkCenterId(workCenterId) {
-  const res = await request.get(`/main/team/listByWorkCenterId/${workCenterId}`);
+// 查询工序列表
+export async function listByWorkCenter(workCenterId) {
+  const res = await request.get(
+    `/main/producetask/listByWorkCenterId/${workCenterId}`
+  );
   if (res.data.code == 0) {
     return res.data.data;
   }
   return Promise.reject(new Error(res.data.message));
 }
 
-// 根据班组ids查所有人信息
+// 根据首工序id拿工位
+export async function listByFirstTaskId(firstTaskId) {
+  const res = await request.get(
+    `/main/factoryworkstation/listByFirstTaskId/${firstTaskId}`
+  );
+  if (res.data.code == 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
 
-export async function listUserByIds (data) {
-  const res = await request.post('/main/team/listUserByIds', data);
+// 查询产线
+export async function lineByCurrentUser() {
+  const res = await request.get(
+    `main/factoryarea/listFactoryLineByCurrentUser`
+  );
   if (res.data.code == 0) {
     return res.data.data;
   }
   return Promise.reject(new Error(res.data.message));
-}
+}
+// /listWorkCenterTeamsByProduceTaskId/{firstProduceTaskId}
+// // 查询工作中心跟班组
+// export async function listByWorkCenter(firstProduceTaskId) {
+//   const res = await request.get(`/listWorkCenterTeamsByProduceTaskId/${firstProduceTaskId}`);
+//   if (res.data.code == 0) {
+//     return res.data.data;
+//   }
+//   return Promise.reject(new Error(res.data.message));
+// }

src/views/productionPlan/components/factoryAdd/index.vue

@@ -971,7 +971,7 @@ export default {
               row.moCount;
 
 
-            row['blockCount'] = num;
+            row['blockCount'] = blockCount;
             // this.$set(row, 'blockCount', blockCount);
 
 
@@ -1067,7 +1067,8 @@ export default {
           }
 
           let a =
-            ((Number(this.form.blockCount) * modelLong * modeWide * modeHight) / 1000000).toFixed(5);
+            ((Number(row.blockCount) * modelLong * modeWide * modeHight) / 1000000).toFixed(5);
+            console.log(a,'dsds')
 
           row.requiredFormingNum = a;