From 943e43fac9e2fefabaeffb20445361d5d02cea25 Mon Sep 17 00:00:00 2001
From: 86134 <aa>
Date: 星期一, 20 十一月 2023 10:24:45 +0800
Subject: [PATCH] 11

---
 vue.config.js                                  |    4 +-
 src/api/product/personboard.js                 |   61 +++++++++++++++++++++++++-----
 src/views/product/workbench/workReportCard.vue |    8 ++-
 src/api/product/handymantype.js                |   15 +++++++
 4 files changed, 73 insertions(+), 15 deletions(-)

diff --git a/src/api/product/handymantype.js b/src/api/product/handymantype.js
index 6f71d44..09b43ea 100644
--- a/src/api/product/handymantype.js
+++ b/src/api/product/handymantype.js
@@ -119,3 +119,18 @@
     params: query
   })
 }
+
+export function isProductionCounting(query) {
+  return request({
+    url: '/mes/product/isProductionCounting',
+    method: 'get',
+		params: query
+  })
+}
+
+export function qualifiedLocation(id) {
+  return request({
+    url: '/mes/product/qualifiedLocation/' + id,
+    method: 'get'
+  })
+}
diff --git a/src/api/product/personboard.js b/src/api/product/personboard.js
index f20b0c6..39dbfe5 100644
--- a/src/api/product/personboard.js
+++ b/src/api/product/personboard.js
@@ -134,6 +134,14 @@
   })
 }
 
+export function getOperationTaskCopy(query) {
+  return request({
+    url: '/mes/operationTask/getOperationTaskCopy',
+    method: 'get',
+    params: query
+  })
+}
+
 export function changeOperationTaskState(ids, event) {
   return request({
     url: '/mes/operationTask/product/changeState/' + event,
@@ -260,14 +268,6 @@
   })
 }
 
-export function submitProductMain(obj) {
-  return request({
-    url: '/mes/product/submitProductMain',
-    method: 'post',
-    data: obj
-  })
-}
-
 export function batchSaveProductOutput(obj) {
   return request({
     url: '/mes/product/batchSaveProductOutput',
@@ -339,6 +339,15 @@
     url: '/mes/product/state/batchChange/' + event,
     method: 'post',
     data: ids
+  })
+}
+
+// 鎵归噺鎻愪氦
+export function batchChangeCopy(qury, event) {
+  return request({
+    url: '/mes/product/state/batchChangeCopy/' + event,
+    method: 'post',
+    data: qury
   })
 }
 
@@ -518,9 +527,41 @@
   })
 }
 
-export function getOperationTaskCopy(query) {
+export function submitInsPart(obj) {
   return request({
-    url: '/mes/operationTask/getOperationTaskCopy',
+    url: '/mes/applyPart/submitIns',
+    method: 'post',
+    data: obj
+  })
+}
+
+export function submitProductMain(obj) {
+  return request({
+    url: '/mes/product/submitProductMain',
+    method: 'post',
+    data: obj
+  })
+}
+
+export function inputHandle(obj) {
+  return request({
+    url: '/mes/feeding/inputHandle',
+    method: 'post',
+    data: obj
+  })
+}
+
+export function cancellationOfWorkApplication(query) {
+  return request({
+    url: '/mes/product/cancellationOfWorkApplication',
+    method: 'get',
+    params: query
+  })
+}
+
+export function generateBackflush(query) {
+  return request({
+    url: '/mes/product/generateBackFlush',
     method: 'get',
     params: query
   })
diff --git a/src/views/product/workbench/workReportCard.vue b/src/views/product/workbench/workReportCard.vue
index be4d807..d964b22 100644
--- a/src/views/product/workbench/workReportCard.vue
+++ b/src/views/product/workbench/workReportCard.vue
@@ -126,7 +126,7 @@
           <!-- <el-button class="tracking-out-revoke-btn" type="primary" icon="tracking-btn-out"
           :disabled="currProductMainDisable || currentDutyRecord.isConfirm" v-if="!editShow" >浜ょ彮
         </el-button> -->
-          <el-button class="submit-out-btn" type="primary"
+        <el-button class="submit-out-btn" type="primary"
             :disabled="currProductMainDisable || currentDutyRecord.isConfirm" v-if="!editShow" @click="submitList()"
             :loading="submitLoading">鎻愪氦
           </el-button>
@@ -3246,7 +3246,7 @@
         // 鍒锋柊浜у嚭璁板綍
         // this.$emit('refreshProductOutput')
       } else if (refreshType === 5) {
-        // 鎻愪氦鎶ュ憡鍚庯紝鍒锋柊
+        // 鎻愪氦鎶ュ憡鍚庯紝鍒�
         // 鍒锋柊宸ュ崟鍒楄〃
         this.$emit('refreshOperateTasks')
         // 鍒锋柊浜у嚭璁板綍
@@ -3270,7 +3270,9 @@
             this.options = res.data.data
             if (this.options.length > 1) {
               this.dialogVisible = true
-            } else {
+            } else if(this.options.length == 0){
+							this.$message.error('宸ヤ綔绔欐湭缁戝畾鍚堟牸搴撲綅')
+						} else {
               this.locationIdValue = this.options[0].id
               this.submitListApi()
             }
diff --git a/vue.config.js b/vue.config.js
index 228226e..8b62c9b 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -4,8 +4,8 @@
  */
 const url = 'http://192.168.0.23:9999'
 
-  // const url = 'http://192.168.32.45:9999'
-  // const url = 'http://localhost:9999'
+  // const url = 'http://192.168.0.60:9999'
+  const url = 'http://localhost:9999'
 
 // const url = 'http://ztt-gateway:9999'
 const localUrl = 'http://localhost:8089'

--
Gitblit v1.9.3