0910

src/api/business/dayworkItemExamine.js

@@ -51,7 +51,13 @@ export function updateExamine(data) {
     data: data
   })
 }
-
+export function multiplyEdit(data) {
+  return request({
+    url:baseUrl+  '/business/examine/multiplyEdit',
+    method: 'put',
+    data: data
+  })
+}
 // 删除分选包装审核申请
 export function delExamine(id) {
   return request({

src/api/business/lot.js

@@ -109,6 +109,13 @@ export function getLotInfoForInBatches(data) {
     data: data
   })
 }
+export function getAllLot(params) {
+  return request({
+    url: baseUrl + '/business/lot/getAllLot/',
+    method: 'get',
+    params
+  })
+}
 
 export function listCarriers(params) {
   return request({

src/api/business/productionPlanDetail.js

@@ -21,7 +21,13 @@ export function reportListPlanDetail(query) {
     params: query
   })
 }
-
+export function addLot(data) {
+  return request({
+    url: baseUrl + '/business/productionPlanDetail/addLot',
+    method: 'post',
+    data: data
+  })
+}
 
 // 查询生产计划明细列表
 export function listProductionPlanDetailList(query) {

src/views/business/examine/index.vue

@@ -5,7 +5,7 @@
             <!-- 搜索区 -->
             <el-form class="list-search-container" :model="queryParams" ref="queryRef" :inline="true"
                 style="margin-right: 0px">
-                <el-form-item class="section-title" label="审核申请" />
+                <el-form-item class="section-title" label="包装审核申请" />
                 <el-form-item label="生产计划单号：">
                     <el-input placeholder="请输入生产计划单号/批次号" v-model.trim="queryParams.keywords" @keydown.enter.prevent clearable
                         style="width: 200px" />
@@ -56,6 +56,14 @@
                     <el-button type="danger" icon="Delete" v-hasPermi="['business:examine:delete']" :disabled="multiple" @click="handleDeleted">批量删除
                     </el-button>
                 </el-form-item>
+                <el-form-item style="margin-left: 0">
+                    <el-button type="success" icon="Check" v-hasPermi="['business:examine:pass']" :disabled="multiple" @click="handleMultiply('pass')">批量通过
+                    </el-button>
+                </el-form-item>
+                <el-form-item style="margin-left: 0">
+                    <el-button type="warning" icon="Close" v-hasPermi="['business:examine:fail']" :disabled="multiple" @click="handleMultiply('fail')">批量不通过
+                    </el-button>
+                </el-form-item>
             </el-form>
 
             <div class="el-table-container">
@@ -100,7 +108,7 @@
 
 <script setup name="examine" >
 import {
-    listExamine,delExamine,addExamine
+    listExamine,delExamine,addExamine,multiplyEdit
 } from "@/api/business/dayworkItemExamine.js";
 import { getDeptListByUserId } from "@/api/business/planDetailSubDetail.js";
 import examineForm from "./form.vue";
@@ -165,6 +173,49 @@ function handleSelectionChange(selection) {
     multiple.value = !selections.value.length;
     console.log(multiple.value)
 }
+//批量通过 不通过
+function handleMultiply(data) {
+    console.log(data)
+    if(data == 'pass'){
+    proxy.$modal
+      .confirm("是否确定批量审核通过")
+      .then(function () {
+        let passList = selections.value
+        passList.forEach(item => {
+          item.status = 2
+        });
+        multiplyEdit(passList).then(res =>{
+        proxy.$refs.examineTable.clearSelection()
+        getDayworkItemExamine();
+        })
+       
+      })
+    }else{
+        proxy.$modal
+      .confirm("是否确定批量审核不通过")
+      .then(function () {
+        let flag = true
+        selections.value.forEach(item => {
+          if(item.isNextProcess) {
+            flag = false
+            proxy.$modal.msgError(item.lotCode+"批次已经周转到下序，不能审核不通过");
+          }
+        });
+        if(flag) {
+            let passList = selections.value
+        passList.forEach(item => {
+          item.status = 1
+          item.reviewComments = "批量审核不通过"
+        });
+        multiplyEdit(passList).then(res =>{
+        proxy.$refs.examineTable.clearSelection()
+        getDayworkItemExamine();
+        })
+    }
+})
+}
+}
+
 //批量删除
 function handleDeleted() {
   proxy.$modal

src/views/business/inventoryCheck/form.vue

@@ -161,6 +161,8 @@ const queryParams = ref({
 /** 打开抽屉 */
 const open = (row) => {
   visible.value = true;
+  console.log(is_identification.value)
+  is_identification.value = is_identification.value.filter(item =>item.value !=0)
   reset();
   detailInfo.value = proxy.deepClone(row);
   getDeptList().then((response) => {

src/views/business/lot/DialogWasteRecycling.vue

@@ -29,14 +29,14 @@
           </el-col>
           <el-col :span="9">
             <el-form-item
-              label="领料部门"
+              label="首序工段"
               label-width="90px"
               prop="requisitionDepartmentId"
             >
               <el-select-v2
                 v-model="form.requisitionDepartmentId"
                 :options="deptList"
-                placeholder="请选择领料工段"
+                placeholder="请选择首序工段"
                 style="width: 165px"
               />
             </el-form-item>
@@ -51,10 +51,13 @@
           </el-col>
           <el-col :span="7">
             <el-form-item label="生成批数" label-width="90px" prop="lotNumber">
-              <el-input
+              <el-input-number
                 v-model="form.lotNumber"
                 style="width: 200px"
-                @input="handleUpdateLotNumber"
+                controls-position="right"
+                :min="0"
+                :precision="0"
+                @input="(val) => {handleUpdateLotNumber(val)}"
               />
             </el-form-item>
           </el-col>
@@ -266,7 +269,8 @@ const reset = () => {
   proxy.resetForm("wasteRecyclingRef");
 };
 /**生成批数变化*/
-function handleUpdateLotNumber() {
+function handleUpdateLotNumber(val) {
+  form.value.lotNumber = val
   if (form.value.lotNumber > 0) {
     //查询该计划单最后一个批数(排除分批的批次)
     getLastLot({
@@ -289,6 +293,12 @@ function handleUpdateLotNumber() {
                 .toString()
                 .padStart(partTwo.match(/[0-9]+/)[0].length, "0")
           );
+          if(newNumber  == 1000) {
+              proxy.$modal.msgError("生成批数最多是" + i+",请重新输入");
+              form.value.lotNumber = null
+              form.value.newLots = null
+              return
+          }
         }
         var lots = [];
         for (let i = 0; i < numbers.length; i++) {

src/views/business/productionBatch/DialogAddLot.vue

@@ -0,0 +1,156 @@
+<template>
+  <!-- 添加或修改项目信息对话框 -->
+  <el-dialog
+    title="追加批次"
+    v-model="visible"
+    width="500px"
+    append-to-body
+    draggable
+  >
+    <div class="form-container">
+      <el-form
+        ref="addLotRef"
+        class="master-container"
+        v-loading="loading"
+        :model="form"
+        label-width="100px"
+        :rules="rules"
+      >
+        <el-row :gutter="20">
+          <el-col :span="18">
+            <el-form-item label="追加批次数量" label-width="120px" prop="lotNumber">
+              <el-input-number
+                v-model="form.lotNumber"
+                style="width: 300px"
+                :min="0"
+                :precision="0"
+                controls-position="right"
+                @input="(val) => {handleUpdateLotNumber(val)}"
+                placeholder="请输入追加批次数量"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="24">
+            <el-form-item label="新生成批号" label-width="120px" prop="newLots">
+              <el-input
+                type="textarea"
+                v-model.trim="form.newLots"
+                
+                :disabled="true"
+                style="width: 710px"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+    <template #footer>
+      <el-button type="primary" icon="Check" @click="handleSave"
+        >确定</el-button
+      >
+    </template>
+  </el-dialog>
+</template>
+<script setup>
+import { onMounted, ref } from "vue";
+const { proxy } = getCurrentInstance();
+const emit = defineEmits(["handleAddLotNum"]);
+/**工艺版本变更变量 */
+const loading = ref(false);
+const visible = ref(false);
+const lastLot = ref({})
+const validateLotNumber = (rule, value, callback) => {
+  const min = 0;
+if (value <= min) {
+    callback(new Error("当前追加批数应大于0"));
+  } else {
+    callback();
+  }
+};
+/**查询对象 */
+const data = reactive({
+  form:{},
+  rules: {
+    lotNumber: [
+      { required: true, message: "追加批数不能为空", trigger: "blur" },
+      { validator: validateLotNumber, trigger: "blur" }
+    ]
+  },
+});
+const {  form, rules } = toRefs(data);
+
+/***********************  方法区  ****************************/
+/** 打开抽屉 */
+const open = (data) => {
+  reset();
+  lastLot.value = data
+  console.log(lastLot.value)
+  visible.value = true;
+};
+
+/** 表单重置 */
+const reset = () => {
+  form.value = {
+    lotNumber: null,
+    newLots: null
+  };
+  proxy.resetForm("addLotRef");
+};
+/**生成批数变化*/
+function handleUpdateLotNumber(val) {
+  form.value.lotNumber = val
+  console.log(form.value.lotNumber)
+    //查询该计划单最后一个批数(排除分批的批次)
+        var partOne = lastLot.value.substring(0, 8);
+        var partTwo = lastLot.value.substring(8, 11);
+        //获取生成批号
+        var prefix = partTwo.replace(/[0-9]/g, "");
+        var number = parseInt(partTwo.match(/[0-9]+/)[0]);
+        var numbers = [];
+        let currentNumber = number;
+        console.log(form.value.lotNumber)
+        for (let i = 0; i < form.value.lotNumber; i++) {
+          var newNumber = currentNumber + (i + 1);
+          numbers.push(
+            prefix +
+              newNumber
+                .toString()
+                .padStart(partTwo.match(/[0-9]+/)[0].length, "0")
+          );
+          if(newNumber  == 1000) {
+              proxy.$modal.msgError("生成批数最多是" + i+",请重新输入");
+              form.value.lotNumber = null
+              form.value.newLots = null
+              return
+          }
+        }
+        var lots = [];
+        for (let i = 0; i < numbers.length; i++) {
+          lots.push(partOne + numbers[i] + "0");
+        }
+        form.value.newLots = lots;
+        console.log(lots)
+}
+//批次带回
+const handleSave = () => {
+  proxy.$refs["addLotRef"].validate((valid) => {
+    if (valid) {
+      emit("handleAddLotNum", form.value.newLots);
+      visible.value = false;
+      reset();
+    }
+  });
+};
+/** 取消按钮 */
+const handleCancel = () => {
+  visible.value = false;
+  reset();
+};
+
+/** 暴露给父组件的方法 */
+defineExpose({
+  open,
+});
+</script>

src/views/business/productionBatch/index.vue

@@ -60,6 +60,8 @@
         " link type="primary" icon="Postcard" @click="handleAddSubDetail(scope.row)"
                   v-hasPermi="['business:productionBatch:add']">投产
                 </el-button>
+                <el-button v-if="scope.row.lotTotalNumber && scope.row.lotTotalNumber >0"  v-hasPermi="['business:productionBatch:check']" link type="warning" icon="Search" @click="handleCheckLotInfo(scope.row)">批次信息
+                </el-button>
                 <!-- <el-button
                   icon="edit"
                   link
@@ -125,6 +127,7 @@
     <production-lot-form ref="productionRef" @handleSaveSuccess="handleFresh()" />
     <!-- 领料信息弹窗 -->
     <check-material ref="checkMaterialRef" />
+    <lot-info ref="lotInfoRef" @handleSaveSuccess="handleFresh()" />
     <!-- 工艺版本变更弹窗
     <production-dialog
       ref="productionDetailRef"
@@ -144,6 +147,7 @@ import {
 import { updateLotCodeStatus } from "@/api/business/productionPlanDetail.js";
 import checkMaterial from "./DialogCheckMaterial";
 import productionLotForm from "./form";
+import lotInfo from "./lotInfoForm.vue"
 // import productionDialog from "./DialogProduction";
 const { proxy } = getCurrentInstance();
 /** 字典数组区 */
@@ -328,6 +332,10 @@ function handleShowSubDetailDialog(row) {
     }
   });
 }
+//查看计划单批次
+function handleCheckLotInfo(row) {
+  proxy.$refs.lotInfoRef.open(row)
+}
 
 /** 删除子计划事件 */
 function handleDelSubDetail(row) {

src/views/business/productionBatch/lotInfoForm.vue

@@ -0,0 +1,390 @@
+<template>
+  <el-drawer
+    title="批次信息"
+    :with-header="false"
+    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>批次信息</span>
+        </span>
+        <el-button type="primary" @click="handleSave()"> 保存 </el-button>
+        <div class="close-btn" @click="cancel">
+          <i class="fa fa-times" aria-hidden="true" />
+          <!-- <span>关闭</span> -->
+        </div>
+      </div>
+      <div class="form-container">
+        <div style="padding: 16px 16px 0 16px">
+          <el-row :gutter="20" style="margin-top: 15px; padding-bottom: 10px">
+            <el-col :span="4">
+              <span class="leftInfo">客户简称</span>
+              <span class="rightInfo">{{ detailInfo.companyAlias }}</span>
+            </el-col>
+            <el-col :span="4">
+              <span class="middleInfo">计划单号</span>
+              <span class="rightInfo">{{ detailInfo.productionPlanNo }}</span>
+            </el-col>
+            <el-col :span="7">
+              <span class="middleInfo">产品描述</span>
+              <span class="rightInfo">{{ detailInfo.productDescription }}</span>
+            </el-col>
+            <el-col :span="3">
+              <span class="middleInfo">工艺版本</span>
+              <span class="rightInfo">{{ detailInfo.technologyVersion }}</span>
+            </el-col>
+            <el-col :span="4">
+              <span class="middleInfo">总投产量</span>
+              <span class="rightInfo">{{ detailInfo.productionQuantity }}</span>
+            </el-col>
+          </el-row>
+          <el-row
+            :gutter="20"
+            style="
+              margin-top: 15px;
+              padding-bottom: 10px;
+              border-bottom: 1px solid #999;
+            "
+          >
+            <el-col :span="4">
+              <span class="leftInfo">总批数</span>
+              <span class="rightInfo">{{ detailInfo.totalLotNumber }}</span>
+            </el-col>
+            <el-col :span="4">
+              <span class="middleInfo">单批量</span>
+              <span class="rightInfo">{{ detailInfo.oneLotQuantity }}</span>
+            </el-col>
+            <el-col :span="7">
+              <span class="middleInfo">尾批量</span>
+              <span class="rightInfo">{{ detailInfo.lastLotQuantity }}</span>
+            </el-col>
+            <el-col :span="4">
+              <span class="middleInfo">领料部门</span>
+              <span class="rightInfo" style="padding-left: 15px">{{
+                detailInfo.requisitionDepartmentName
+              }}</span>
+            </el-col>
+          </el-row>
+
+          <el-row :gutter="20" style="margin-top: 15px; margin-bottom: 15px">
+            <el-col :span="6">
+              <el-button type="primary"  v-hasPermi="['business:productionBatch:addLot']" @click="handleAdd()">
+                追加批次
+              </el-button>
+              <el-button type="danger"  v-hasPermi="['business:productionBatch:removeLot']" @click="handleMultiplyDelete()">
+                删除
+              </el-button>
+            </el-col>
+          </el-row>
+        </div>
+      </div>
+      <div class="el-table-container">
+        <el-table
+          v-loading="loading"
+          :data="lotList"
+          size="small"
+          border
+          height="100%%"
+          @selection-change="handleSelectionChange"
+        >
+          <el-table-column type="selection" width="40" align="center" />
+          <el-table-column
+            type="index"
+            label="序号"
+            width="50"
+            align="center"
+          />
+          <el-table-column
+            label="批次号"
+            prop="lotCode"
+            align="center"
+            width="200px"
+          >
+            <template #default="scope">
+              <el-button
+                link
+                type="primary"
+                @click="handleColumnClick(scope.row.lotCode)"
+                ><span>{{ scope.row.lotCode }}</span></el-button
+              >
+            </template>
+          </el-table-column>
+          <el-table-column
+            label="投产量"
+            align="center"
+            prop="productionQuantity"
+            width="200px"
+          >
+       <template #default="scope">
+        <el-input-number v-if="scope.row.editStatus"
+                v-model="scope.row.productionQuantity"
+                style="width: 200px"
+                :min="0"
+                :max="99999"
+                :precision="0"
+                controls-position="right"
+              />
+              <span v-else>{{ scope.row.productionQuantity }}</span>
+       </template>
+      </el-table-column>
+          <el-table-column
+            label="追增批次"
+            align="center"
+            prop="isSuperaddition"
+            width="200"
+          >
+            <template #default="scope">
+              <dict-tag
+                :options="yes_no"
+                :value="scope.row.isSuperaddition"
+              /> </template
+          ></el-table-column>
+          <el-table-column label="标识" align="center">
+            <template #default="scope">
+              <el-tag
+                v-if="scope.row.isWaste == 1"
+                class="spacing"
+                type="danger"
+                >{{ "批废" }}</el-tag
+              >
+              <el-tag
+                v-if="scope.row.isAmend == 1"
+                class="spacing"
+                type="danger"
+                >{{ "工艺修改" }}</el-tag
+              >
+              <el-tag
+                v-if="scope.row.isWasteRecycling == 1"
+                class="spacing"
+                type="primary"
+                >{{ "废品回用" }}</el-tag
+              >
+            </template>
+          </el-table-column>
+          <el-table-column label="操作" width="200px" align="center">
+            <template #default="scope">
+              <el-button
+                v-if="
+                  !scope.row.editStatus &&
+                  scope.row.isSuperaddition == 1 &&
+                  !scope.row.hasDaywork
+                "
+                link
+                type="primary"
+                v-hasPermi="['business:productionBatch:editLot']"
+                @click="handleUpDate(scope.row)"
+                >修改</el-button
+              >
+              <el-button
+                v-if="scope.row.isSuperaddition == 1"
+                link
+                type="danger"
+                v-hasPermi="['business:productionBatch:removeLot']"
+                @click="handleDelete(scope.row)"
+                >删除</el-button
+              >
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+    </div>
+    <!-- 追加批次 -->
+    <add-lot-dialog ref="addLotDialogRef" @handleAddLotNum="handleAddLotNum" />
+  </el-drawer>
+</template>
+
+<script setup>
+import { getAllLot,getLastLot } from "@/api/business/lot.js";
+import { addLot } from "@/api/business/productionPlanDetail.js";
+import router from "@/router";
+import addLotDialog from "./DialogAddLot.vue"
+const emit = defineEmits(["handleSaveSuccess"]);
+import { ref } from "vue";
+const { proxy } = getCurrentInstance();
+//字典
+const { yes_no } = proxy.useDict("yes_no");
+/** 表单抽屉 页变量 */
+const loading = ref(false);
+const lotList = ref([]);
+const detailInfo = ref({});
+const visible = ref(false);
+const lastLot = ref(null);
+const selections = ref([])
+//列表是否曾经有过追加批次
+const hadSuperaddition = ref(false);
+
+/****************************  方法区  ****************************/
+/** 打开抽屉 */
+const open = (row) => {
+  visible.value = true;
+  console.log(row);
+  detailInfo.value = proxy.deepClone(row);
+  getLotList(row);
+};
+
+/** 取消按钮 */
+const cancel = () => {
+  visible.value = false;
+};
+//多选框选中数据
+function handleSelectionChange(selection) {
+  selections.value = selection;
+  console.log(selections.value)
+}
+//多选删除
+function handleMultiplyDelete() {
+  console.log(selections.value)
+  let flag = true
+  selections.value.forEach((item) => {
+    if (item.isSuperaddition == 0) {
+      flag = false
+      proxy.$modal.msgError("不能删除不是追加的批次");
+      return;
+    }else{
+    if(item.hasDaywork) {
+      flag = false
+      proxy.$modal.msgError(item.lotCode+"有投产，不能删除");
+      return
+    }
+  }
+  });
+  if(flag) {
+   lotList.value = lotList.value.filter(
+      (item) => !selections.value.some((selectedItem) => selectedItem === item))
+      getLastLotCode()
+      //判断列表的追加批次是不是都删完了,如果曾经有，但是删完了，则添加追加批次时的批次号做判断
+      lotList.value.findIndex(item => item.isSuperaddition == 1) == -1 ? hadSuperaddition.value = true : hadSuperaddition.value = false
+   }
+}
+function getLastLotCode() {
+  const maxLotCodeObj = lotList.value.reduce((max, current) => {
+  // 提取每个lotCode中间的三位数，并转换为数字
+  const maxCode = parseInt(max.lotCode.substr(8, 3), 10);
+  const currentCode = parseInt(current.lotCode.substr(8, 3), 10);
+  // 比较并返回具有最大值的对象
+  return currentCode > maxCode ? current : max;
+});
+
+// 输出最大的lotCode
+console.log(maxLotCodeObj.lotCode);
+lastLot.value = maxLotCodeObj.lotCode
+}
+//删除
+function handleDelete(row) {
+  if (row.isSuperaddition == 0) {
+      proxy.$modal.msgError("不能删除不是追加的批次");
+      return;
+    }else{
+    if(row.hasDaywork) {
+      proxy.$modal.msgError(row.lotCode+"有投产，不能删除");
+      return
+    }else{
+      lotList.value.splice(lotList.value.indexOf(row), 1);
+      getLastLotCode()
+      lotList.value.findIndex(item => item.isSuperaddition == 1) == -1 ? hadSuperaddition.value = true : hadSuperaddition.value = false
+    }
+  }
+}
+//修改
+function handleUpDate(row) {
+ row.editStatus = true
+}
+
+function getLotList(row) {
+  loading.value = true;
+  getAllLot({id:row.id}).then((res) => {
+    if (res.code == 200) {
+      res.data.forEach(item =>{
+        item.editStatus = false
+      })
+      lotList.value = res.data;
+      loading.value = false;
+    }
+  });
+}
+//保存
+function handleSave() {
+  let superadditionList = lotList.value.filter(item => item.isSuperaddition == 1)
+  let flag = true
+  superadditionList.forEach(item =>{
+    if(item.productionQuantity ==0) {
+      flag = false
+      proxy.$modal.msgError(item.lotCode+"追加批次投产数量不能为0");
+    }
+  })
+  if(flag) {
+  detailInfo.value.lotList = superadditionList
+  console.log(detailInfo.value)
+  addLot(detailInfo.value).then((res) => {
+    if (res.code == 200) {
+      proxy.$modal.msgSuccess("保存成功");
+      emit("handleSaveSuccess");
+      visible.value = false;
+    }
+  })
+  }
+}
+//追加批次
+function handleAdd() {
+  //判断如果此时已经追加了，但没保存
+  if(lotList.value.findIndex(item => item.id == null) > -1 ||hadSuperaddition.value) {
+    proxy.$refs.addLotDialogRef.open(lastLot.value)
+  }else {
+    getLastLot({
+      productionPlanDetailId: detailInfo.value.id,
+    }).then((res) => {
+      if (res.code == 200) {
+        var lastLot = res.data.lotCode;
+        proxy.$refs.addLotDialogRef.open(lastLot)
+      }
+    })
+  }
+}
+//批次带回
+function handleAddLotNum(data) {
+  lastLot.value = data[data.length - 1]
+  console.log(data)
+  data.forEach(item =>{
+    lotList.value.unshift({lotCode:item,productionQuantity:detailInfo.value.oneLotQuantity,isSuperaddition:1, editStatus: true,
+      productionPlanDetailId:detailInfo.value.id,technologicalProcessId:detailInfo.value.technologicalProcessId,
+      technologyVersion:detailInfo.value.technologyVersion,productId:detailInfo.value.productId})
+  })
+}
+/** 打开批次详情页 */
+function handleColumnClick(lotCode) {
+  router.push({ path: "/reviseBath/lotFormParticulars/" + lotCode });
+}
+
+/** 暴露给父组件的方法 */
+defineExpose({
+  open,
+});
+</script>
+<style scoped>
+.leftInfo {
+  font-size: 16px;
+  width: 120px;
+  display: inline-block;
+}
+.middleInfo {
+  font-size: 16px;
+  width: 120px;
+  display: inline-block;
+}
+.rightInfo {
+  font-size: 16px;
+  padding-left: 20px;
+}
+:deep(
+    .column-container > .el-drawer__wrapper .el-drawer__body,
+    .column-container .el-drawer__body,
+    .row-container .el-drawer__body
+  ) {
+  padding: 8px;
+  margin-bottom: 20px;
+}
+</style>

src/views/business/report/index.vue

@@ -43,10 +43,11 @@
                 <div class="el-table-inner-container">
                     <el-table ref="dayworkTable" :data="dayworkItemList" v-loading="dayworkLoading"
                         highlight-current-row height="100%">
-                        <el-table-column label="批次号" prop="lotCode" width="160" align="center" />
+                        <el-table-column label="批次号" prop="lotCode" width="140" align="center" />
                         <el-table-column label="产品描述" prop="productDescription" align="center" />
                         <el-table-column label="图纸版本" prop="technologyVersion" width="60" align="center" />
-                        <el-table-column label="工序名称" prop="processAlias" width="160" align="center" />
+                        <el-table-column label="工序名称" prop="processAlias" width="150" align="center" />
+                        <el-table-column label="机床号" prop="equipmentDetailCode" width="100" align="center" />
                         <el-table-column label="投产量" prop="prodNum" width="60" align="center" />
                         <el-table-column label="合格数" prop="qualifiedNum" width="60" align="center" />
                         <el-table-column label="废品数" prop="rejectNum" width="60" align="center" />
@@ -71,7 +72,7 @@
                                 </el-popover>
                             </template>
                         </el-table-column>
-                        <el-table-column label="操作者" prop="nickName" width="160" align="center" />
+                        <el-table-column label="操作者" prop="nickName" width="100" align="center" />
                     </el-table>
                 </div>
             </div>