修改派单班次接口

src/api/mainData/index.js

@@ -173,7 +173,14 @@ export async function getTaskIdByInstanceId(taskInstanceId) {
 
 // 根据工厂查询班次
 export async function listByFactoryId(factoryId) {
-  const res = await request.get(`main/teamtime/listByFactoryId/${factoryId}`);
+  // const res = await request.get(`main/teamtime/listByFactoryId/${factoryId}`);
+  // if (res.data.code == 0) {
+  //   return res.data.data;
+  // }
+  // return Promise.reject(new Error(res.data.message));
+  const res = await request.get(
+    `/aps/tapsproductionshift/listByFactoryId/${factoryId}`
+  );
   if (res.data.code == 0) {
     return res.data.data;
   }

src/views/workOrder/components/releaseDialog.vue

@@ -314,7 +314,7 @@
                   <el-option
                     v-for="item in shiftList"
                     :key="item.id"
-                    :label="item.name"
+                    :label="item.dutyName"
                     :value="item.id"
                   >
                   </el-option>

src/views/workOrder/mixins/release.js

@@ -817,27 +817,27 @@ export default {
 
       if (listArr.length == 0) return;
 
-      listArr.forEach((it) => {
-        if (it.disposalStatus || it.disposalStatus == 0) {
-          arrList.map((item) => {
-            if (item.assigneeType.code == dataRow.assignType) {
-              let idx = listMap[item.assigneeId];
-              if (!idx && idx !== 0) {
-                return;
-              }
-              listArr[idx].status = item.status;
-              listArr[idx].startTime = item.startTime;
-              listArr[idx].endTime = item.endTime;
-              listArr[idx].quantity = item.quantity;
-              listArr[idx].weight = item.weight;
-              listArr[idx].changeId = item.id;
-              listArr[idx].teamTimeIds = item.teamTimeIds;
-              this.compareAndSetTime(listArr[idx], dataRow);
-              this.compareEndSetTime(listArr[idx], dataRow);
-            }
-          });
+      // listArr.forEach((it) => {
+      //   if (it.disposalStatus || it.disposalStatus == 0) {
+      arrList.map((item) => {
+        if (item.assigneeType.code == dataRow.assignType) {
+          let idx = listMap[item.assigneeId];
+          if (!idx && idx !== 0) {
+            return;
+          }
+          listArr[idx].status = item.status;
+          listArr[idx].startTime = item.startTime;
+          listArr[idx].endTime = item.endTime;
+          listArr[idx].quantity = item.quantity;
+          listArr[idx].weight = item.weight;
+          listArr[idx].changeId = item.id;
+          listArr[idx].teamTimeIds = item.teamTimeIds;
+          this.compareAndSetTime(listArr[idx], dataRow);
+          this.compareEndSetTime(listArr[idx], dataRow);
         }
       });
+      //   }
+      // });
 
       // 这里重新调用一个方法 计算出 startDate endDate
       this.$set(dataRow, 'list', listArr);
@@ -965,8 +965,9 @@ export default {
       // let data = this.shiftList.find((item) => item.id == e);
       // this.selectedListData(row, item);
       let data = this.shifTimeData(e, row);
-      let startTime = `${this.dateValue} ${data.startTime}`;
-      let endTime = `${this.dateValue} ${data.endTime}`;
+      let startTime = `${this.dateValue} ${data.startTime}` + `:00`;
+      let endTime = `${this.dateValue} ${data.endTime}` + `:00`;
+
       this.$set(row, 'startTime', startTime);
       this.$set(row, 'endTime', endTime);
       this.handleStartTimeChange(row, item);

vue.config.js

@@ -40,8 +40,8 @@ module.exports = {
         // target: 'http://192.168.1.211:18086',
         // target: 'http://192.168.1.251:18186',
         // target: 'http://192.168.1.102:18086',
-        target: 'http://aiot.zoomwin.com.cn:51001/api',
-        // target: 'http://192.168.1.125:18086',
+        // target: 'http://aiot.zoomwin.com.cn:51001/api',
+        target: 'http://192.168.1.125:18086',
 
         // target: 'http://192.168.1.116:18086',