ezhizao_zx 1 سال پیش
والد
کامیت
83cb877fa8

+ 23 - 15
src/api/business/outsourcedOrder.js

@@ -1,5 +1,5 @@
 import request from '@/utils/request'
-import { download,downloadPdf } from '@/utils/request'
+import { download, downloadPdf } from '@/utils/request'
 const baseUrl = import.meta.env.VITE_APP_PRODUCTION_API
 
 // 查询外协单
@@ -55,24 +55,24 @@ export function processesForOutsource(data) {
 
 // 导出
 export function exportOutsource(data) {
-  download(
-    baseUrl+"/business/outsource/export",
-    {
-      ...data,
-    },
-    `外协发出单_${new Date().getTime()}.xlsx`
-  )
+	download(
+		baseUrl + "/business/outsource/export",
+		{
+			...data,
+		},
+		`外协发出单_${new Date().getTime()}.xlsx`
+	)
 }
 
 //打印
 export function printOutsource(data) {
-  downloadPdf(
-    baseUrl+"/business/outsource/printDetailPdf",
-    {
-      ...data,
-    },
-    `外协发出单_${new Date().getTime()}.pdf`
-  )
+	downloadPdf(
+		baseUrl + "/business/outsource/printDetailPdf",
+		{
+			...data,
+		},
+		`外协发出单_${new Date().getTime()}.pdf`
+	)
 }
 
 
@@ -92,3 +92,11 @@ export function delOrder(id) {
 		method: 'delete'
 	})
 }
+
+export function getCarrierInfo(data) {
+	return request({
+		url: baseUrl + '/business/outsource/getCarrierInfo',
+		method: 'post',
+		data: data
+	})
+}

+ 12 - 42
src/views/business/carrier/formCategory.vue

@@ -1,53 +1,25 @@
 <template>
-  <el-dialog
-    title="载具类别表单"
-    v-model="visible"
-    width="400px"
-    append-to-body
-    draggable
-  >
+  <el-dialog title="载具类别表单" v-model="visible" width="400px" append-to-body draggable>
     <div class="form-container">
-      <el-form
-        ref="carrierCategoryRef"
-        v-loading="loading"
-        class="master-container"
-        :model="form"
-        :rules="rules"
-        label-width="80px"
-      >
+      <el-form ref="carrierCategoryRef" v-loading="loading" class="master-container" :model="form" :rules="rules"
+        label-width="80px">
         <el-form-item label="父级类别" prop="parentId" :rules="rules">
-          <el-tree-select
-            v-model="form.parentId"
-            :data="parentCategories"
-            check-strictly
-            :render-after-expand="false"
-          />
+          <el-tree-select v-model="form.parentId" :data="parentCategories" check-strictly
+            :render-after-expand="false" />
         </el-form-item>
         <el-form-item label="类别名称" prop="name">
           <el-input v-model.trim="form.name" placeholder="类别名称" />
         </el-form-item>
-        <el-form-item label="检查箱子" prop="status">
+        <el-form-item label="检查箱子" prop="isInspection">
           <el-select v-model="form.isInspection">
-            <el-option
-              v-for="item in is_allow_more"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            ></el-option>
+            <el-option v-for="item in is_allow_more" :key="item.value" :label="item.label"
+              :value="item.value"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item
-          label="是否多批"
-          prop="status"
-          v-if="form.parentId !== '0'"
-        >
+        <el-form-item label="是否多批" prop="isAllowMore" v-if="form.parentId !== '0'">
           <el-select v-model="form.isAllowMore">
-            <el-option
-              v-for="item in is_allow_more"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            ></el-option>
+            <el-option v-for="item in is_allow_more" :key="item.value" :label="item.label"
+              :value="item.value"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="备注" prop="remark">
@@ -56,9 +28,7 @@
       </el-form>
     </div>
     <template #footer>
-      <el-button type="primary" icon="Check" @click="handleSave"
-        >确 定</el-button
-      >
+      <el-button type="primary" icon="Check" @click="handleSave">确 定</el-button>
       <el-button icon="Close" @click="handleCancel">取 消</el-button>
     </template>
   </el-dialog>

+ 76 - 182
src/views/business/outsource/index.vue

@@ -1,226 +1,101 @@
 <template>
   <div class="page-container column-container">
     <!-- 搜索区 -->
-    <el-form
-      class="list-search-container"
-      :model="queryParams"
-      ref="queryRef"
-      :inline="true"
-    >
+    <el-form class="list-search-container" :model="queryParams" ref="queryRef" :inline="true">
       <el-form-item label="单据号:" prop="formCode">
-        <el-input
-          v-model="queryParams.formCode"
-          placeholder="请输入单据号"
-          style="width: 144px"
-          clearable
-          @keyup.enter="handleQuery"
-        />
+        <el-input v-model="queryParams.formCode" placeholder="请输入单据号" style="width: 144px" clearable
+          @keyup.enter="handleQuery" />
       </el-form-item>
       <el-form-item label="表单日期:" prop="formDate">
-        <el-date-picker
-          v-model="queryParams.formDate"
-          type="date"
-          style="width: 144px"
-          clearable
-          value-format="YYYY-MM-DD"
-          placeholder="请选择表单日期"
-        >
+        <el-date-picker v-model="queryParams.formDate" type="date" style="width: 144px" clearable
+          value-format="YYYY-MM-DD" placeholder="请选择表单日期">
         </el-date-picker>
       </el-form-item>
       <el-form-item label="外协商名称:" prop="supplierName">
-        <el-input
-          v-model="queryParams.supplierName"
-          placeholder="请输入关键字"
-          style="width: 144px"
-          clearable
-          @keyup.enter="handleQuery"
-        />
+        <el-input v-model="queryParams.supplierName" placeholder="请输入关键字" style="width: 144px" clearable
+          @keyup.enter="handleQuery" />
       </el-form-item>
       <el-form-item label="送货方式:" prop="deliveryMethod">
-        <el-select
-          v-model="queryParams.deliveryMethod"
-          style="width: 144px"
-          clearable
-          placeholder="请选择"
-        >
-          <el-option
-            v-for="dict in delivery_method"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
+        <el-select v-model="queryParams.deliveryMethod" style="width: 144px" clearable placeholder="请选择">
+          <el-option v-for="dict in delivery_method" :key="dict.value" :label="dict.label" :value="dict.value" />
         </el-select>
       </el-form-item>
       <el-form-item label="带箱方式:" prop="packagingMethod">
-        <el-select
-          v-model="queryParams.packagingMethod"
-          style="width: 144px"
-          clearable
-          placeholder="请选择"
-        >
-          <el-option
-            v-for="dict in packaging_method"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
+        <el-select v-model="queryParams.packagingMethod" style="width: 144px" clearable placeholder="请选择">
+          <el-option v-for="dict in packaging_method" :key="dict.value" :label="dict.label" :value="dict.value" />
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="Search" @click="handleQuery"
-          >搜索</el-button
-        >
+        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
         <el-button icon="Refresh" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
 
     <!-- 功能按钮区 -->
     <div class="list-btns-container">
-      <el-button
-        type="primary"
-        icon="Plus"
-        @click="handleAdd"
-        v-hasPermi="['business:outsource:add']"
-      >
+      <el-button type="primary" icon="Plus" @click="handleAdd" v-hasPermi="['business:outsource:add']">
         新增
       </el-button>
-      <el-button
-        type="danger"
-        icon="Delete"
-        :disabled="multiple"
-        @click="handleDelete"
-        v-hasPermi="['business:outsource:remove']"
-      >
+      <el-button type="danger" icon="Delete" :disabled="multiple" @click="handleDelete"
+        v-hasPermi="['business:outsource:remove']">
         删除
       </el-button>
 
-      <el-button
-        type="warning"
-        icon="Download"
-        :disabled="ids.length != 1"
-        @click="handleExport"
-        v-hasPermi="['business:outsource:export']"
-      >
+      <el-button type="warning" icon="Download" :disabled="ids.length != 1" @click="handleExport"
+        v-hasPermi="['business:outsource:export']">
         导出
       </el-button>
-      <el-button
-        type="warning"
-        icon="Download"
-        :disabled="ids.length != 1"
-        @click="handlePrint"
-        v-hasPermi="['business:outsource:export']"
-      >
+      <el-button type="warning" icon="Download" :disabled="ids.length != 1" @click="handlePrint"
+        v-hasPermi="['business:outsource:export']">
         打印
       </el-button>
+      <el-button type="warning" icon="Printer" :disabled="ids.length === 0" @click="handlePrintCarrierCode"
+        v-hasPermi="['business:outsource:exportCarrierCode']">
+        箱码打印
+      </el-button>
     </div>
 
     <!-- 渲染数据区 -->
     <div class="el-table-container">
       <div class="el-table-inner-container">
-        <el-table
-          v-loading="loading"
-          :data="orderList"
-          size="small"
-          border
-          height="100%"
-          @selection-change="handleSelectionChange"
-        >
+        <el-table v-loading="loading" :data="orderList" size="small" border height="100%"
+          @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="48" align="center" />
-          <el-table-column
-            label="外协单号"
-            align="center"
-            prop="formCode"
-            width="120"
-          />
-          <el-table-column
-            label="外协日期"
-            align="center"
-            prop="formDate"
-            width="120"
-          >
+          <el-table-column label="外协单号" align="center" prop="formCode" width="120" />
+          <el-table-column label="外协日期" align="center" prop="formDate" width="120">
             <template #default="scope">
               {{ parseTime(scope.row.formDate, "{y}-{m}-{d}") }}
             </template>
           </el-table-column>
-          <el-table-column
-            label="外协商名称"
-            align="center"
-            prop="supplierName"
-            width="320"
-          />
-          <el-table-column
-            label="结算方式"
-            align="center"
-            prop="settlementType"
-            width="120"
-          >
+          <el-table-column label="外协商名称" align="center" prop="supplierName" width="320" />
+          <el-table-column label="结算方式" align="center" prop="settlementType" width="120">
             <template #default="scope">
-              <dict-tag
-                :options="settlement_type"
-                :value="scope.row.settlementType"
-              />
+              <dict-tag :options="settlement_type" :value="scope.row.settlementType" />
             </template>
           </el-table-column>
-          <el-table-column
-            label="送货方式"
-            align="center"
-            prop="deliveryMethod"
-            width="120"
-          >
+          <el-table-column label="送货方式" align="center" prop="deliveryMethod" width="120">
             <template #default="scope">
-              <dict-tag
-                :options="delivery_method"
-                :value="scope.row.deliveryMethod"
-              />
+              <dict-tag :options="delivery_method" :value="scope.row.deliveryMethod" />
             </template>
           </el-table-column>
-          <el-table-column
-            label="带箱方式"
-            align="center"
-            prop="packagingMethod"
-            width="120"
-          >
+          <el-table-column label="带箱方式" align="center" prop="packagingMethod" width="120">
             <template #default="scope">
-              <dict-tag
-                :options="packaging_method"
-                :value="scope.row.packagingMethod"
-              />
+              <dict-tag :options="packaging_method" :value="scope.row.packagingMethod" />
             </template>
           </el-table-column>
           <el-table-column label="备注" align="center" prop="remark" />
-          <el-table-column
-            label="操作"
-            align="center"
-            class-name="small-padding fixed-width"
-            width="200"
-          >
+          <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="200">
             <template #default="scope">
-              <el-button
-                v-if="scope.row.isSubmit == 1"
-                link
-                type="warning"
-                icon="Edit"
-                @click="handleUpdate(scope.row)"
-                v-hasPermi="['business:outsource:edit']"
-              >
+              <el-button v-if="scope.row.isSubmit == 1" link type="warning" icon="Edit" @click="handleUpdate(scope.row)"
+                v-hasPermi="['business:outsource:edit']">
                 编辑
               </el-button>
-              <el-button
-                link
-                type="primary"
-                icon="View"
-                @click="handleView(scope.row)"
-                v-hasPermi="['business:outsource:query']"
-              >
+              <el-button link type="primary" icon="View" @click="handleView(scope.row)"
+                v-hasPermi="['business:outsource:query']">
                 查看
               </el-button>
-              <el-button
-                link
-                type="danger"
-                icon="Delete"
-                @click="handleDelete(scope.row)"
-                v-hasPermi="['business:outsource:remove']"
-              >
+              <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)"
+                v-hasPermi="['business:outsource:remove']">
                 删除
               </el-button>
             </template>
@@ -230,22 +105,18 @@
     </div>
 
     <!-- 分页 -->
-    <pagination
-      v-show="total > 0"
-      :total="total"
-      v-model:page="queryParams.pageNum"
-      v-model:limit="queryParams.pageSize"
-      @pagination="getList"
-    />
+    <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
+      v-model:limit="queryParams.pageSize" @pagination="getList" />
 
     <!-- 表单 -->
-    <order-form
-      ref="orderRef"
-      :get-list="getList"
-      :delivery-method="delivery_method"
-      :settlement-type="settlement_type"
-      :packaging-method="packaging_method"
-    />
+    <order-form ref="orderRef" :get-list="getList" :delivery-method="delivery_method" :settlement-type="settlement_type"
+      :packaging-method="packaging_method" />
+    <!-- 打印箱码 -->
+    <div id="image-group" style="height: 0px; width: 0px">
+      <el-image v-for="item in printCarriers" :key="item.id" :src="webHost + item.qcCode" fit="cover"
+        style="width: 100mm; height: 100mm">
+      </el-image>
+    </div>
   </div>
 </template>
 
@@ -255,8 +126,10 @@ import {
   delOrder,
   exportOutsource,
   printOutsource,
+  getCarrierInfo
 } from "@/api/business/outsourcedOrder";
 import orderForm from "./form";
+import printJS from "print-js";
 const { proxy } = getCurrentInstance();
 /** 字典数组区 */
 const { delivery_method } = proxy.useDict("delivery_method");
@@ -270,6 +143,7 @@ const ids = ref([]);
 const single = ref(true);
 const multiple = ref(true);
 const total = ref(0);
+const printCarriers = ref([])
 /** 查询对象 */
 const queryParams = ref({
   pageNum: 1,
@@ -331,7 +205,7 @@ function handleUpdate(row) {
 }
 function handleView(row) {
   const id = row.id || ids.value;
-  row.flag =false
+  row.flag = false
   proxy.$refs.orderRef.open(row);
 }
 
@@ -349,7 +223,7 @@ function handleDelete(row) {
         getList();
         proxy.$modal.msgSuccess("删除成功!");
       })
-      .catch(() => {});
+      .catch(() => { });
   } else {
     proxy.$modal.msgError("已提交单据,不能删除!");
   }
@@ -364,6 +238,26 @@ function handleExport() {
 function handlePrint() {
   printOutsource({ id: ids.value[0] });
 }
+/** 打印箱码 */
+function handlePrintCarrierCode() {
+  // 获取箱码地址
+  if (ids.value.length === 0) {
+    // 判断是否选中行
+    proxy.$modal.msgWarning('请选择需要打印箱码的外协单')
+    return
+  }
+  getCarrierInfo(ids.value).then(res => {
+    if (res.code === 200) {
+      printCarriers.value = res.data
+      const imageGroup = document.getElementById("image-group");
+      printJS({
+        printable: "image-group", // 这里是你要打印内容的DOM元素的id
+        type: "html",
+        style: "@page { size: auto;  margin: 0mm; }", // 可以添加打印样式
+      });
+    }
+  })
+}
 
 getList();
 </script>

+ 67 - 160
src/views/business/reviseBath/form.vue

@@ -1,199 +1,106 @@
 <template>
   <!-- 添加或修改项目信息对话框 -->
-  <el-drawer
-      v-model="visible"
-      size="90%"
-      direction="rtl"
-      :close-on-press-escape="false"
-  >
+  <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/>
+        <span class="title-label"><el-icon>
+            <Document />
           </el-icon>
-          计划详情</span
-        >
+          计划详情</span>
       </div>
       <!-- 主表 -->
-      <el-form
-        class="list-search-container"
-        :model="queryParams"
-        ref="queryRef"
-        :inline="true"
-      >
+      <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-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-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"
-          />
+          <el-select-v2 v-model="queryParams.deptId" :options="deptList" placeholder="请选择工段" style="width: 140px" />
         </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 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 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-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-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="lotList"
-        >
-          <el-table-column type="selection" width="40" align="center"/>
-          <el-table-column label="客户简称" prop="companyAlias" width="120" align="center"/>
-          <el-table-column label="生产计划单号" width="100" prop="productionPlanNo" align="center"/>
-          <el-table-column label="批次号" prop="lotCode" width="130" 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 ref="dayworkTable" v-loading="loading" row-key="id" @selection-change="handleSelectionChange"
+          height="100%" :data="lotList">
+          <el-table-column type="selection" width="40" align="center" />
+          <el-table-column label="客户简称" prop="companyAlias" width="120" align="center" />
+          <el-table-column label="生产计划单号" width="100" prop="productionPlanNo" align="center" />
+          <el-table-column label="批次号" prop="lotCode" width="130" 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"
-              />
+              <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"
-              />
+              <dict-tag :options="yes_no" :value="scope.row.isWasteRecycling" />
             </template>
           </el-table-column>
           <el-table-column label="批废" width="70" prop="isWaste" align="center">
             <template #default="scope">
-              <dict-tag
-                  :options="yes_no"
-                  :value="scope.row.isWaste"
-              />
+              <dict-tag :options="yes_no" :value="scope.row.isWaste" />
             </template>
           </el-table-column>
-          <el-table-column label="母批号" prop="fromCode" align="center"/>
-          <el-table-column
-              fixed="right"
-              label="操作"
-              align="center"
-              width="140px"
-          >
+          <el-table-column label="母批号" prop="fromCode" align="center" />
+          <el-table-column fixed="right" label="操作" align="center" width="140px">
             <template #default="scope">
-              <el-button v-if="scope.row.isWaste == 0"
-                  link
-                  type="danger"
-                  icon="Delete"
-                  @click="handlelotWaste(scope.row)"
-              >批废
-              </el-button
-              >
-              <el-button v-else
-                  link
-                  type="primary"
-                  icon="View"
-                  @click="handleChecklotWaste(scope.row)"
-              >查看
-              </el-button
-              >
+              <el-button v-if="scope.row.isWaste == 0" link type="danger" icon="Delete"
+                @click="handlelotWaste(scope.row)">批废
+              </el-button>
+              <el-button v-else link type="primary" icon="View" @click="handleChecklotWaste(scope.row)">查看
+              </el-button>
             </template>
           </el-table-column>
         </el-table>
       </div>
-      <lot-waste-dialog ref="lotWasteDialogRef" @handleSaveSuccess="open(currentProductionPlan)"/>
+      <lot-waste-dialog ref="lotWasteDialogRef" @handleSaveSuccess="open(currentProductionPlan)" />
       <waste-recycling-dialog ref="wasteRecyclingDialogRef"></waste-recycling-dialog>
-      
+
     </div>
   </el-drawer>
 </template>
 <script setup>
 import {
-  getDayworkInfo,getDeptList
+  getDayworkInfo, getDeptList
 } from "@/api/business/daywork.js";
 import lotWasteDialog from './dayworkWasteDialog.vue'
-const {proxy} = getCurrentInstance();
+const { proxy } = getCurrentInstance();
 /** 字典数组区 */
 const { yes_no } = proxy.useDict("yes_no");
 /** 表单抽屉 页变量 */
@@ -212,8 +119,8 @@ const queryParams = ref({
   isWasteRecycling: "",
 });
 const queryDeptParams = ref({
-  lineNumber:'',
-  productionPlanNo:''
+  lineNumber: '',
+  productionPlanNo: ''
 })
 
 /***********************  方法区  ****************************/
@@ -225,8 +132,8 @@ const open = (row) => {
   queryDeptParams.value.lineNumber = row.lineNumber
   queryDeptParams.value.productionPlanNo = row.productionPlanNo
   getDeptList(queryDeptParams.value).then(res => {
-    if(res.code == 200) {
-        deptList.value = res.data
+    if (res.code == 200) {
+      deptList.value = res.data
     }
   })
   //获取工段信息
@@ -237,7 +144,7 @@ const open = (row) => {
 function getDayworkList() {
   loading.value = true;
   getDayworkInfo(queryParams.value).then(res => {
-    if(res.code == 200) {
+    if (res.code == 200) {
       lotList.value = res.rows
       loading.value = false
     }
@@ -251,7 +158,7 @@ function handleQuerydaywork() {
 function handlelotWaste(row) {
   //flag为true时代表批废
   row.flag = false
-   proxy.$refs.lotWasteDialogRef.open(row)
+  proxy.$refs.lotWasteDialogRef.open(row)
 }
 /**查看 */
 function handleChecklotWaste(row) {
@@ -267,14 +174,14 @@ function close() {
 
 /**搜索栏清空 */
 function reset() {
- queryParams = ref({
-  pageNum: 1,
-  pageSize: 10,
-  lotCode: "",
-  deptId: null,
-  isFallback: "",
-  isWasteRecycling: "",
-});
+  queryParams.value = {
+    pageNum: 1,
+    pageSize: 10,
+    lotCode: "",
+    deptId: null,
+    isFallback: "",
+    isWasteRecycling: ""
+  }
   proxy.resetForm("queryRef");
 }