329

src/api/business/daywork.js

@@ -1,17 +1,18 @@
 import request from '@/utils/request'
 
 const baseUrl = import.meta.env.VITE_APP_PRODUCTION_API
+
 /**
  * 获取 生产批次 列表
  * @param {*} data
  * @returns
  */
 export function listDaywork(query) {
-  return request({
-    url: baseUrl + '/business/productionDaywork/list',
-    method: 'get',
-    params: query
-  })
+    return request({
+        url: baseUrl + '/business/productionDaywork/list',
+        method: 'get',
+        params: query
+    })
 }
 
 /**
@@ -20,23 +21,24 @@ export function listDaywork(query) {
  * @returns
  */
 export function listDayworkItem(query) {
-  return request({
-    url: baseUrl + '/business/productionDaywork/listItem',
-    method: 'get',
-    params: query
-  })
+    return request({
+        url: baseUrl + '/business/productionDaywork/listItem',
+        method: 'get',
+        params: query
+    })
 }
+
 /**
  * 获取 生产批次报工 列表
  * @param {*} data
  * @returns
  */
 export function checkUseEquipment(data) {
-  return request({
-    url: baseUrl + '/business/productionDaywork/checkUseEquipment',
-    method: 'post',
-    data: data
-  })
+    return request({
+        url: baseUrl + '/business/productionDaywork/checkUseEquipment',
+        method: 'post',
+        data: data
+    })
 }
 
 /**
@@ -45,11 +47,11 @@ export function checkUseEquipment(data) {
  * @returns
  */
 export function updateItem(data) {
-  return request({
-    url: baseUrl + '/business/productionDaywork/updateItem',
-    method: 'post',
-    data: data
-  })
+    return request({
+        url: baseUrl + '/business/productionDaywork/updateItem',
+        method: 'post',
+        data: data
+    })
 }
 
 /**
@@ -58,19 +60,20 @@ export function updateItem(data) {
  * @returns
  */
 export function getProcessList(query) {
-  return request({
-    url: baseUrl + '/business/productionDaywork/getProcessList',
-    method: 'get',
-    params: query
-  })
+    return request({
+        url: baseUrl + '/business/productionDaywork/getProcessList',
+        method: 'get',
+        params: query
+    })
 }
+
 // 查询工段资源组能够选择的设备
 export function getEquipmentInfo(query) {
-  return request({
-   url: baseUrl + '/business/detail/equipmentInfo',
-    method: 'get',
-    params: query
-  })
+    return request({
+        url: baseUrl + '/business/detail/equipmentInfo',
+        method: 'get',
+        params: query
+    })
 }
 
 /**
@@ -79,23 +82,52 @@ export function getEquipmentInfo(query) {
  * @returns
  */
 export function getDayworkItemRejectList(query) {
-  return request({
-    url: baseUrl + '/business/productionDaywork/getDayworkItemRejectList',
-    method: 'get',
-    params: query
-  })
+    return request({
+        url: baseUrl + '/business/productionDaywork/getDayworkItemRejectList',
+        method: 'get',
+        params: query
+    })
 }
+
 /**
  * 修改 生产批次报工 列表
  * @param {*} data
  * @returns
  */
 export function updateDayworkItemInfo(data) {
-  return request({
-    url: baseUrl + '/business/productionDaywork/updateDayworkItemInfo',
-    method: 'post',
-    data: data
-  })
+    return request({
+        url: baseUrl + '/business/productionDaywork/updateDayworkItemInfo',
+        method: 'post',
+        data: data
+    })
+}
+
+export function addDaywork(data) {
+    return request({
+        url: baseUrl + '/business/daywork',
+        method: 'post',
+        data: data
+    })
 }
 
+export function getDaywork(id) {
+    return request({
+        url: baseUrl + '/business/daywork/' + id,
+        method: 'get'
+    })
+}
 
+export function updateDaywork(data) {
+    return request({
+        url: baseUrl + '/business/daywork',
+        method: 'put',
+        data: data
+    })
+}
+
+export function delDaywork(id) {
+    return request({
+        url: baseUrl + '/business/daywork/' + id,
+        method: 'delete'
+    })
+}

src/views/business/dayworkList/form.vue

@@ -0,0 +1,230 @@
+<template>
+  <!-- 添加或修改项目信息对话框 -->
+  <div class="el-drawer__wrapper">
+    <el-drawer :title="title" v-model="visible" direction="rtl" size="100%">
+      <div class="page-container form-container">
+        <div class="form-btns-container">
+                    <span class="title-label"><el-icon>
+                            <Document />
+                        </el-icon> 项目信息</span>
+          <el-button-group>
+            <el-button v-if="editStatus" type="primary" size="small" icon="Finished"
+                       @click="submitForm">保存</el-button>
+            <el-button v-else type="warning" size="small" icon="Edit" @click="editStatus = true">编辑</el-button>
+            <el-button v-if="form.id && editStatus" type="info" size="small" icon="Close"
+                       @click="editStatus = false">取消编辑</el-button>
+            <el-button v-if="form.id" type="success" size="small" @click="getForm">
+              <i class="fa fa-refresh" aria-hidden="true" /> 刷新
+            </el-button>
+          </el-button-group>
+          <div class="screen-btn" @click="handleScreen">
+            <template v-if="!isFullscreen">
+              <i class="fa fa-window-maximize" aria-hidden="true" />
+              <!-- <span>全屏</span> -->
+            </template>
+            <template v-else>
+              <i class="fa fa-window-restore" aria-hidden="true" />
+              <!-- <span>还原</span> -->
+            </template>
+          </div>
+          <div class="close-btn" @click="cancel">
+            <i class="fa fa-times" aria-hidden="true" />
+            <!-- <span>关闭</span> -->
+          </div>
+        </div>
+        <div class="Y-scrollbar" style="position: absolute; top: 32px; bottom: 0; width: 100%; overflow: auto">
+        </div>
+        <el-form ref="dayworkRef" class="master-container" :model="form" :rules="rules" label-width="120px">
+          <el-row :gutter="30">
+            <el-col :span="6">
+              <el-form-item label="工序合格数" prop="processQualifiedNum">
+                <el-input  v-if="editStatus" v-model="form.processQualifiedNum" placeholder="请输入工序合格数" />
+                <span v-else>{{ form.processQualifiedNum }}</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="员工编码" prop="userName">
+                <el-input  v-if="editStatus" v-model="form.userName" placeholder="请输入员工编码" />
+                <span v-else>{{ form.userName }}</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="员工姓名" prop="nickName">
+                <el-input  v-if="editStatus" v-model="form.nickName" placeholder="请输入员工姓名" />
+                <span v-else>{{ form.nickName }}</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="开始时间" prop="startTime">
+                <el-date-picker v-if="editStatus" clearable
+                                v-model="form.startTime"
+                                type="date"
+                                value-format="YYYY-MM-DD"
+                                placeholder="请选择开始时间">
+                </el-date-picker>
+                <span v--else>{{ form.startTime }}</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="结束时间" prop="endTime">
+                <el-date-picker v-if="editStatus" clearable
+                                v-model="form.endTime"
+                                type="date"
+                                value-format="YYYY-MM-DD"
+                                placeholder="请选择结束时间">
+                </el-date-picker>
+                <span v--else>{{ form.endTime }}</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="备注" prop="remark">
+                <el-input  v-if="editStatus" v-model="form.remark" placeholder="请输入备注" />
+                <span v-else>{{ form.remark }}</span>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+    </el-drawer>
+  </div>
+</template>
+<script setup>
+import {getDaywork,addDaywork,updateDaywork} from "@/api/business/daywork";
+const { proxy } = getCurrentInstance()
+/** 父组件传参 */
+const props = defineProps({
+  getList: {
+    type: Function,
+    default: () => { }
+  }
+})
+const { getList } = toRefs(props)
+/** 字典数组区 */
+/** 表单抽屉 页变量 */
+const title = ref("")
+const loading = ref(false)
+const multiple = ref(true)
+const visible = ref(false)
+const editStatus = ref(false)
+const isFullscreen = ref(false)
+const webHost = import.meta.env.VITE_APP_BASE_API
+const data = reactive({
+  form: {},
+  rules: {
+    processQualifiedNum: [
+      { required: true, message: "工序合格数不能为空", trigger: "blur" }
+    ],
+    userName: [
+      { required: true, message: "员工编码不能为空", trigger: "blur" }
+    ],
+    nickName: [
+      { required: true, message: "员工姓名不能为空", trigger: "blur" }
+    ],
+    startTime: [
+      { required: true, message: "开始时间不能为空", trigger: "blur" }
+    ],
+    endTime: [
+      { required: true, message: "结束时间不能为空", trigger: "blur" }
+    ],
+    status: [
+      { required: true, message: "批次生产状态不能为空", trigger: "change" }
+    ],
+  }
+});
+const { form, rules } = toRefs(data);
+/***********************  方法区  ****************************/
+/** 打开抽屉 */
+function open(id) {
+  reset();
+  visible.value = true;
+  if (id) {
+    getDaywork(id).then(response => {
+      form.value = response.data;
+      editStatus.value = false
+      title.value = "修改项目信息"
+    })
+  } else {
+    editStatus.value = true
+    title.value = "添加项目信息"
+  }
+}
+
+/** 取消按钮 */
+function cancel() {
+  visible.value = false;
+  reset();
+}
+
+/** 表单重置 */
+function reset() {
+  form.value = {
+    id: null,
+    tenantId: null,
+    productionPlanId: null,
+    productionPlanDetailId: null,
+    productionPlanDetailSubDetailId: null,
+    lotId: null,
+    deptId: null,
+    productId: null,
+    technologicalProcessId: null,
+    processQualifiedNum: null,
+    userId: null,
+    userName: null,
+    nickName: null,
+    startTime: null,
+    endTime: null,
+    remark: null,
+    status: null,
+    createTime: null,
+    creatorId: null,
+    updateTime: null,
+    updaterId: null,
+    deleted: null,
+    version: null
+  };
+  proxy.resetForm("dayworkRef");
+}
+
+/** 全屏缩放 */
+function handleScreen() {
+  const dom = document.querySelector('.list-container > .el-drawer__wrapper > .el-overlay')
+  isFullscreen.value = !isFullscreen.value
+  dom.style.position = isFullscreen.value ? 'fixed' : 'absolute'
+}
+
+
+/** 提交按钮 */
+function submitForm() {
+  proxy.$refs["dayworkRef"].validate(valid => {
+    if (valid) {
+      if (form.value.id != null) {
+        updateDaywork(form.value).then(response => {
+          proxy.$modal.msgSuccess("修改成功");
+          visible.value = false;
+          getList.value()
+        });
+      } else {
+        addDaywork(form.value).then(response => {
+          proxy.$modal.msgSuccess("新增成功");
+          visible.value = false;
+          getList.value()
+        });
+      }
+    }
+  });
+}
+
+/** 查询表单信息  */
+function getForm() {
+  loading.value = true
+  getDaywork(form.value.id).then(response => {
+    loading.value = false
+    form.value = response.data
+  })
+}
+
+/** 暴露给父组件的方法 */
+defineExpose({
+  open
+})
+</script>

src/views/business/dayworkList/index.vue

@@ -0,0 +1,210 @@
+<template>
+  <div class="page-container list-container">
+    <!-- 功能按钮区 -->
+    <div class="list-btns-container">
+      <el-button
+          type="primary"
+          size="small"
+          icon="Plus"
+          @click="handleAdd"
+          v-hasPermi="['business:daywork:add']"
+      >新增</el-button>
+
+      <el-button
+          type="success"
+          size="small"
+          icon="Edit"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['business:daywork:edit']"
+      >修改</el-button>
+
+      <el-button
+          type="danger"
+          size="small"
+          icon="Delete"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['business:daywork:remove']"
+      >删除</el-button>
+
+      <el-button
+          type="warning"
+          size="small"
+          icon="Download"
+          @click="handleExport"
+          v-hasPermi="['business:daywork:export']"
+      >导出</el-button>
+      <!--<right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>-->
+    </div>
+    <!-- 搜索区 -->
+    <el-form class="list-search-container" size="small" :model="queryParams" ref="queryRef" :inline="true" label-width="68px">
+      <el-form-item label="工序合格数：" prop="processQualifiedNum">
+        <el-input
+            v-model="queryParams.processQualifiedNum"
+            placeholder="请输入工序合格数"
+            clearable
+            @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="员工编码：" prop="userName">
+        <el-input
+            v-model="queryParams.userName"
+            placeholder="请输入员工编码"
+            clearable
+            @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="员工姓名：" prop="nickName">
+        <el-input
+            v-model="queryParams.nickName"
+            placeholder="请输入员工姓名"
+            clearable
+            @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="开始时间：" prop="startTime">
+        <el-date-picker clearable
+                        v-model="queryParams.startTime"
+                        type="date"
+                        value-format="YYYY-MM-DD"
+                        placeholder="请选择开始时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="结束时间：" prop="endTime">
+        <el-date-picker clearable
+                        v-model="queryParams.endTime"
+                        type="date"
+                        value-format="YYYY-MM-DD"
+                        placeholder="请选择结束时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+        <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <!-- 列表区 -->
+    <el-table v-loading="loading" :data="dayworkList" size="small" border height="100%" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="${comment}" align="center" prop="id" />
+      <el-table-column label="工序合格数" align="center" prop="processQualifiedNum" />
+      <el-table-column label="员工编码" align="center" prop="userName" />
+      <el-table-column label="员工姓名" align="center" prop="nickName" />
+      <el-table-column label="开始时间" align="center" prop="startTime" width="180">
+        <template #default="scope">
+          <span>{{ parseTime(scope.row.startTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="结束时间" align="center" prop="endTime" width="180">
+        <template #default="scope">
+          <span>{{ parseTime(scope.row.endTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="批次生产状态" align="center" prop="status" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template #default="scope">
+          <el-button link type="warning" size="small" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['business:daywork:edit']">修改</el-button>
+          <el-button link type="danger" size="small" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['business:daywork:remove']">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <!-- 分页 -->
+    <pagination v-show="total>0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList"/>
+
+    <!-- 表单 -->
+    <daywork-form ref="dayworkRef" :get-list="getList"></daywork-form>
+  </div>
+</template>
+
+<script setup name="Daywork">
+import { listDaywork, delDaywork } from "@/api/business/daywork";
+import dayworkForm from "./form"
+const { proxy } = getCurrentInstance()
+/** 字典数组区 */
+/** 查询 对象 */
+
+const dayworkList = ref([]);
+const loading = ref(true);
+const ids = ref([])
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+/** 查询对象 */
+const queryParams=ref({
+  pageNum: 1,
+  pageSize: 10,
+  processQualifiedNum: null,
+  userName: null,
+  nickName: null,
+  startTime: null,
+  endTime: null,
+  status: null,
+})
+
+/***********************  方法区  ****************************/
+
+/** 查询企业租户列表 */
+function getList() {
+  loading.value = true;
+  listDaywork(queryParams.value).then(response => {
+    dayworkList.value = response.rows;
+    total.value = response.total;
+    loading.value = false;
+  });
+}
+
+/** 搜索按钮操作 */
+function handleQuery() {
+  queryParams.value.pageNum = 1;
+  getList();
+}
+
+/** 重置按钮操作 */
+function resetQuery() {
+  proxy.resetForm("queryRef");
+  handleQuery();
+}
+
+// 多选框选中数据
+function handleSelectionChange(selection) {
+  ids.value = selection.map(item => item.id);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+}
+
+/** 新增按钮操作 */
+function handleAdd() {
+  proxy.$refs.dayworkRef.open()
+}
+
+/** 修改按钮操作 */
+function handleUpdate(row) {
+  const id = row.id || ids.value
+  proxy.$refs.dayworkRef.open(id)
+}
+
+
+/** 删除按钮操作 */
+function handleDelete(row) {
+  const _ids = row.id || ids.value;
+  proxy.$modal.confirm('是否确认删除选中的数据项？').then(function() {
+    return delDaywork(_ids);
+  }).then(() => {
+    getList();
+    proxy.$modal.msgSuccess("删除成功！");
+  }).catch(() => {});
+}
+
+/** 导出按钮操作 */
+function handleExport() {
+  proxy.download('business/daywork/export', {
+    ...queryParams.value
+  }, `daywork_${new Date().getTime()}.xlsx`)
+}
+
+getList();
+</script>