生产管理接口联调

src/api/productionManagement/workReportingManagement.js

@@ -0,0 +1,28 @@
+import request from '@/axios';
+//列表接口
+export const getList = (params) => {
+  return request({
+    url: '/blade-desk/order/plateGoodsApply/page',
+    method: 'get',
+    params
+  });
+};
+
+
+//报工记录接口
+export const getRecordList = (params) => {
+  return request({
+    url: '/blade-desk/order/plateGoodsApply/page',
+    method: 'get',
+    params
+  });
+};
+
+// 扫描流程卡号获取数据
+export const getDataByCardNo = (params) => {
+  return request({
+    url: '/blade-desk/order/plateGoodsApply/getByCardNo',
+    method: 'get',
+    params
+  });
+};

src/views/productionManagement/workReportingManagement.vue

@@ -25,7 +25,7 @@
       <template #menu-left v-if="tabPosition == 'workReporting'">
         <el-form :inline="true" v-model="searchForm">
           <el-form-item>
-            <el-input placeholder="请扫描流程卡号"></el-input>
+            <el-input placeholder="请扫描流程卡号" @input="handleSearchInput"></el-input>
           </el-form-item>
           <el-form-item>
             <el-button type="primary">保存</el-button>
@@ -33,31 +33,13 @@
           </el-form-item>
         </el-form>
       </template>
-      <template #userName="{ row }">
+
-        {{ row.receiveMan.userName }}
-      </template>
-      <template #cardNo="{ row }">
-        {{ row.prWorkOrder.cardNo }}
-      </template>
-      <template #partCode="{ row }">
-        {{ row.prWorkOrder.pjYieldOrder.partCode }}
-      </template>
-      <template #batchNo="{ row }">
-        {{ row.prWorkOrder.batchNo }}
-      </template>
-      <template #ppsName="{ row }">
-        {{ row.procedureSet.ppsName }}
-      </template>
-      <template #oriMakeTeam="{ row }">
-        {{ row.makeTeam.tsName }}
-      </template>
-      <template #oriReceiveMan="{ row }">
-        {{ row.receiveMan.tsName }}
-      </template>
       <template #detail="{ row }" v-if="tabPosition == 'workReporting'">
         <el-button type="text" @click="handleDetail(row)">详情</el-button>
       </template>
     </avue-crud>
+
+    <!-- 详情 -->
     <el-dialog append-to-body title="详情" v-model="detailDialog">
       <div style="display: flex; justify-content: flex-end">
         <el-button type="primary">保存</el-button>
@@ -68,6 +50,7 @@
         <el-table-column label="报工人" prop="worker.userId"></el-table-column>
       </el-table>
     </el-dialog>
+    <!-- 转班 -->
     <el-dialog append-to-body title="转班" v-model="teamDialog">
       <el-form ref="teamForm" :model="teamForm" :rules="teamRules">
         <el-form-item> 旧班组:{{ data[0].prWorkOrder.makeTeam.tsName }} </el-form-item>
@@ -88,12 +71,14 @@
 </template>
 
 <script>
-import wordReporting from "./js/wordReporting";
+import wordReporting from './js/wordReporting';
-import workReportingData from "./js/workReportingData";
+import workReportingData from './js/workReportingData';
+import { getList, getRecordList } from '@/api/productionManagement/workReportingManagement';
+
 export default {
   data() {
     return {
-      tabPosition: "workReporting",
+      tabPosition: 'workReporting',
       loading: false,
       data: [],
       form: {},
@@ -101,7 +86,7 @@ export default {
       teamDialog: false,
       teamForm: {},
       teamRules: {
-        makeTeam: [{ required: true, message: "请选择新班组", trigger: "blur" }],
+        makeTeam: [{ required: true, message: '请选择新班组', trigger: 'blur' }],
       },
       page: {
         pageSize: 10,
@@ -111,8 +96,8 @@ export default {
       option: {
         columnSort: true,
         tip: false,
-        height: "auto",
+        height: 'auto',
-        align: "center",
+        align: 'center',
         calcHeight: 32,
         simplePage: false,
         searchShow: true,
@@ -126,10 +111,10 @@ export default {
         viewBtn: false,
         delBtn: false,
         editBtn: false,
-        addBtnIcon: " ",
+        addBtnIcon: ' ',
-        viewBtnIcon: " ",
+        viewBtnIcon: ' ',
-        delBtnIcon: " ",
+        delBtnIcon: ' ',
-        editBtnIcon: " ",
+        editBtnIcon: ' ',
         addBtn: false,
         labelWidth: 120,
         searchLabelWidth: 120,
@@ -142,13 +127,12 @@ export default {
         gridBtn: false,
         searchShowBtn: false,
         showOverflowTooltip: true,
-        searchLabelPosition: "left",
+        searchLabelPosition: 'left',
-        searchLabelPosition: "left",
         searchGutter: 24,
         searchSpan: 6,
-        menuAlign: "left",
+        menuAlign: 'left',
         gridBtn: false,
-        searchMenuPosition: "right",
+        searchMenuPosition: 'right',
         column: [],
       },
     };
@@ -158,12 +142,20 @@ export default {
     this.option.column = wordReporting[this.tabPosition];
   },
   methods: {
+    // 扫描流程卡号 获取数据
+    handleSearchInput(key, value){
+      
+    },
     tabPositionChange() {
       this.option.column = wordReporting[this.tabPosition];
-      if (this.tabPosition == "workReporting") {
+      if (this.tabPosition == 'workReporting') {
-        this.data = workReportingData["data"];
+        this.data = workReportingData['data'];
       } else {
-        this.data = workReportingData["data"];
+        this.data = workReportingData['data'];
+        // getRecordList().then(res => {
+        //   this.data = res.data.records;
+        //   this.page.total = this.data.length;
+        // });
       }
       this.page.total = this.data.length;
     },
@@ -174,14 +166,14 @@ export default {
       this.teamDialog = true;
     },
     submit() {
-      this.$refs.teamForm.validate((valid) => {
+      this.$refs.teamForm.validate(valid => {
         if (valid) {
           this.teamDialog = false;
         }
       });
     },
     onLoad() {
-      this.data = workReportingData["data"];
+      this.data = workReportingData['data'];
       this.page.total = this.data.length;
     },
   },