Przeglądaj źródła

修改任务报工

695593266@qq.com 5 miesięcy temu
rodzic
commit
3effd8a252

+ 11 - 7
src/api/produce/workOrder.js

@@ -19,8 +19,12 @@ export async function workorderPage(data) {
 }
 
 // 工单列表
-export async function workorderPage2(data) {
-  const res = await request.post('/mes/workorder/taskReportPage2', data);
+export async function workorderPage2(data, config = {}) {
+  const res = await request.post(
+    '/mes/workorder/taskReportPage2',
+    data,
+    config
+  );
   if (res.data.code == 0) {
     return res.data.data;
   }
@@ -367,10 +371,7 @@ export async function fileReleaseAPI(data) {
 
 // 获取工单内所有产品,产品编码和产品名称
 export async function getAllProductInWorkOrder(body) {
-  const res = await request.post(
-    `/mes/workorder/getProductInWorkOrder`,
-    body
-  );
+  const res = await request.post(`/mes/workorder/getProductInWorkOrder`, body);
   if (res.data.code == 0) {
     return res.data.data;
   }
@@ -379,7 +380,10 @@ export async function getAllProductInWorkOrder(body) {
 
 // /mes/workorder/craftFiles/batchRecordPage
 export async function batchRecordPage(data) {
-  const res = await request.post('/mes/workorder/craftFiles/batchRecordPage', data);
+  const res = await request.post(
+    '/mes/workorder/craftFiles/batchRecordPage',
+    data
+  );
   if (res.data.code == 0) {
     return res.data.data;
   }

+ 40 - 1
src/views/produce/components/taskWorkList.vue

@@ -38,6 +38,26 @@
         <el-tag v-if="row.disposalStatus == 1" type="success">已接收</el-tag>
         <el-tag v-if="row.disposalStatus == 2" type="danger">已拒绝</el-tag>
       </template>
+
+      <template v-slot:action="{ row }">
+        <el-popconfirm
+          icon="el-icon-info"
+          title="确定接收任务吗?"
+          @confirm="receiveTask(row.id, '1')"
+          v-if="row.disposalStatus != '1' && row.disposalStatus != '2'"
+        >
+          <el-button slot="reference" type="text">接收</el-button>
+        </el-popconfirm>
+
+        <el-popconfirm
+          icon="el-icon-info"
+          title="确定拒绝任务吗?"
+          @confirm="receiveTask(row.id, '2')"
+          v-if="row.disposalStatus != '1' && row.disposalStatus != '2'"
+        >
+          <el-button slot="reference" type="text">拒绝</el-button>
+        </el-popconfirm>
+      </template>
     </ele-pro-table>
 
     <Ddtails ref="detailsRef" @success="reload" />
@@ -47,7 +67,7 @@
 <script>
   import { isFullscreen } from 'ele-admin';
   import tableColumnsMixin from '@/mixins/tableColumnsMixin';
-  import { pageByCurrentUser } from '@/api/workOrderList';
+  import { pageByCurrentUser, taskManagement } from '@/api/workOrderList';
   import Ddtails from '@/views/taskList/components/Ddtails.vue';
 
   export default {
@@ -336,6 +356,15 @@
             align: 'center',
             showOverflowTooltip: true,
             width: 180
+          },
+          {
+            columnKey: 'action',
+            label: '操作',
+            width: 200,
+            align: 'center',
+            resizable: false,
+            fixed: 'right',
+            slot: 'action'
           }
         ];
       },
@@ -435,6 +464,16 @@
         }
       },
 
+      async receiveTask(id, type) {
+        await taskManagement({
+          id,
+          disposalStatus: Number(type)
+        }).then((res) => {
+          console.log(res);
+          this.reload();
+        });
+      },
+
       /* 表格数据源 */
       datasource({ page, where }) {
         if (!this.taskObj?.id) {

Plik diff jest za duży
+ 560 - 297
src/views/produce/index.vue


Niektóre pliki nie zostały wyświetlone z powodu dużej ilości zmienionych plików