0401

src/views/business/dayworkList/form.vue

@@ -1,230 +0,0 @@
-<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

@@ -1,210 +0,0 @@
-<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>

src/views/business/reviseBath/form.vue

@@ -0,0 +1,253 @@
+<template>
+  <!-- 添加或修改项目信息对话框 -->
+  <el-drawer
+      v-model="visible"
+      size="90%"
+      direction="rtl"
+      :close-on-press-escape="false"
+  >
+    <div class="page-container form-container">
+      <div class="form-btns-container" style="display: flex; align-items: center;">
+        <span class="title-label" 
+        ><el-icon>
+            <Document/>
+          </el-icon>
+          计划详情</span
+        >
+      </div>
+      <!-- 主表 -->
+      <el-form
+        class="list-search-container"
+        :model="queryParams"
+        ref="queryRef"
+        :inline="true"
+      >
+        <el-form-item label="产品描述：">
+          <el-input
+            placeholder="请输入产品描述"
+            v-model.trim="queryParams.productDescription"
+            style="width: 150px"
+            clearable
+            @keyup.enter="handleQuerydaywork"
+            @keydown.enter.prevent
+          />
+        </el-form-item>
+        <el-form-item label="批次号：">
+          <el-input
+            placeholder="请输入批次号"
+            v-model.trim="queryParams.lotCode"
+            style="width: 130px"
+            clearable
+            @keyup.enter="handleQuerydaywork"
+            @keydown.enter.prevent
+          />
+        </el-form-item>
+        <!-- <el-form-item label="工段：">
+          <el-select-v2
+              v-model="queryParams.deptId"
+              :options="deptList"
+              placeholder="请选择工段"
+              style="width: 140px"
+              @change="handleQuerydaywork"
+          />
+        </el-form-item> -->
+        <el-form-item label="是否回退：">
+          <el-select
+            v-model="queryParams.isFallback"
+            placeholder="请选择是否回退"
+          >
+            <el-option
+              v-for="item in yes_no"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="是否废品回用：">
+          <el-select
+            v-model="queryParams.isWasteRecycling"
+            placeholder="请选择是否废品回用"
+          >
+            <el-option
+              v-for="item in yes_no"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="info" icon="Search" @click="handleQuerydaywork"
+            >搜索</el-button
+          >
+        </el-form-item>
+        <div style="margin-top: 20px;">
+        <el-button type="primary"  @click="handleFallback"
+            >回退</el-button
+          >
+          <el-button type="primary" @click="handleWasteRecycling"
+            >添加废品回用</el-button
+          >
+          <el-button type="primary"  @click="handleQuerydaywork"
+            >分批</el-button
+          >
+          <el-button type="primary"  @click="handleQuerydaywork"
+            >单批单改</el-button
+          >
+          <el-button type="primary"  @click="handleQuerydaywork"
+            >多批单改</el-button
+          >
+      </div>
+      </el-form>
+      <!-- 列表区 -->
+      <div class="el-table-container">
+        <el-table
+            ref="dayworkTable"
+            v-loading="loading"
+            row-key="id"
+            @selection-change="handleSelectionChange"
+            height="100%"
+            :data="dayworkList"
+        >
+          <el-table-column type="selection" width="40" align="center"/>
+          <el-table-column label="客户简称" prop="companyAlias" align="center"/>
+          <el-table-column label="生产计划单号" width="100" prop="productionPlanNo" align="center"/>
+          <el-table-column label="批次号" prop="lotCode" align="center"/>
+          <el-table-column label="产品描述" prop="productDescription" align="center"/>
+          <el-table-column label="图纸版本" width="80" prop="technologyVersion" align="center"/>
+          <el-table-column label="投产量" width="100" prop="productionQuantity" align="center"/>
+          <el-table-column
+                label="下达日期"
+                prop="createTime"
+                width="100"
+                align="center"
+            >
+              <template #default="scope">
+                <span>{{
+                    proxy.moment(scope.row.createTime).format("YYYY-MM-DD")
+                  }}</span>
+              </template>
+            </el-table-column>
+          <el-table-column label="当前工段" width="100" prop="deptName" align="center"/>
+          <el-table-column label="当前工序" width="120" prop="processAlias" align="center"/>
+          <el-table-column label="回退" width="60" prop="isFallback" align="center">
+            <template #default="scope">
+              <dict-tag
+                  :options="yes_no"
+                  :value="scope.row.isFallback"
+              />
+            </template>
+          </el-table-column>
+          <el-table-column label="废品回用" width="70" prop="isWasteRecycling" align="center">
+            <template #default="scope">
+              <dict-tag
+                  :options="yes_no"
+                  :value="scope.row.isWasteRecycling"
+              />
+            </template>
+          </el-table-column>
+          <el-table-column label="母批号" prop="fromCode" align="center"/>
+          <el-table-column
+              fixed="right"
+              label="操作"
+              align="center"
+              width="140px"
+          >
+            <template #default="scope">
+              <el-button
+                  link
+                  type="danger"
+                  icon="Delete"
+                  @click="handleDayworkWaste(scope.row)"
+              >批废
+              </el-button
+              >
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+    </div>
+  </el-drawer>
+</template>
+<script setup>
+import {
+  getDayworkInfo
+} from "@/api/business/daywork.js";
+const {proxy} = getCurrentInstance();
+/** 字典数组区 */
+const { yes_no } = proxy.useDict("yes_no");
+/** 表单抽屉 页变量 */
+const loading = ref(false);
+const dayworkList = ref([])
+const visible = ref(false);
+/** 查询对象 */
+const queryParams = ref({
+  pageNum: 1,
+  pageSize: 10,
+  lotCode: "",
+  deptId: null,
+  isFallback: "",
+  isWasteRecycling: "",
+});
+
+/***********************  方法区  ****************************/
+/** 打开抽屉 */
+const open = (row) => {
+  console.log(row)
+  queryParams.value.lineNumber = row.lineNumber
+  queryParams.value.productionPlanNo = row.productionPlanNo
+
+
+  //获取工段信息
+  getDayworkList()
+  visible.value = true;
+};
+/**获取生产计划列表 */
+function getDayworkList() {
+  loading.value = true;
+  getDayworkInfo(queryParams.value).then(res => {
+    if(res.code == 200) {
+      dayworkList.value = res.rows
+      loading.value = false
+    }
+  })
+}
+/**搜索 */
+function handleQuerydaywork() {
+  getDayworkList()
+}
+/**批量删除 */
+function handleDelete() {
+
+}
+
+/**
+ * 对话框关闭 事件
+ */
+function close() {
+  visible.value = false;
+}
+
+/**搜索栏清空 */
+function reset() {
+ queryParams = ref({
+  pageNum: 1,
+  pageSize: 10,
+  lotCode: "",
+  deptId: null,
+  isFallback: "",
+  isWasteRecycling: "",
+});
+}
+
+/** 取消按钮 */
+const handleCancel = () => {
+  visible.value = false;
+};
+
+/** 暴露给父组件的方法 */
+defineExpose({
+  open,
+});
+</script>

src/views/business/reviseBath/index.vue

@@ -156,6 +156,10 @@
       v-model:page="queryParams.pageNum"
       v-model:limit="queryParams.pageSize"
       @pagination="getList"
+    />
+       <!-- 产品批次详情 -->
+       <daywork-form
+      ref="dayworkFormRef"
     />
   </div>
 </template>
@@ -163,8 +167,7 @@
 <script setup name="ProductionPlan">
 import { getP2Plan } from "@/api/business/p2.js";
 import { listProductionPlanDetail } from "@/api/business/productionPlanDetail.js";
-import totalIcon2 from "@/assets/images/dashboard-total-icon-2.png";
-import totalIcon3 from "@/assets/images/dashboard-total-icon-3.png";
+import dayworkForm from "./form.vue";
 import { ref } from "vue";
 const { proxy } = getCurrentInstance();
 /** 字典数组区 */
@@ -202,7 +205,9 @@ function getList() {
 }
 
 /** 查看按钮操作 */
-function handleView(row) {}
+function handleView(row) {
+  proxy.$refs.dayworkFormRef.open(row);
+}
 
 /** 搜索按钮操作 */
 function handleQuery() {