提交

src/views/business/lot/index.vue

@@ -1,65 +1,33 @@
 <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="产品描述：">
-        <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.productionPlanNo"
-          style="width: 120px"
-          clearable
-          @keyup.enter="handleQuerydaywork"
-          @keydown.enter.prevent
-        />
+        <el-input placeholder="请输入生产计划单号" v-model.trim="queryParams.productionPlanNo" style="width: 120px" clearable
+          @keyup.enter="handleQuerydaywork" @keydown.enter.prevent />
       </el-form-item>
       <!-- <el-form-item label="序号：">
         <el-input placeholder="请输入序号" v-model.trim="queryParams.lineNumber" style="width: 130px" 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-autocomplete
-          v-model.trim="deptName"
-          clearable
-          :fetch-suggestions="queryDeptSearchAsync"
-          placeholder="请选择工段"
-          @select="handleDeptSelect"
-          style="width: 140px"
-          @clear="handleClearDept"
-        >
+        <el-autocomplete v-model.trim="deptName" clearable :fetch-suggestions="queryDeptSearchAsync" placeholder="请选择工段"
+          @select="handleDeptSelect" style="width: 140px" @clear="handleClearDept">
           <template #default="{ item }">
-            <div
-              style="
+            <div style="
                 display: flex;
                 flex-direction: row;
                 justify-content: space-between;
-              "
-            >
+              ">
               <div class="name" style="font-size: 12px">
                 {{ item.deptName }}
               </div>
@@ -68,67 +36,30 @@
         </el-autocomplete>
       </el-form-item>
       <el-form-item label="标识：">
-        <el-select
-          style="width: 160px"
-          multiple
-          v-model="queryParams.flags"
-          collapse-tags
-          collapse-tags-tooltip
-          clearable
-          placeholder="请选择标识"
-          @change="handleFlagChange"
-        >
-          <el-option
-            v-for="item in is_identification"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          ></el-option>
+        <el-select style="width: 160px" multiple v-model="queryParams.flags" collapse-tags collapse-tags-tooltip
+          clearable placeholder="请选择标识" @change="handleFlagChange">
+          <el-option v-for="item in is_identification" :key="item.value" :label="item.label"
+            :value="item.value"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="时间：">
-        <el-date-picker
-          v-model="queryParams.startTime"
-          type="date"
-          value-format="YYYY-MM-DD"
-          :editable="false"
-          :clearable="false"
-          placeholder="请选择开始时间"
-          style="width: 130px"
-          @change="handleDateChange"
-        />
+        <el-date-picker v-model="queryParams.startTime" type="date" value-format="YYYY-MM-DD" :editable="false"
+          :clearable="false" placeholder="请选择开始时间" style="width: 130px" @change="handleDateChange" />
         <span>To</span>
-        <el-date-picker
-          v-model="queryParams.endTime"
-          type="date"
-          value-format="YYYY-MM-DD"
-          :editable="false"
-          :clearable="false"
-          placeholder="请选择结束时间"
-          style="width: 130px"
-          @change="handleDateChange"
-        />
+        <el-date-picker v-model="queryParams.endTime" type="date" value-format="YYYY-MM-DD" :editable="false"
+          :clearable="false" placeholder="请选择结束时间" style="width: 130px" @change="handleDateChange" />
       </el-form-item>
       <el-form-item label="工序：">
         <!-- <el-select-v2 v-model="processAlias" :options="processList" placeholder="请选择工序" style="width: 140px"
           @change="handleProcessChange" /> -->
-        <el-autocomplete
-          v-model.trim="processAlias"
-          clearable
-          :fetch-suggestions="queryProcessSearchAsync"
-          placeholder="请选择工序"
-          @select="handleProcessSelect"
-          style="width: 140px"
-          @clear="handleClearProcess"
-        >
+        <el-autocomplete v-model.trim="processAlias" clearable :fetch-suggestions="queryProcessSearchAsync"
+          placeholder="请选择工序" @select="handleProcessSelect" style="width: 140px" @clear="handleClearProcess">
           <template #default="{ item }">
-            <div
-              style="
+            <div style="
                 display: flex;
                 flex-direction: row;
                 justify-content: space-between;
-              "
-            >
+              ">
               <div class="name" style="font-size: 12px">
                 {{ item.label }}
               </div>
@@ -137,175 +68,68 @@
         </el-autocomplete>
       </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="handleWasteRecycling"
-          :disabled="selections.length == 0 || selections.length > 1"
-          v-hasPermi="['business:lot:wasteRecycling']"
-          >添加废品回用</el-button
-        >
-        <el-button
-          :disabled="selections.length !== 1"
-          type="primary"
-          @click="showInBatch"
-          v-hasPermi="['business:lot:inBatch']"
-          >分批</el-button
-        >
-        <el-button
-          type="primary"
-          :disabled="once"
-          @click="handleOnceSingleChange"
-          v-hasPermi="['business:lot:onceSingleChange']"
-          >单批单改</el-button
-        >
-        <el-button
-          type="primary"
-          :disabled="multi"
-          @click="handleMultiSingleChange"
-          v-hasPermi="['business:lot:multiSingleChange']"
-          >多批单改</el-button
-        >
+        <el-button type="primary" @click="handleWasteRecycling"
+          :disabled="selections.length == 0 || selections.length > 1 || checkRecycle()"
+          v-hasPermi="['business:lot:wasteRecycling']">添加废品回用</el-button>
+        <el-button :disabled="selections.length !== 1 || checkRecycle()" type="primary" @click="showInBatch"
+          v-hasPermi="['business:lot:inBatch']">分批</el-button>
+        <el-button type="primary" :disabled="once || checkRecycle()" @click="handleOnceSingleChange"
+          v-hasPermi="['business:lot:onceSingleChange']">单批单改</el-button>
+        <el-button type="primary" :disabled="multi || checkRecycle()" @click="handleMultiSingleChange"
+          v-hasPermi="['business:lot:multiSingleChange']">多批单改</el-button>
       </div>
     </el-form>
     <!-- 列表区 -->
     <div class="el-table-container">
       <div class="el-table-inner-container">
-        <el-table
-          ref="dayworkTable"
-          v-loading="loading"
-          row-key="lotId"
-          @selection-change="handleSelectionChange"
-          height="100%"
-          :data="lotList"
-        >
+        <el-table ref="dayworkTable" v-loading="loading" row-key="lotId" @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="序号"
-            width="60"
-            prop="lineNumber"
-            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="序号" width="60" prop="lineNumber" align="center" />
 
-          <el-table-column
-            label="批次号"
-            prop="lotCode"
-            align="center"
-            width="150px"
-          >
+          <el-table-column label="批次号" prop="lotCode" align="center" width="150px">
             <template #default="scope">
-              <el-button
-                link
-                type="primary"
-                @click="handleColumnClick(scope.row.lotCode)"
-                ><span>{{ scope.row.lotCode }}</span></el-button
-              >
+              <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="产品描述"
-            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"
-          >
+          <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>
+      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="100" prop="deptName" align="center" />
+          <el-table-column label="当前工序" width="120" prop="processAlias" align="center" />
           <el-table-column label="标识" width="300" 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
-              >
+              <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="母批号" prop="fromCode" align="center" >
+          <el-table-column label="母批号" prop="fromCode" align="center">
             <template #default="scope">
-              <el-button
-                link
-                type="primary"
-                width="150px"
-                @click="handleColumnClick(scope.row.fromCode)"
-                ><span>{{ scope.row.fromCode }}</span></el-button
-              >
+              <el-button link type="primary" width="150px" @click="handleColumnClick(scope.row.fromCode)"><span>{{
+      scope.row.fromCode }}</span></el-button>
             </template>
           </el-table-column>
         </el-table>
       </div>
     </div>
     <!-- 分页 -->
-    <pagination
-      v-show="total > 0"
-      :total="total"
-      v-model:page="queryParams.pageNum"
-      v-model:limit="queryParams.pageSize"
-      @pagination="getLot"
-    />
-    <waste-recycling-dialog
-      ref="wasteRecyclingDialogRef" @handleSaveSuccess="getLot()"
-    ></waste-recycling-dialog>
+    <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
+      v-model:limit="queryParams.pageSize" @pagination="getLot" />
+    <waste-recycling-dialog ref="wasteRecyclingDialogRef" @handleSaveSuccess="getLot()"></waste-recycling-dialog>
     <InBatchesDialog ref="inBatchesDialogRef" :getList="handleQuerydaywork" />
     <once-change ref="onceChangeRef" @handleSaveSuccess="getLot()" />
     <multi-change ref="multiChangeRef" @handleSaveSuccess="getLot()" />
@@ -607,6 +431,10 @@ const handleClearDept = () => {
 const handleFlagChange = (selection) => {
   console.log(selection);
 };
+const checkRecycle = () => {
+  // 判断是否是废品回用，废品回用的无论分批还是单批单改多批单改废品回用都不能做
+  return selections.value.some(v => v.isWasteRecycling == 1)
+}
 onMounted(() => {
   getDept();
 });

src/views/business/noCurrentReject/DialogRejectInfo.vue

@@ -1,30 +1,18 @@
 <template>
-  <el-dialog
-    title="添加非本序废品信息"
-    v-model="visible"
-    width="1000px"
-    append-to-body
-    draggable
-    v-loading="loading"
-  >
+  <el-dialog title="添加非本序废品信息" v-model="visible" width="1000px" append-to-body draggable v-loading="loading">
     <div class="form-container">
       <div style="padding: 16px 16px 0 16px">
         <el-row :gutter="20">
-          <span style="font-weight: bold; font-size: 18px"
-            >批次号：{{ detailInfo.lotCode }}</span
-          >
+          <span style="font-weight: bold; font-size: 18px">批次号：{{ detailInfo.lotCode }}</span>
         </el-row>
         <el-row :gutter="20" style="margin-top: 15px">
           <span style="font-weight: bold">基础信息</span>
         </el-row>
-        <el-row
-          :gutter="20"
-          style="
+        <el-row :gutter="20" style="
             margin-top: 15px;
             padding-bottom: 10px;
             border-bottom: 1px solid #999;
-          "
-        >
+          ">
           <el-col :span="11">
             <span class="leftInfo">客户简称</span>
             <span class="rightInfo">{{ detailInfo.companyAlias }}</span>
@@ -38,14 +26,11 @@
             <span class="rightInfo">{{ detailInfo.lotCode }}</span>
           </el-col>
         </el-row>
-        <el-row
-          :gutter="20"
-          style="
+        <el-row :gutter="20" style="
             margin-top: 15px;
             padding-bottom: 10px;
             border-bottom: 1px solid #999;
-          "
-        >
+          ">
           <el-col :span="11">
             <span class="leftInfo">产品描述</span>
             <span class="rightInfo">{{ detailInfo.productDescription }}</span>
@@ -59,14 +44,11 @@
             <span class="rightInfo">{{ detailInfo.productionQuantity }}</span>
           </el-col>
         </el-row>
-        <el-row
-          :gutter="20"
-          style="
+        <el-row :gutter="20" style="
             margin-top: 15px;
             padding-bottom: 10px;
             border-bottom: 1px solid #999;
-          "
-        >
+          ">
           <el-col :span="11">
             <span class="leftInfo">下达日期</span>
             <span class="rightInfo">{{ detailInfo.createTime }}</span>
@@ -86,40 +68,20 @@
           <span style="font-weight: bold">废品信息</span>
         </el-row>
       </div>
-      <el-form
-        ref="noCurrent"
-        v-loading="loading"
-        class="master-container"
-        :model="detailInfo"
-        :rules="rules"
-        label-width="80px"
-      >
+      <el-form ref="noCurrent" v-loading="loading" class="master-container" :model="detailInfo" :rules="rules"
+        label-width="80px">
         <el-row :gutter="24">
           <el-col :span="8">
             <el-form-item label="发现工段" label-width="80px" prop="findDeptId">
-              <el-select-v2
-                v-model="detailInfo.findDeptName"
-                :options="deptList"
-                placeholder="请选择工段"
-                @change="getFindProcess"
-                style="width: 140px"
-              />
+              <el-select-v2 v-model="detailInfo.findDeptName" :options="deptList" placeholder="请选择工段"
+                @change="getFindProcess" style="width: 140px" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item
-              label="发现工序"
-              label-width="100px"
-              prop="findTechnologicalProcessId"
-            >
-              <el-select-v2
-                v-model="detailInfo.findTechnologicalProcessName"
-                :options="findProcessList"
-                @change="selectFindProcess"
-                placeholder="请选择工序"
-                :disabled="detailInfo.findDeptId == null"
-                style="width: 140px"
-              >
+            <el-form-item label="发现工序" label-width="100px" prop="findTechnologicalProcessId">
+              <el-select-v2 v-model="detailInfo.findTechnologicalProcessName" :options="findProcessList"
+                @change="selectFindProcess" placeholder="请选择工序" :disabled="detailInfo.findDeptId == null"
+                style="width: 140px">
                 <template #default="{ index, item }">
                   <span style="float: left">{{ index + 1 }}</span>
                   <span style="margin-left: 8px">{{ item.label }}</span>
@@ -129,32 +91,19 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="发现人" label-width="100px">
-              <el-autocomplete
-                v-if="editStatus && type !== 'alterOrder'"
-                :fetch-suggestions="querySearchAsync"
-                :trigger-on-focus="true"
-                style="width: 100%"
-                v-model="detailInfo.findUserName"
-                placeholder="选择人员"
-                popper-class="my-autocomplete"
-                @select="handleSelectEmployee"
-              >
+              <el-autocomplete v-if="editStatus && type !== 'alterOrder'" :fetch-suggestions="querySearchAsync"
+                :trigger-on-focus="true" style="width: 100%" v-model="detailInfo.findUserName" placeholder="选择人员"
+                popper-class="my-autocomplete" @select="handleSelectEmployee">
                 <template #default="{ item }">
-                  <div
-                    style="
+                  <div style="
                       display: flex;
                       flex-direction: row;
                       justify-content: space-between;
-                    "
-                  >
+                    ">
                     <div class="name" style="font-size: 12px">
                       {{ item.nickName }}
                     </div>
-                    <span
-                      class="code"
-                      style="font-size: 10px; color: darkgrey"
-                      >{{ item.userName }}</span
-                    >
+                    <span class="code" style="font-size: 10px; color: darkgrey">{{ item.userName }}</span>
                   </div>
                 </template>
               </el-autocomplete>
@@ -186,29 +135,14 @@
         <el-row :gutter="24">
           <el-col :span="8">
             <el-form-item label="责任工段" label-width="80px" prop="deptId">
-              <el-select-v2
-                v-model="detailInfo.deptName"
-                :options="deptList"
-                placeholder="请选择工段"
-                @change="getProcess"
-                style="width: 140px"
-              />
+              <el-select-v2 v-model="detailInfo.deptName" :options="deptList" placeholder="请选择工段" @change="getProcess"
+                style="width: 140px" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item
-              label="责任工序"
-              label-width="100px"
-              prop="technologicalProcessId"
-            >
-              <el-select-v2
-                v-model="detailInfo.technologicalProcessName"
-                :options="processList"
-                placeholder="请选择工序"
-                :disabled="detailInfo.deptId == null"
-                @change="selectProcess"
-                style="width: 140px"
-              >
+            <el-form-item label="责任工序" label-width="100px" prop="technologicalProcessId">
+              <el-select-v2 v-model="detailInfo.technologicalProcessName" :options="processList" placeholder="请选择工序"
+                :disabled="detailInfo.deptId == null" @change="selectProcess" style="width: 140px">
                 <template #default="{ index, item }">
                   <span style="float: left">{{ index + 1 }}</span>
                   <span style="margin-left: 8px">{{ item.label }}</span>
@@ -218,61 +152,34 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="废品数量" label-width="100px" prop="rejectNum">
-              <el-input-number
-                v-model="detailInfo.rejectNum"
-                :min="1"
-                :max="detailInfo.productionQuantity"
-                :decimal="false"
-                :step="1"
-                step-strictly
-                label="数量"
-                style="width: 140px"
-              />
+              <el-input-number v-model="detailInfo.rejectNum" :min="1" :max="detailInfo.productionQuantity"
+                :decimal="false" :step="1" step-strictly label="数量" style="width: 140px" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-form-item label="废品原因" label-width="90px" prop="remark">
-            <el-input
-              type="textarea"
-              placeholder="请输入批废原因"
-              maxlength="200"
-              show-word-limit
-              v-model.trim="detailInfo.remark"
-              style="width: 495px"
-            />
+            <el-input type="textarea" placeholder="请输入批废原因" maxlength="200" show-word-limit
+              v-model.trim="detailInfo.remark" style="width: 495px" />
           </el-form-item>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="8">
             <el-form-item label="填写人" label-width="80px" prop="fillName">
-              <el-input
-                :disabled="true"
-                placeholder="请输入填写人"
-                v-model.trim="detailInfo.fillName"
-                style="width: 140px"
-              />
+              <el-input :disabled="true" placeholder="请输入填写人" v-model.trim="detailInfo.fillName" style="width: 140px" />
             </el-form-item>
           </el-col>
           <el-col :span="9">
             <el-form-item label="填写时间" label-width="100px" prop="fillDate">
-              <el-date-picker
-                v-model="detailInfo.fillDate"
-                :disabled="true"
-                type="date"
-                value-format="YYYY-MM-DD"
-                placeholder="请选择填写时间"
-                style="width: 150px"
-              />
+              <el-date-picker v-model="detailInfo.fillDate" :disabled="true" type="date" value-format="YYYY-MM-DD"
+                placeholder="请选择填写时间" style="width: 150px" />
             </el-form-item>
           </el-col>
         </el-row>
       </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>
@@ -322,16 +229,27 @@ const open = (row) => {
   reset();
   console.log("row", row);
   if (row.id) {
-    getInfo(row.id).then((res) => {
-      if (res.code == 200) {
-        detailInfo.value = res.data;
+    // getInfo(row.id).then((res) => {
+    //   if (res.code == 200) {
+    //     detailInfo.value = res.data;
+    //     getProcess(detailInfo.value.deptId)
+    //     getFindProcess(detailInfo.value.findDeptId)
+    //   }
+    // });
+    // //查工段
+    // getDeptInfo({ dayworkId: row.dayworkId }).then((res) => {
+    //   deptList.value = res.data;
+    //   console.log("deptList.value", deptList.value);
+    // });
+    Promise.all([getInfo(row.id), getDeptInfo({ dayworkId: row.dayworkId })]).then((res) => {
+      if (res[0].code == 200 && res[1].code == 200) {
+        deptList.value = res[1].data
+        detailInfo.value = res[0].data
+        getProcess(detailInfo.value.deptId)
+        getFindProcess(detailInfo.value.findDeptId)
       }
-    });
-    //查工段
-    getDeptInfo({ dayworkId: row.dayworkId }).then((res) => {
-      deptList.value = res.data;
-      console.log("deptList.value", deptList.value);
-    });
+    })
+
 
     visible.value = true;
   }
@@ -485,12 +403,14 @@ defineExpose({
   width: 120px;
   /* display: inline-block; */
 }
+
 .middleInfo {
   color: #999;
   font-size: 16px;
   width: 120px;
   display: inline-block;
 }
+
 .rightInfo {
   font-size: 16px;
   padding-left: 20px;

src/views/business/report/index.vue

@@ -23,26 +23,26 @@
                         clearable style="width: 96px" />
                 </el-form-item>
                 <el-form-item class="section-title" label="请选择当前工段：">
-                    <el-select-v2 v-model="queryParams.deptId" :options="deptList" placeholder="请选择工段" style="width: 120px"
-                        @change="handleDeptChange" />
+                    <el-select-v2 v-model="queryParams.deptId" :options="deptList" placeholder="请选择工段"
+                        style="width: 120px" @change="handleDeptChange" />
                 </el-form-item>
                 <el-form-item label="时间：">
-                    <el-date-picker v-model="queryParams.startTime" type="date" value-format="YYYY-MM-DD" :editable="false"
-                        clearable placeholder="请选择" style="width: 136px" @change="handleDateChange" />
+                    <el-date-picker v-model="queryParams.startTime" type="date" value-format="YYYY-MM-DD"
+                        :editable="false" clearable placeholder="请选择" style="width: 136px" @change="handleDateChange" />
                     <span>~</span>
-                    <el-date-picker v-model="queryParams.endTime" type="date" value-format="YYYY-MM-DD" :editable="false"
-                        clearable placeholder="请选择" style="width: 136px" @change="handleDateChange" />
+                    <el-date-picker v-model="queryParams.endTime" type="date" value-format="YYYY-MM-DD"
+                        :editable="false" clearable placeholder="请选择" style="width: 136px" @change="handleDateChange" />
                 </el-form-item>
                 <el-form-item style="margin-left: 0">
                     <el-button type="info" icon="Search" @click="handleQuery">搜索
                     </el-button>
-                    <el-button type="success"  icon="Download" @click="handleExport">导出</el-button>
+                    <el-button type="success" icon="Download" @click="handleExport">导出</el-button>
                 </el-form-item>
             </el-form>
             <div class="el-table-container">
                 <div class="el-table-inner-container">
-                    <el-table ref="dayworkTable" :data="dayworkItemList" v-loading="dayworkLoading" highlight-current-row
-                        height="100%">
+                    <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="productDescription" align="center" />
                         <el-table-column label="图纸版本" prop="technologyVersion" width="60" align="center" />
@@ -84,7 +84,7 @@
 
     </div>
 </template>
-  
+
 <script setup>
 import {
     listReportItem,
@@ -136,30 +136,32 @@ function getList() {
         deptList.value = response.data.rows;
         isDispatch.value = response.data.others.isDispatch;
         loading.value = false;
-          if (deptList.value.length > 0 && !isDispatch.value) {
-        queryParams.value.deptId = deptList.value[0].value;
-          } else {
+        if (deptList.value.length > 0 && !isDispatch.value) {
+            queryParams.value.deptId = deptList.value[0].value;
+        } else {
             deptList.value.unshift({ label: "全部", value: "0" });
-          }
-          getDayworkItems();
+        }
+        getDayworkItems();
     });
 }
 function getNowDate() {
-  var nowDate = new Date();
-  var date = {
-    year: nowDate.getFullYear(),
-    month: nowDate.getMonth() + 1,
-    day: nowDate.getDate(),
-  };
-  const dayDate =
-    date.year +
-    "-" +
-    (date.month >= 10 ? date.month : "0" + date.month) +
-    "-" +
-    (date.day >= 10 ? date.day : "0" + date.day);
-  console.log(dayDate);
-  queryParams.value.startTime = dayDate;
-  queryParams.value.endTime = dayDate;
+    //   var nowDate = new Date();
+    //   var date = {
+    //     year: nowDate.getFullYear(),
+    //     month: nowDate.getMonth() + 1,
+    //     day: nowDate.getDate(),
+    //   };
+    //   const dayDate =
+    //     date.year +
+    //     "-" +
+    //     (date.month >= 10 ? date.month : "0" + date.month) +
+    //     "-" +
+    //     (date.day >= 10 ? date.day : "0" + date.day);
+    //   console.log(dayDate);
+    //   queryParams.value.startTime = dayDate;
+    //   queryParams.value.endTime = dayDate;
+    queryParams.value.startTime = proxy.moment().format("YYYY-MM-DD")
+    queryParams.value.endTime = proxy.moment().format("YYYY-MM-DD")
 }
 
 
@@ -188,11 +190,13 @@ function handleProcessChange() {
 
 /** 报工详情列表 */
 function getDayworkItems() {
-    if(queryParams.value.startTime != null) {
-        queryParams.value.startTime = queryParams.value.startTime + " 00:00:00";
+    if (queryParams.value.startTime != null) {
+        // queryParams.value.startTime = queryParams.value.startTime + " 00:00:00";
+        queryParams.value.startTime = proxy.moment(queryParams.value.startTime).format('YYYY-MM-DD 00:00:00')
     }
-    if(queryParams.value.endTime != null) {
-        queryParams.value.endTime = queryParams.value.endTime + " 23:59:59";
+    if (queryParams.value.endTime != null) {
+        // queryParams.value.endTime = queryParams.value.endTime + " 23:59:59";
+        queryParams.value.endTime = proxy.moment(queryParams.value.endTime).format('YYYY-MM-DD 23:59:59')
     }
     dayworkItemLoading.value = true;
     console.log(queryParams.value);
@@ -259,5 +263,4 @@ onMounted(() => {
 .el-form--inline .el-form-item {
     margin-right: 20px;
 }
-</style>
-  
+</style>