ezhizao_zx пре 1 година
родитељ
комит
b43c827361

+ 47 - 206
src/views/business/daywork/index.vue

@@ -3,241 +3,90 @@
     <!-- 左侧区域 -->
     <section class="list-part-container" style="flex: 3">
       <!-- 搜索区 -->
-      <el-form
-        class="list-search-container"
-        :model="queryDayworkParams"
-        ref="queryRef"
-        :inline="true"
-        style="margin-right: 0px"
-      >
+      <el-form class="list-search-container" :model="queryDayworkParams" ref="queryRef" :inline="true"
+        style="margin-right: 0px">
         <el-form-item class="section-title" label="生产批次" />
         <el-form-item label="生产计划单号:">
-          <el-input
-            placeholder="请输入生产计划单号/批次号"
-            v-model.trim="queryDayworkParams.productionPlanNo"
-            @keydown.enter.prevent
-            clearable
-            style="width: 200px"
-          />
+          <el-input placeholder="请输入生产计划单号/批次号" v-model.trim="queryDayworkParams.productionPlanNo"
+            @keydown.enter.prevent clearable style="width: 200px" />
         </el-form-item>
         <el-form-item label="产品描述:">
-          <el-input
-            placeholder="请输入产品描述"
-            v-model.trim="queryDayworkParams.productDescription"
-            @keydown.enter.prevent
-            clearable
-            style="width: 130px"
-          />
+          <el-input placeholder="请输入产品描述" v-model.trim="queryDayworkParams.productDescription" @keydown.enter.prevent
+            clearable style="width: 130px" />
         </el-form-item>
         <el-form-item class="section-title" label="请选择当前工段:">
-          <el-select-v2
-            v-model="queryDayworkParams.deptId"
-            :options="deptList"
-            placeholder="请选择工段"
-            style="width: 140px"
-            @change="handleDeptChange"
-          />
+          <el-select-v2 v-model="queryDayworkParams.deptId" :options="deptList" placeholder="请选择工段" style="width: 140px"
+            @change="handleDeptChange" />
         </el-form-item>
         <el-form-item style="margin-left: 0">
-          <el-button
-            type="info"
-            icon="Search"
-            :disabled="deptList.length === 0"
-            @click="handleQuery"
-            >搜索
+          <el-button type="info" icon="Search" :disabled="deptList.length === 0" @click="handleQuery">搜索
           </el-button>
         </el-form-item>
       </el-form>
       <div class="el-table-container">
         <div class="el-table-inner-container">
-          <el-table
-            ref="dayworkTable"
-            :data="dayworkList"
-            v-loading="dayworkLoading"
-            highlight-current-row
-            height="100%"
-            @current-change="handleDayworkCurrentChange"
-          >
-            <el-table-column
-              label="客户简称"
-              prop="companyAlias"
-              width="120"
-              align="center"
-            />
-            <el-table-column
-              label="生产计划单号"
-              prop="productionPlanNo"
-              width="100"
-              align="center"
-            />
-            <el-table-column label="批次号" prop="lotCode" align="center">
+          <el-table ref="dayworkTable" :data="dayworkList" v-loading="dayworkLoading" highlight-current-row
+            height="100%" @current-change="handleDayworkCurrentChange">
+            <el-table-column label="客户简称" prop="companyAlias" width="120" align="center" />
+            <el-table-column label="生产计划单号" prop="productionPlanNo" width="100" align="center" />
+            <el-table-column label="批次号" min-width="120" prop="lotCode" align="center">
               <template #default="scope">
-                <el-button
-                  link
-                  type="primary"
-                  v-hasPermi="['business:productionPlan:query']"
-                  @click="handleColumnClick(scope.row)"
-                  ><span>{{ scope.row.lotCode }}</span></el-button
-                >
+                <el-button link type="primary" v-hasPermi="['business:productionPlan:query']"
+                  @click="handleColumnClick(scope.row)"><span>{{ scope.row.lotCode }}</span></el-button>
               </template>
             </el-table-column>
-            <el-table-column
-              label="产品描述"
-              prop="productDescription"
-              align="center"
-            />
-            <el-table-column
-              label="图纸版本"
-              prop="technologyVersion"
-              width="60"
-              align="center"
-            />
-            <el-table-column
-              label="投产量"
-              prop="productionQuantity"
-              width="60"
-              align="center"
-            />
-            <el-table-column
-              label="下达日期"
-              prop="createTime"
-              width="100"
-              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="productionQuantity" width="60" 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="报工总时长"
-              prop="totalWorkingHours"
-              width="150"
-              align="center"
-            />
+            <el-table-column label="报工总时长" prop="totalWorkingHours" width="150" align="center" />
           </el-table>
         </div>
       </div>
       <!-- 分页 -->
-      <pagination
-        v-show="total > 0"
-        :total="total"
-        v-model:page="queryDayworkParams.pageNum"
-        v-model:limit="queryDayworkParams.pageSize"
-        @pagination="getDayworks"
-      />
+      <pagination v-show="total > 0" :total="total" v-model:page="queryDayworkParams.pageNum"
+        v-model:limit="queryDayworkParams.pageSize" @pagination="getDayworks" />
     </section>
     <!-- 右侧区域 -->
     <section class="list-part-container" style="flex: 2">
       <el-form class="list-search-container" :inline="true">
         <el-form-item class="section-title" label="报工信息" />
-        <el-form-item
-          class="section-title"
-          label="请选择工序:"
-          prop="processId"
-        >
-          <el-select-v2
-            v-model="queryItemParams.processId"
-            clearable
-            :options="processList"
-            placeholder="请选择工序"
-            style="width: 100%"
-            @change="handleProcessChange"
-          />
+        <el-form-item class="section-title" label="请选择工序:" prop="processId">
+          <el-select-v2 v-model="queryItemParams.processId" clearable :options="processList" placeholder="请选择工序"
+            style="width: 100%" @change="handleProcessChange" />
         </el-form-item>
       </el-form>
 
       <div class="el-table-container">
         <div class="el-table-inner-container">
-          <el-table
-            :data="dayworkItemList"
-            v-loading="dayworkItemLoading"
-            height="100%"
-          >
-            <el-table-column
-              label="操作者"
-              prop="nickName"
-              width="60"
-              align="center"
-            />
-            <el-table-column
-              label="工序名称"
-              prop="processAlias"
-              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"
-            />
-            <el-table-column
-              label="开始时间"
-              prop="startTime"
-              width="160"
-              align="center"
-            />
-            <el-table-column
-              label="结束时间"
-              prop="endTime"
-              width="160"
-              align="center"
-            />
-            <el-table-column
-              label="总工时"
-              prop="workingHours"
-              width="160"
-              align="center"
-            />
-            <el-table-column
-              label="生产状态"
-              prop="status"
-              width="100"
-              align="center"
-            >
+          <el-table :data="dayworkItemList" v-loading="dayworkItemLoading" height="100%">
+            <el-table-column label="操作者" prop="nickName" width="60" align="center" />
+            <el-table-column label="工序名称" prop="processAlias" 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" />
+            <el-table-column label="开始时间" prop="startTime" width="160" align="center" />
+            <el-table-column label="结束时间" prop="endTime" width="160" align="center" />
+            <el-table-column label="总工时" prop="workingHours" width="160" align="center" />
+            <el-table-column label="生产状态" prop="status" width="100" align="center">
               <template #default="scope">
                 <dict-tag :options="daywork_status" :value="scope.row.status" />
               </template>
             </el-table-column>
-            <el-table-column
-              fixed="right"
-              label="操作"
-              align="center"
-              width="70px"
-            >
+            <el-table-column fixed="right" label="操作" align="center" width="70px">
               <template #default="scope">
-                <el-button
-                  v-if="
-                    scope.row.deptProcessStatus &&
-                    (scope.row.status == 2 || scope.row.status == 3) &&
-                    scope.row.processId == latestProcessId
-                  "
-                  link
-                  type="warning"
-                  icon="Edit"
-                  @click="handleUpdateDayworkItem(scope.row)"
-                  >编辑
+                <el-button v-if="scope.row.deptProcessStatus &&
+        (scope.row.status == 2 || scope.row.status == 3) &&
+        scope.row.processId == latestProcessId
+        " link type="warning" icon="Edit" @click="handleUpdateDayworkItem(scope.row)">编辑
                 </el-button>
-                <el-button
-                  v-else
-                  link
-                  type="primary"
-                  icon="View"
-                  @click="handleCheckDayworkItem(scope.row)"
-                  >查看
+                <el-button v-else link type="primary" icon="View" @click="handleCheckDayworkItem(scope.row)">查看
                 </el-button>
               </template>
             </el-table-column>
@@ -245,19 +94,11 @@
         </div>
       </div>
       <!-- 分页 -->
-      <pagination
-        v-show="itemTotal > 0"
-        :total="itemTotal"
-        v-model:page="queryItemParams.pageNum"
-        v-model:limit="queryItemParams.pageSize"
-        @pagination="getDayworkItems"
-      />
+      <pagination v-show="itemTotal > 0" :total="itemTotal" v-model:page="queryItemParams.pageNum"
+        v-model:limit="queryItemParams.pageSize" @pagination="getDayworkItems" />
     </section>
     <!-- 报工信息表单 -->
-    <daywork-item-form
-      ref="dayworkItemRef"
-      @handleSaveSuccess="handleGetDayworkItems"
-    />
+    <daywork-item-form ref="dayworkItemRef" @handleSaveSuccess="handleGetDayworkItems" />
   </div>
 </template>
 

+ 24 - 12
src/views/business/inspectionInstruction/index.vue

@@ -6,22 +6,28 @@
 			<el-form class="list-search-container" ref="queryRef" :inline="true">
 				<el-form-item class="section-title" label="检查指导项类别" />
 				<el-form-item>
-					<el-button type="primary" icon="Plus" @click="handleShowCategoryDialog(null)" v-hasPermi="['business:inspectionInstruction:add']">新增 </el-button>
+					<el-button type="primary" icon="Plus" @click="handleShowCategoryDialog(null)"
+						v-hasPermi="['business:inspectionInstruction:add']">新增 </el-button>
 				</el-form-item>
 			</el-form>
 			<!-- 列表区 -->
 			<div class="el-table-container">
 				<div class="el-table-inner-container">
-					<el-tree ref="categoryTable" v-loading="categoryLoading" :data="categoryList" :props="{ label: 'name', children: 'children' }" :expand-on-click-node="false" default-expand-all node-key="id" highlight-current @node-click="handleCurrentCategoryChange">
+					<el-tree ref="categoryTable" v-loading="categoryLoading" :data="categoryList"
+						:props="{ label: 'name', children: 'children' }" :expand-on-click-node="false" default-expand-all
+						node-key="id" highlight-current @node-click="handleCurrentCategoryChange">
 						<template #default="{ node, data }">
 							<div style="display: flex; width: 100%; justify-content: space-between">
 								<span>
-									<span v-if="data.parentId === '0'" style="display: inline-block; width: 20px">{{ getNodeIndex(data) }}. </span>
+									<span v-if="data.parentId === '0'" style="display: inline-block; width: 20px">{{ getNodeIndex(data)
+										}}. </span>
 									<span>{{ node.label }}</span>
 								</span>
 								<span>
-									<el-button link type="warning" icon="Edit" @click="handleShowCategoryDialog(data)" v-hasPermi="['business:inspectionInstruction:edit']">编辑 </el-button>
-									<el-button link type="danger" icon="Delete" @click="handleDeleteCategory(data)" v-hasPermi="['business:inspectionInstruction:remove']">删除 </el-button>
+									<el-button link type="warning" icon="Edit" @click="handleShowCategoryDialog(data)"
+										v-hasPermi="['business:inspectionInstruction:edit']">编辑 </el-button>
+									<el-button link type="danger" icon="Delete" @click="handleDeleteCategory(data)"
+										v-hasPermi="['business:inspectionInstruction:remove']">删除 </el-button>
 								</span>
 							</div>
 						</template>
@@ -35,11 +41,14 @@
 			<el-form class="list-search-container" :model="queryParams" ref="queryRef" :inline="true">
 				<el-form-item class="section-title" label="检查指导项管理" />
 				<el-form-item label="检查标准:">
-					<el-input placeholder="请输入关键字" clearable style="width: 180px" v-model.trim="queryParams.code" @keydown.enter.prevent />
+					<el-input placeholder="请输入关键字" clearable style="width: 180px" v-model.trim="queryParams.keyword"
+						@keydown.enter.prevent />
 				</el-form-item>
 				<el-form-item>
-					<el-button type="info" icon="Search" :disabled="categoryList.length === 0" @click="handleQueryInstruction"> 搜索 </el-button>
-					<el-button type="primary" icon="Plus" @click="handleShowInstructionDialog(null)" v-hasPermi="['business:inspectionInstruction:add']">新增 </el-button>
+					<el-button type="info" icon="Search" :disabled="categoryList.length === 0" @click="handleQueryInstruction"> 搜索
+					</el-button>
+					<el-button type="primary" icon="Plus" @click="handleShowInstructionDialog(null)"
+						v-hasPermi="['business:inspectionInstruction:add']">新增 </el-button>
 				</el-form-item>
 			</el-form>
 
@@ -52,8 +61,10 @@
 						<el-table-column prop="equipment" label="检查设备" width="200" align="center" />
 						<el-table-column label="操作" width="180" align="center">
 							<template #default="scope">
-								<el-button link type="warning" icon="Edit" @click="handleShowInstructionDialog(scope.row)" v-hasPermi="['business:inspectionInstruction:edit']">编辑 </el-button>
-								<el-button link type="danger" icon="Delete" @click="handleDeleteInstruction(scope.row)" v-hasPermi="['business:inspectionInstruction:remove']">删除 </el-button>
+								<el-button link type="warning" icon="Edit" @click="handleShowInstructionDialog(scope.row)"
+									v-hasPermi="['business:inspectionInstruction:edit']">编辑 </el-button>
+								<el-button link type="danger" icon="Delete" @click="handleDeleteInstruction(scope.row)"
+									v-hasPermi="['business:inspectionInstruction:remove']">删除 </el-button>
 							</template>
 						</el-table-column>
 					</el-table>
@@ -61,7 +72,8 @@
 			</div>
 
 			<!-- 分页 -->
-			<pagination v-show="instructionTotal > 0" :total="instructionTotal" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getInstructions" />
+			<pagination v-show="instructionTotal > 0" :total="instructionTotal" v-model:page="queryParams.pageNum"
+				v-model:limit="queryParams.pageSize" @pagination="getInstructions" />
 		</section>
 
 		<!-- 检查指导项目类别表单 -->
@@ -94,7 +106,7 @@ const data = reactive({
 		// 2:检查指导书
 		type: 2,
 		categoryId: '0',
-		standard: '',
+		keyword: '',
 		pageNum: 1,
 		pageSize: 10,
 	},

+ 24 - 12
src/views/business/inspectionStandard/index.vue

@@ -6,22 +6,28 @@
 			<el-form class="list-search-container" ref="queryRef" :inline="true">
 				<el-form-item class="section-title" label="分选标准类别" />
 				<el-form-item>
-					<el-button type="primary" icon="Plus" @click="handleShowCategoryDialog(null)" v-hasPermi="['business:inspectionStandard:add']">新增 </el-button>
+					<el-button type="primary" icon="Plus" @click="handleShowCategoryDialog(null)"
+						v-hasPermi="['business:inspectionStandard:add']">新增 </el-button>
 				</el-form-item>
 			</el-form>
 			<!-- 列表区 -->
 			<div class="el-table-container">
 				<div class="el-table-inner-container">
-					<el-tree ref="categoryTable" v-loading="categoryLoading" :data="categoryList" :props="{ label: 'name', children: 'children' }" :expand-on-click-node="false" default-expand-all node-key="id" highlight-current @node-click="handleCurrentCategoryChange">
+					<el-tree ref="categoryTable" v-loading="categoryLoading" :data="categoryList"
+						:props="{ label: 'name', children: 'children' }" :expand-on-click-node="false" default-expand-all
+						node-key="id" highlight-current @node-click="handleCurrentCategoryChange">
 						<template #default="{ node, data }">
 							<div style="display: flex; width: 100%; justify-content: space-between">
 								<span>
-									<span v-if="data.parentId === '0'" style="display: inline-block; width: 20px">{{ getNodeIndex(data) }}. </span>
+									<span v-if="data.parentId === '0'" style="display: inline-block; width: 20px">{{ getNodeIndex(data)
+										}}. </span>
 									<span>{{ node.label }}</span>
 								</span>
 								<span>
-									<el-button link type="warning" icon="Edit" @click="handleShowCategoryDialog(data)" v-hasPermi="['business:inspectionStandard:edit']">编辑 </el-button>
-									<el-button link type="danger" icon="Delete" @click="handleDeleteCategory(data)" v-hasPermi="['business:inspectionStandard:remove']">删除 </el-button>
+									<el-button link type="warning" icon="Edit" @click="handleShowCategoryDialog(data)"
+										v-hasPermi="['business:inspectionStandard:edit']">编辑 </el-button>
+									<el-button link type="danger" icon="Delete" @click="handleDeleteCategory(data)"
+										v-hasPermi="['business:inspectionStandard:remove']">删除 </el-button>
 								</span>
 							</div>
 						</template>
@@ -35,11 +41,14 @@
 			<el-form class="list-search-container" :model="queryParams" ref="queryRef" :inline="true">
 				<el-form-item class="section-title" label="分选标准管理" />
 				<el-form-item label="检查标准:">
-					<el-input placeholder="请输入关键字" clearable style="width: 180px" v-model.trim="queryParams.code" @keydown.enter.prevent />
+					<el-input placeholder="请输入关键字" clearable style="width: 180px" v-model.trim="queryParams.keyword"
+						@keydown.enter.prevent />
 				</el-form-item>
 				<el-form-item>
-					<el-button type="info" icon="Search" :disabled="categoryList.length === 0" @click="handleQueryInstruction"> 搜索 </el-button>
-					<el-button type="primary" icon="Plus" @click="handleShowInstructionDialog(null)" v-hasPermi="['business:inspectionStandard:add']">新增 </el-button>
+					<el-button type="info" icon="Search" :disabled="categoryList.length === 0" @click="handleQueryInstruction"> 搜索
+					</el-button>
+					<el-button type="primary" icon="Plus" @click="handleShowInstructionDialog(null)"
+						v-hasPermi="['business:inspectionStandard:add']">新增 </el-button>
 				</el-form-item>
 			</el-form>
 
@@ -51,8 +60,10 @@
 						<el-table-column prop="standard" label="检查标准" align="center" />
 						<el-table-column label="操作" width="180" align="center">
 							<template #default="scope">
-								<el-button link type="warning" icon="Edit" @click="handleShowInstructionDialog(scope.row)" v-hasPermi="['business:inspectionStandard:edit']">编辑 </el-button>
-								<el-button link type="danger" icon="Delete" @click="handleDeleteInstruction(scope.row)" v-hasPermi="['business:inspectionStandard:remove']">删除 </el-button>
+								<el-button link type="warning" icon="Edit" @click="handleShowInstructionDialog(scope.row)"
+									v-hasPermi="['business:inspectionStandard:edit']">编辑 </el-button>
+								<el-button link type="danger" icon="Delete" @click="handleDeleteInstruction(scope.row)"
+									v-hasPermi="['business:inspectionStandard:remove']">删除 </el-button>
 							</template>
 						</el-table-column>
 					</el-table>
@@ -60,7 +71,8 @@
 			</div>
 
 			<!-- 分页 -->
-			<pagination v-show="instructionTotal > 0" :total="instructionTotal" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getInstructions" />
+			<pagination v-show="instructionTotal > 0" :total="instructionTotal" v-model:page="queryParams.pageNum"
+				v-model:limit="queryParams.pageSize" @pagination="getInstructions" />
 		</section>
 
 		<!-- 检查指导项目类别表单 -->
@@ -92,7 +104,7 @@ const data = reactive({
 	queryParams: {
 		// 1:分选标准
 		type: 1,
-		standard: '',
+		keyword: '',
 		categoryId: '0',
 		pageNum: 1,
 		pageSize: 10,

+ 2 - 1
src/views/business/lot/InBatchesDialog.vue

@@ -68,7 +68,8 @@
             <div style="display: flex; flex-direction: row;">
               <div style="line-height: 32px;">分批信息</div>
               <el-form-item label="分批数量">
-                <el-input-number v-model="baseLot.sparateNum" :controls="false" :max="10" step="1" step-strictly />
+                <el-input-number v-model="baseLot.sparateNum" :controls="false" :min="2" :max="10" step="1"
+                  step-strictly />
               </el-form-item>
               <el-form-item label-width="20px">
                 <el-button type="primary" @click="handleNumBlur">计算</el-button>

+ 62 - 138
src/views/business/reviseBath/lotFormParticulars.vue

@@ -1,12 +1,6 @@
 <template>
   <div v-if="!loading" class="page-container column-container">
-    <el-form
-      class="list-search"
-      style=""
-      :model="lot"
-      ref="queryRef"
-      :inline="true"
-    >
+    <el-form class="list-search" style="" :model="lot" ref="queryRef" :inline="true">
       <el-row style="margin-top: 10px">
         <el-form-item class="bold-large">
           <span>{{ "批次号:" }}</span>
@@ -14,20 +8,15 @@
         </el-form-item>
         <el-form-item>
           <el-tag class="spacing" :type="status(lot)">{{
-            statusText(lot)
-          }}</el-tag>
+    statusText(lot)
+  }}</el-tag>
           <el-tag v-if="lot.isWaste == 1" class="spacing" type="danger">{{
-            "报废"
-          }}</el-tag>
+    "报废"
+  }}</el-tag>
           <el-tag v-if="lot.isAmend == 1" class="spacing" type="danger">{{
-            "工艺修改"
-          }}</el-tag>
-          <el-tag
-            v-if="lot.isWasteRecycling == 1"
-            class="spacing"
-            type="primary"
-            >{{ "废品回用" }}</el-tag
-          >
+    "工艺修改"
+  }}</el-tag>
+          <el-tag v-if="lot.isWasteRecycling == 1" class="spacing" type="primary">{{ "废品回用" }}</el-tag>
         </el-form-item>
       </el-row>
 
@@ -73,8 +62,8 @@
         <el-col :span="6">
           <el-form-item label="领料部门" class="custom-label">
             <span>{{
-              lot.productionPlanDetail.requisitionDepartmentName
-            }}</span>
+    lot.productionPlanDetail.requisitionDepartmentName
+  }}</span>
           </el-form-item>
         </el-col>
         <el-col :span="6">
@@ -104,49 +93,49 @@
         <el-col :span="4">
           <el-form-item label="炉号" class="custom-label">
             <span>{{
-              lot.furnaceNoInfo.furnaceNumber
-                ? lot.furnaceNoInfo.furnaceNumber
-                : "-"
-            }}</span>
+    lot.furnaceNoInfo.furnaceNumber
+      ? lot.furnaceNoInfo.furnaceNumber
+      : "-"
+  }}</span>
           </el-form-item>
         </el-col>
 
         <el-col :span="4">
           <el-form-item label="厂家" class="custom-label">
             <span>{{
-              lot.furnaceNoInfo.factory ? lot.furnaceNoInfo.factory : "-"
-            }}</span>
+    lot.furnaceNoInfo.factory ? lot.furnaceNoInfo.factory : "-"
+  }}</span>
           </el-form-item>
         </el-col>
 
         <el-col :span="4">
           <el-form-item label="牌号" class="custom-label">
             <span style="margin-left: 28px">{{
-              lot.furnaceNoInfo.brandNumber
-                ? lot.furnaceNoInfo.brandNumber
-                : "-"
-            }}</span>
+    lot.furnaceNoInfo.brandNumber
+      ? lot.furnaceNoInfo.brandNumber
+      : "-"
+  }}</span>
           </el-form-item>
         </el-col>
         <el-col :span="4">
           <el-form-item label="规格" class="custom-label">
             <span>{{
-              lot.furnaceNoInfo.spec ? lot.furnaceNoInfo.spec : "-"
-            }}</span>
+    lot.furnaceNoInfo.spec ? lot.furnaceNoInfo.spec : "-"
+  }}</span>
           </el-form-item>
         </el-col>
         <el-col :span="4">
           <el-form-item label="形状" class="custom-label">
             <span>{{
-              lot.furnaceNoInfo.shape ? lot.furnaceNoInfo.shape : "-"
-            }}</span>
+    lot.furnaceNoInfo.shape ? lot.furnaceNoInfo.shape : "-"
+  }}</span>
           </el-form-item>
         </el-col>
         <el-col :span="4">
           <el-form-item label="材料直径" class="custom-label">
             <span>{{
-              lot.furnaceNoInfo.diameter ? lot.furnaceNoInfo.diameter : "-"
-            }}</span>
+    lot.furnaceNoInfo.diameter ? lot.furnaceNoInfo.diameter : "-"
+  }}</span>
           </el-form-item>
         </el-col>
       </el-row>
@@ -154,20 +143,20 @@
         <el-col :span="4">
           <el-form-item label="原料编码" class="custom-label">
             <span>{{
-              lot.furnaceNoInfo.rawMaterialCode
-                ? lot.furnaceNoInfo.rawMaterialCode
-                : "-"
-            }}</span>
+    lot.furnaceNoInfo.rawMaterialCode
+      ? lot.furnaceNoInfo.rawMaterialCode
+      : "-"
+  }}</span>
           </el-form-item>
         </el-col>
 
         <el-col :span="4">
           <el-form-item label="来料日期" class="custom-label">
             <span>{{
-              lot.furnaceNoInfo.incomingDate
-                ? lot.furnaceNoInfo.incomingDate
-                : "-"
-            }}</span>
+    lot.furnaceNoInfo.incomingDate
+      ? lot.furnaceNoInfo.incomingDate
+      : "-"
+  }}</span>
           </el-form-item>
         </el-col>
 
@@ -175,10 +164,10 @@
           <el-form-item label="材质1" class="custom-label">
             <span style="margin-left: 28px">
               {{
-                lot.furnaceNoInfo.firstTechnicalRequirement
-                  ? lot.furnaceNoInfo.firstTechnicalRequirement
-                  : "-"
-              }}
+    lot.furnaceNoInfo.firstTechnicalRequirement
+      ? lot.furnaceNoInfo.firstTechnicalRequirement
+      : "-"
+  }}
             </span>
           </el-form-item>
         </el-col>
@@ -186,10 +175,10 @@
           <el-form-item label="材质2" class="custom-label">
             <span>
               {{
-                lot.furnaceNoInfo.secondTechnicalRequirement
-                  ? lot.furnaceNoInfo.secondTechnicalRequirement
-                  : "-"
-              }}
+    lot.furnaceNoInfo.secondTechnicalRequirement
+      ? lot.furnaceNoInfo.secondTechnicalRequirement
+      : "-"
+  }}
             </span>
           </el-form-item>
         </el-col>
@@ -197,115 +186,49 @@
     </el-form>
     <div style="padding: 16px">
       <span style="font-weight: bold; font-size: 18px">工艺路线</span>
-      <el-button
-        v-if="showVerify(true, 'business:lot:onceSingleChange')"
-        type="primary"
-        style="float: right; margin-left: 10px"
-        @click="handleOnceSingleChange"
-      >
+      <el-button v-if="showVerify(true, 'business:lot:onceSingleChange')" type="primary"
+        style="float: right; margin-left: 10px" @click="handleOnceSingleChange">
         单批单改
       </el-button>
-      <el-button
-        v-if="showVerify(true, 'business:lot:inBatch')"
-        type="primary"
-        style="float: right; margin-left: 10px"
-        @click="handleSplit()"
-      >
+      <el-button v-if="showVerify(true, 'business:lot:inBatch')" type="primary" style="float: right; margin-left: 10px"
+        @click="handleSplit()">
         分批
       </el-button>
-      <el-button
-        v-if="showVerify(true, 'business:lot:waste')"
-        :disabled="lot.isWaste == 1"
-        type="danger"
-        style="float: right; margin-left: 10px"
-        @click="handlelotWaste(route.params.lotCode)"
-      >
+      <el-button v-if="showVerify(true, 'business:lot:waste')" :disabled="lot.isWaste == 1" type="danger"
+        style="float: right; margin-left: 10px" @click="handlelotWaste(route.params.lotCode)">
         批废
       </el-button>
-      <el-button
-        v-if="showVerify(lot.isAmend == 1, 'business:lot:standard')"
-        type="primary"
-        style="float: right; margin-left: 10px"
-        @click="handleStandardProcess(lot.technologicalProcessId)"
-      >
+      <el-button v-if="showVerify(lot.isAmend == 1, 'business:lot:standard')" type="primary"
+        style="float: right; margin-left: 10px" @click="handleStandardProcess(lot.technologicalProcessId)">
         查看标准工艺
       </el-button>
     </div>
     <div class="el-table-container">
       <div class="el-table-inner-container">
         <el-table height="95%" :data="processDetails">
-          <el-table-column
-            type="index"
-            label="行号"
-            align="center"
-          ></el-table-column>
-          <el-table-column
-            label="工序名称"
-            prop="processAlias"
-            align="center"
-          ></el-table-column>
+          <el-table-column type="index" label="行号" align="center"></el-table-column>
+          <el-table-column label="工序名称" prop="processAlias" align="center"></el-table-column>
           <el-table-column label="状态" prop="status" align="center">
             <template #default="scope">
               <span>{{ getStatusText(scope.row.status) }}</span>
             </template>
           </el-table-column>
-          <el-table-column
-            label="投产量"
-            prop="investNum"
-            align="center"
-          ></el-table-column>
-          <el-table-column
-            label="合格量"
-            prop="qualifiedNum"
-            align="center"
-          ></el-table-column>
-          <el-table-column
-            label="废品量"
-            prop="abandonNum"
-            align="center"
-          ></el-table-column>
+          <el-table-column label="投产量" prop="investNum" align="center"></el-table-column>
+          <el-table-column label="合格量" prop="qualifiedNum" align="center"></el-table-column>
+          <el-table-column label="废品量" prop="abandonNum" align="center"></el-table-column>
         </el-table>
       </div>
     </div>
     <once-change ref="onceChangeRef" @handleSaveSuccess="init" />
     <lot-waste-dialog ref="lotWasteDialogRef" @handleSaveSuccess="init" />
-    <el-dialog
-      title="标准工序"
-      v-model="visible"
-      width="680px"
-      append-to-body
-      draggable
-    >
+    <el-dialog title="标准工序" v-model="visible" width="680px" append-to-body draggable>
       <div class="el-table-inner-container">
-        <el-table
-          style="height: 600px"
-          @selection-change="handleSelectionChange"
-          :data="processList"
-        >
-          <el-table-column
-            type="selection"
-            :selectable="checkSelectable"
-            width="50"
-            align="center"
-          />
-          <el-table-column
-            type="index"
-            label="序号"
-            width="50"
-            align="center"
-          ></el-table-column>
-          <el-table-column
-            label="工序名称"
-            prop="processAlias"
-            align="center"
-          />
+        <el-table style="height: 600px" @selection-change="handleSelectionChange" :data="processList">
+          <el-table-column type="selection" :selectable="checkSelectable" width="50" align="center" />
+          <el-table-column type="index" label="序号" width="50" align="center"></el-table-column>
+          <el-table-column label="工序名称" prop="processAlias" align="center" />
 
-          <el-table-column
-            label="工序编号"
-            prop="processStepNumber"
-            width="200"
-            align="center"
-          />
+          <el-table-column label="工序编号" prop="processStepNumber" width="200" align="center" />
         </el-table>
       </div>
     </el-dialog>
@@ -452,6 +375,7 @@ function handleSplit() {
   }
   inBatchesDialogRef.value.open({
     ...lot.value,
+    lotId: lot.value.id,
     companyAlias: lot.value.productionPlanDetail.companyAlias,
     productionPlanNo: lot.value.productionPlanDetail.productionPlanNo,
     productDescription: lot.value.productionPlanDetail.productDescription,

+ 20 - 4
src/views/dialog/InstructionChoiceDialog.vue

@@ -16,6 +16,15 @@
           <div class="page-container list-container">
             <div class="list-btns-container" style="padding-bottom: 12px; line-height: 30px;">
               <span class="title-label"><i class="el-icon-document" /> {{ label }}项目类别</span>
+              <el-form class="dialog-title-search-container" size="small" :inline="true" style="line-height: 30px;">
+                <el-form-item label="搜索:" style="margin-bottom: 0;">
+                  <el-input v-model.trim="categoryQuery.keyword" size="small" type="text" placeholder="关键字"
+                    :clearable="true" style="width: 90px;" />
+                </el-form-item>
+                <el-form-item style="margin-bottom: 0;">
+                  <el-button type="success" icon="Search" @click="handleCategorySearch">搜索</el-button>
+                </el-form-item>
+              </el-form>
             </div>
             <div class="el-table-container">
               <el-tree ref="categoryTable" v-loading="categoryLoading" :data="categories"
@@ -50,13 +59,13 @@
               </el-form>
             </div>
             <div class="el-table-container" :style="{ bottom: instructionTotal > 0 ? '35px' : '0' }">
-              <el-table ref="employeeTable" v-loading="instructionLoading"
+              <el-table ref="employeeTable" v-loading="instructionLoading" row-key="id"
                 :data="currentCategory ? instructionList : []" size="small" border height="100%"
                 header-row-class-name="list-header-row" row-class-name="list-row"
                 @selection-change="handleSelectionChange"
                 @row-dblclick="(row) => multiple ? selectionRow(row) : handleSimpleSelected(row)">
                 <el-table-column v-if="multiple" type="selection" width="40" align="center"
-                  :selectable="selectableHandler" />
+                  :selectable="selectableHandler" :reserve-selection="true" />
                 <el-table-column type="index" label="序号" width="40" align="center" />
                 <el-table-column prop="standard" label="检查标准" align="center" />
                 <el-table-column prop="equipment" label="检查设备" width="200" align="center" />
@@ -115,10 +124,13 @@ const visible = ref(false)
 const query = ref({
   type: props.type,
   categoryId: '0',
-  keywords: '',
+  keyword: '',
   pageSize: 20,
   pageNum: 1
 })
+const categoryQuery = ref({
+  keyword: ''
+})
 const categories = ref([])
 const instructionList = ref([])
 const categoryLoading = ref(false)
@@ -145,7 +157,7 @@ function handleMultipleSelected() {
 }
 function loadCategory() {
   categoryLoading.value = true
-  listCategory({ type: props.type }).then((res) => {
+  listCategory({ ...categoryQuery.value, type: props.type }).then((res) => {
     categoryLoading.value = false
     categories.value = res.rows
     if (categories.value.length > 0) {
@@ -158,6 +170,10 @@ function loadCategory() {
   })
 }
 
+function handleCategorySearch() {
+  loadCategory()
+}
+
 function loadInstruction() {
   instructionLoading.value = true
   query.value.categoryId = currentCategory.value.id