添加字段，添加抽样记录页面

src/api/samplingRecords/index.js

@@ -0,0 +1,13 @@
+// 抽样记录
+import request from '@/utils/request';
+
+// 分页api /qms/samplingRecord/page
+export async function samplingRecordsPage(params) {
+  const res = await request.get(`/qms/samplingrecord/page`, {
+    params
+  });
+  if (res.data.code == 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}

src/views/inspectionTemplate/index.vue

@@ -207,6 +207,11 @@ export default {
           align: 'center',
           minWidth: 150
         },
+        {
+          label: '工序名称',
+          prop: 'taskName',
+          align: 'center'
+        },
         {
           label: '状态',
           prop: 'status',

src/views/inspectionWork/index.vue

@@ -1,7 +1,12 @@
 <template>
   <div class="ele-body">
     <el-card shadow="never">
-      <seek-page :seekList="seekList" @search="search" ref="search" :keyValue="'qms-inspectionWork-index-search'"></seek-page>
+      <seek-page
+        :seekList="seekList"
+        @search="search"
+        ref="search"
+        :keyValue="'qms-inspectionWork-index-search'"
+      ></seek-page>
 
       <ele-pro-table
         ref="table"
@@ -168,7 +173,8 @@
     removeItem,
     updateCertificateNumber,
     closeWorkList,
-    verificationQualityInspector
+    verificationQualityInspector,
+    closeWork
   } from '@/api/inspectionWork';
   import { queryTodo } from '@/api/bpm/task';
   import dictMixins from '@/mixins/dictMixins';
@@ -365,11 +371,19 @@
             align: 'center',
             width: 80,
             formatter: (row, column, cellValue) => {
-              return cellValue == 0
-                ? '未报工'
-                : cellValue == 1
-                ? '已报工'
-                : '已关闭';
+              // 状态（0未报工；1已报工；2已关闭；3待取样）
+              switch (cellValue) {
+                case 0:
+                  return '未报工';
+                case 1:
+                  return '已报工';
+                case 2:
+                  return '已关闭';
+                case 3:
+                  return '待取样';
+                default:
+                  return '';
+              }
             },
             fixed: 'right'
           },
@@ -390,6 +404,7 @@
         rowData: {},
         typeList: [], //类型列表
         qualityMode: [], //取样类型
+        // 状态（0未报工；1已报工；2已关闭；3待取样）
         statusList: [
           {
             value: 0,
@@ -398,6 +413,14 @@
           {
             value: 1,
             label: '已报工'
+          },
+          {
+            value: 2,
+            label: '已关闭'
+          },
+          {
+            value: 3,
+            label: '待取样'
           }
         ],
         addOpen: false,
@@ -559,7 +582,7 @@
       },
       search(where) {
         this.$refs.table.reload({
-          where: where,
+          where: where
           // page: 1
         });
       },

src/views/sample/sampleRecord/index.vue

@@ -0,0 +1,135 @@
+<template>
+  <div class="ele-body">
+    <el-card shadow="never">
+      <seek-page :seekList="seekList" @search="search"></seek-page>
+      <ele-pro-table
+        ref="table"
+        row-key="id"
+        :columns="columns"
+        :datasource="datasource"
+        cache-key="qms-2511141047-sampleRecord-table"
+        autoAmendPage
+      >
+        <template v-slot:toolbar>
+          <el-button type="primary" size="mini">新增</el-button>
+        </template>
+        <template v-slot:action="{ row }">
+          <el-link type="primary" :underline="false" icon="el-icon-edit">
+            编辑
+          </el-link>
+          <el-popconfirm
+            class="ele-action"
+            title="确定要删除此条数据吗？"
+            @confirm="deleteRow(row)"
+          >
+            <template v-slot:reference>
+              <el-link type="danger" :underline="false" icon="el-icon-delete">
+                删除
+              </el-link>
+            </template>
+          </el-popconfirm>
+        </template>
+      </ele-pro-table>
+    </el-card>
+  </div>
+</template>
+
+<script>
+  import dictMixins from '@/mixins/dictMixins';
+  import tableColumnsMixin from '@/mixins/tableColumnsMixin';
+  import { samplingRecordsPage } from '@/api/samplingRecords';
+
+  export default {
+    mixins: [dictMixins, tableColumnsMixin],
+    data() {
+      return {
+        columns: [
+          {
+            width: 50,
+            type: 'index',
+            columnKey: 'index',
+            align: 'center',
+            label: '序号'
+          },
+          {
+            prop: 'code',
+            label: '质检工单编码',
+            align: 'center',
+            minWidth: 110,
+            showOverflowTooltip: true
+          },
+          {
+            prop: 'status',
+            label: '状态',
+            align: 'center',
+            showOverflowTooltip: true,
+            minWidth: 150,
+            formatter: (row) => {}
+          },
+          {
+            columnKey: 'action',
+            label: '操作',
+            width: 220,
+            align: 'center',
+            resizable: false,
+            fixed: 'right',
+            slot: 'action',
+            showOverflowTooltip: true
+          }
+        ]
+      };
+    },
+    computed: {
+      seekList() {
+        return [
+          {
+            label: '质检工单编码：',
+            value: 'workOrderCode',
+            type: 'input',
+            placeholder: '请输入'
+          },
+          {
+            label: '来源单号：',
+            value: 'workOrderCode',
+            type: 'input',
+            placeholder: '请输入'
+          },
+          {
+            label: '类型：',
+            value: 'type',
+            type: 'select',
+            placeholder: '请输入',
+            planList: [
+              { label: '类型一', value: '1' },
+              { label: '类型二', value: '2' }
+            ]
+          }
+        ];
+      }
+    },
+    methods: {
+      // 刷新表格
+      reload(where = {}) {
+        this.$refs.table.reload({
+          where
+        });
+      },
+      /* 表格数据源 */
+      datasource({ page, limit, where, order }) {
+        // 参数
+        const body = {
+          ...where,
+          ...order,
+          pageNum: page,
+          size: limit
+        };
+        return samplingRecordsPage(body);
+      },
+      search(where) {
+        this.reload(where);
+      }
+    }
+  };
+</script>
+
+<style></style>

vue.config.js

@@ -38,8 +38,8 @@ module.exports = {
         // target: 'http://192.168.1.30:18086',
         // target: 'http://192.168.1.251:18186',
         // target: 'http://124.71.68.31:50001',
-        target: 'http://192.168.1.251:18086',
-        // target: 'http://192.168.1.3:18086', // 付丽
+        // target: 'http://192.168.1.251:18086',
+        target: 'http://192.168.1.3:18086', // 付丽
         changeOrigin: true, // 只有这个值为true的情况下 才表示开启跨域
         pathRewrite: {
           '^/api': ''