外协商前端完善

src/api/business/outsourcedOrderDetail.js

@@ -1,44 +1,20 @@
 import request from '@/utils/request'
 
+const baseUrl = import.meta.env.VITE_APP_BASE_API
+
 // 查询外协单从列表
 export function listDetail(query) {
-  return request({
-    url: '/business/detail/list',
-    method: 'get',
-    params: query
-  })
+	return request({
+		url: baseUrl + '/business/outsourceDetail/list',
+		method: 'get',
+		params: query
+	})
 }
 
 // 查询外协单从详细
 export function getDetail(id) {
-  return request({
-    url: '/business/detail/' + id,
-    method: 'get'
-  })
-}
-
-// 新增外协单从
-export function addDetail(data) {
-  return request({
-    url: '/business/detail',
-    method: 'post',
-    data: data
-  })
-}
-
-// 修改外协单从
-export function updateDetail(data) {
-  return request({
-    url: '/business/detail',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除外协单从
-export function delDetail(id) {
-  return request({
-    url: '/business/detail/' + id,
-    method: 'delete'
-  })
+	return request({
+		url: baseUrl + '/business/outsourceDetail/' + id,
+		method: 'get'
+	})
 }

src/api/business/outsourcedOrderDetailProcess.js

@@ -1,44 +1,20 @@
 import request from '@/utils/request'
 
+const baseUrl = import.meta.env.VITE_APP_BASE_API
+
 // 查询外协单从对应的外协工序的从列表
 export function listProcess(query) {
-  return request({
-    url: '/business/process/list',
-    method: 'get',
-    params: query
-  })
+	return request({
+		url: baseUrl + '/business/outsourceDetailProcess/list',
+		method: 'get',
+		params: query
+	})
 }
 
 // 查询外协单从对应的外协工序的从详细
 export function getProcess(id) {
-  return request({
-    url: '/business/process/' + id,
-    method: 'get'
-  })
-}
-
-// 新增外协单从对应的外协工序的从
-export function addProcess(data) {
-  return request({
-    url: '/business/process',
-    method: 'post',
-    data: data
-  })
-}
-
-// 修改外协单从对应的外协工序的从
-export function updateProcess(data) {
-  return request({
-    url: '/business/process',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除外协单从对应的外协工序的从
-export function delProcess(id) {
-  return request({
-    url: '/business/process/' + id,
-    method: 'delete'
-  })
+	return request({
+		url: baseUrl + '/business/outsourceDetailProcess/' + id,
+		method: 'get'
+	})
 }

src/assets/styles/ezhizao/form.css

@@ -68,21 +68,22 @@
 
 .form-container .form-btns-container > .screen-btn,
 .form-container .form-btns-container > .close-btn {
+	display: flex;
 	position: absolute;
 	font-size: 12px;
 	top: 0px;
 	right: 40px;
 	cursor: pointer;
 	width: 40px;
-	height: 31px;
 	text-align: center;
-	line-height: 30px;
+	justify-content: center;
+	align-items: center;
 	/* border: 1px solid #527098; */
 }
 .form-container .form-btns-container > .close-btn {
 	right: 0px;
+	bottom: 0;
 	font-size: 16px;
-	/* border: 1px solid #527098; */
 }
 .form-container .form-btns-container > .screen-btn:hover {
 	background-color: #9cb2cf;

src/views/business/outsourcedOrder/form.vue

@@ -11,11 +11,11 @@
 					<!-- <span>关闭</span> -->
 				</div>
 			</div>
-			<el-form ref="formRef" class="master-container" v-loading="loading" label-width="120px">
+			<el-form ref="formRef" class="master-container" :model="form" v-loading="loading" label-width="120px">
 				<el-row :gutter="20">
 					<el-col :span="6">
 						<el-form-item label="单据号" prop="formCode">
-							<el-input v-model="form.formCode" disabled placeholder="系统自动生成" />
+							<el-input v-model="form.formCode" readonly />
 						</el-form-item>
 					</el-col>
 					<el-col :span="6">
@@ -25,31 +25,21 @@
 								v-model="form.formDate"
 								type="date"
 								value-format="YYYY-MM-DD"
-								placeholder="请选择表单日期"
 								style="width: 100%"
 							>
 							</el-date-picker>
 						</el-form-item>
 					</el-col>
-					<el-col :span="6">
-						<el-form-item label="外协商名称" prop="supplierName">
-							<el-input v-model="form.supplierName" readonly placeholder="请输入外协商名称">
-								<template #append>
-									<el-button icon="Search" @click="handleShowDialogSuppliers" />
-								</template>
-							</el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="送货方式" prop="deliveryMethod">
-							<el-select v-model="form.deliveryMethod" placeholder="请选择" readonly>
-								<el-option v-for="dict in deliveryMethod" :key="dict.value" :label="dict.label" :value="dict.value" />
-							</el-select>
-						</el-form-item>
-					</el-col>
 					<el-col :span="6">
 						<el-form-item label="运费单价" prop="freightPrice">
-							<el-input-number v-model="form.freightPrice" :min="0" :precision="2" controls-position="right" readonly />
+							<el-input-number
+								v-model="form.freightPrice"
+								:min="0"
+								:precision="2"
+								controls-position="right"
+								readonly
+								:controls="false"
+							/>
 						</el-form-item>
 					</el-col>
 					<el-col :span="6">
@@ -60,26 +50,28 @@
 								:precision="2"
 								controls-position="right"
 								readonly
+								:controls="false"
 							/>
 						</el-form-item>
 					</el-col>
 					<el-col :span="6">
-						<el-form-item label="带箱方式：" prop="packagingMethod">
-							<el-select v-model="form.packagingMethod" placeholder="请选择" readonly>
-								<el-option v-for="dict in packagingMethod" :key="dict.value" :label="dict.label" :value="dict.value" />
-							</el-select>
+						<el-form-item label="送货方式" prop="deliveryMethod">
+							<dict-tag :options="deliveryMethod" :value="form.deliveryMethod" />
+						</el-form-item>
+					</el-col>
+					<el-col :span="6">
+						<el-form-item label="带箱方式" prop="packagingMethod">
+							<dict-tag :options="packagingMethod" :value="form.packagingMethod" />
 						</el-form-item>
 					</el-col>
 					<el-col :span="6">
-						<el-form-item label="结算方式：" prop="settlementType">
-							<el-select v-model="form.settlementType" placeholder="请选择" readonly>
-								<el-option v-for="dict in settlementType" :key="dict.value" :label="dict.label" :value="dict.value" />
-							</el-select>
+						<el-form-item label="结算方式" prop="settlementType">
+							<dict-tag :options="settlementType" :value="form.settlementType" />
 						</el-form-item>
 					</el-col>
 					<el-col :span="6">
 						<el-form-item label="备注" prop="remark">
-							<el-input v-model="form.remark" placeholder="请输入备注" readonly />
+							<el-input v-model="form.remark" readonly />
 						</el-form-item>
 					</el-col>
 				</el-row>
@@ -141,7 +133,7 @@ const form = ref({})
 
 /***********************  方法区  ****************************/
 /** 打开抽屉 */
-function open(id) {
+const open = (id) => {
 	reset()
 	loading.value = true
 	visible.value = true
@@ -152,13 +144,13 @@ function open(id) {
 }
 
 /** 取消按钮 */
-function cancel() {
+const cancel = () => {
 	visible.value = false
 	reset()
 }
 
 /** 表单重置 */
-function reset() {
+const reset = () => {
 	form.value = {
 		id: null,
 		tenantId: '0',

src/views/business/outsourcedOrder/index.vue

@@ -1,7 +1,7 @@
 <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" style="margin-right: 0px">
 			<el-form-item label="单据号：" prop="formCode">
 				<el-input
 					v-model="queryParams.formCode"
@@ -13,22 +13,35 @@
 			</el-form-item>
 			<el-form-item label="表单日期：" prop="formDate">
 				<el-date-picker
-					v-model="queryParams.formDate"
+					v-model="queryParams.formStartDate"
 					type="date"
 					style="width: 144px"
+					value-format="YYYY-MM-DD"
+					placeholder="选择起始日期"
 					clearable
+				/>
+				<span style="margin: 0 4px">~</span>
+				<el-date-picker
+					v-model="queryParams.formEndDate"
+					type="date"
+					style="width: 144px"
 					value-format="YYYY-MM-DD"
-					placeholder="请选择表单日期"
-				>
-				</el-date-picker>
+					placeholder="选择结束日期"
+					clearable
+				/>
+			</el-form-item>
+			<el-form-item label="结算方式：" prop="settlementType">
+				<el-select v-model="queryParams.settlementType" style="width: 104px" clearable placeholder="请选择">
+					<el-option v-for="dict in settlement_type" :key="dict.value" :label="dict.label" :value="dict.value" />
+				</el-select>
 			</el-form-item>
 			<el-form-item label="送货方式：" prop="deliveryMethod">
-				<el-select v-model="queryParams.deliveryMethod" style="width: 144px" clearable placeholder="请选择">
+				<el-select v-model="queryParams.deliveryMethod" style="width: 104px" 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-select v-model="queryParams.packagingMethod" style="width: 104px" clearable placeholder="请选择">
 					<el-option v-for="dict in packaging_method" :key="dict.value" :label="dict.label" :value="dict.value" />
 				</el-select>
 			</el-form-item>
@@ -65,7 +78,7 @@
 						</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="144">
+					<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="64">
 						<template #default="scope">
 							<el-button link type="warning" icon="View" @click="handleShowFormDialog(scope.row)"> 查看 </el-button>
 						</template>
@@ -95,6 +108,7 @@
 
 <script setup name="Order">
 import { listOrder } from '@/api/business/outsourcedOrder'
+import orderForm from './form'
 const { proxy } = getCurrentInstance()
 /** 字典数组区 */
 const { delivery_method } = proxy.useDict('delivery_method')
@@ -114,6 +128,7 @@ const queryParams = ref({
 	formCode: null,
 	formDate: null,
 	productDescription: null,
+	settlementType: null,
 	deliveryMethod: null,
 	packagingMethod: null
 })

src/views/business/outsourcedOrderDetails/index.vue

@@ -1,398 +1,226 @@
 <template>
-  <div class="page-container row-container">
-    <!-- 左侧区域 -->
-    <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-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-form-item>
-        <el-form-item label="产品描述：">
-          <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-form-item>
-        <el-form-item style="margin-left: 0">
-          <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="批次号" 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>
-              </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">
-              <template #default="scope">
-                <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>
-        </div>
-      </div>
-      <!-- 分页 -->
-      <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>
-      </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">
-              <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">
-              <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>
-                <el-button v-else link type="primary" icon="View" @click="handleCheckDayworkItem(scope.row)">查看
-                </el-button>
-              </template>
-            </el-table-column>
-          </el-table>
-        </div>
-      </div>
-      <!-- 分页 -->
-      <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" />
-  </div>
+	<div class="page-container column-container">
+		<!-- 搜索区 -->
+		<el-form class="list-search-container" :model="queryParams" ref="queryRef" :inline="true" style="margin-right: 0px">
+			<el-form-item label="单据号：" prop="formCode">
+				<el-input v-model="queryParams.formCode" placeholder="请输入单据号" style="width: 144px" clearable />
+			</el-form-item>
+			<el-form-item label="表单日期：" prop="formDate">
+				<el-date-picker
+					v-model="queryParams.formStartDate"
+					type="date"
+					style="width: 144px"
+					value-format="YYYY-MM-DD"
+					placeholder="选择起始日期"
+					clearable
+				/>
+				<span style="margin: 0 4px">~</span>
+				<el-date-picker
+					v-model="queryParams.formEndDate"
+					type="date"
+					style="width: 144px"
+					value-format="YYYY-MM-DD"
+					placeholder="选择结束日期"
+					clearable
+				/>
+			</el-form-item>
+			<el-form-item label="批次号：">
+				<el-input
+					placeholder="请输入关键字"
+					v-model.trim="queryParams.lotCode"
+					@keydown.enter.prevent
+					clearable
+					style="width: 130px"
+				/>
+			</el-form-item>
+			<el-form-item label="产品描述：">
+				<el-input
+					placeholder="请输入关键字"
+					v-model.trim="queryParams.productDescription"
+					@keydown.enter.prevent
+					clearable
+					style="width: 130px"
+				/>
+			</el-form-item>
+			<el-form-item style="margin-left: 0">
+				<el-button type="info" icon="Search" @click="getList">搜索 </el-button>
+			</el-form-item>
+		</el-form>
+		<div class="el-table-container">
+			<div class="el-table-inner-container">
+				<el-table
+					ref="dataTable"
+					:data="dataList"
+					:span-method="rowSpanMethod"
+					v-loading="loading"
+					highlight-current-row
+					border
+					height="100%"
+				>
+					<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="lotCode" width="120" />
+					<el-table-column label="产品描述" align="center" prop="productDescription" />
+					<el-table-column label="产品数量" align="center" prop="productNum" width="80" />
+					<el-table-column label="工序名称" align="center" prop="processAlias" width="80" />
+					<el-table-column label="工序序号" align="center" prop="processStepNumber" width="80" />
+					<el-table-column label="投产数" align="center" prop="productionNum" width="120">
+						<template #default="scope">
+							<el-input-number
+								v-if="scope.row.editStatus"
+								v-model="scope.row.productionNum"
+								:min="1"
+								controls-position="right"
+								style="width: 100%"
+							/>
+							<span v-else>{{ scope.row.productionNum }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="合格数" align="center" prop="qualifiedNum" width="120">
+						<template #default="scope">
+							<el-input-number
+								v-if="scope.row.editStatus"
+								v-model="scope.row.qualifiedNum"
+								:min="1"
+								controls-position="right"
+								style="width: 100%"
+							/>
+							<span v-else>{{ scope.row.qualifiedNum }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="操作" align="center" width="104">
+						<template #default="scope">
+							<template v-if="scope.row.editStatus">
+								<el-button type="success" icon="Finished" circle @click="handleSaveRow(scope.row)" />
+								<el-button type="danger" icon="Close" circle @click="scope.row.editStatus = false" />
+							</template>
+							<el-button v-else type="primary" icon="Bell" @click="scope.row.editStatus = true">报工</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="getList"
+		/>
+	</div>
 </template>
 
 <script setup>
-import {
-  listDaywork,
-  listDayworkItem,
-  getProcessList,
-} from "@/api/business/daywork.js";
-import { listDeptProcess } from "@/api/business/deptProcess";
-import { getDept } from "@/api/business/planDetailSubDetail.js";
-import router from "@/router";
-import dayworkItemForm from "./form";
-
-const { proxy } = getCurrentInstance();
-
-/** 字典 */
-const { daywork_status } = proxy.useDict("daywork_status");
+import { listProcess } from '@/api/business/outsourcedOrderDetailProcess.js'
+const { proxy } = getCurrentInstance()
 
 /** 生产批次 */
-const dayworkList = ref([]);
-const dayworkTable = ref(null);
-const currentDaywork = ref({});
-const dayworkLoading = ref(false);
-const total = ref(0);
-/**工段 */
-const deptList = ref([]);
-const loading = ref(false);
-/** 报工信息 */
-const dayworkItemList = ref([]);
-const dayworkItemLoading = ref(false);
-const itemTotal = ref(0);
-const latestProcessId = ref(null);
-const deptProcessList = ref([]);
-/**工序 */
-const processList = ref([]);
+const dataList = ref([])
+const dataTable = ref(null)
+const currentDaywork = ref({})
+const loading = ref(false)
+const total = ref(0)
+// 用于计算合并行的计数器
+const spanArr = ref([])
+
 /** 查询对象 */
-const queryDayworkParams = ref({
-  productDescription: "",
-  deptId: "",
-  lotCode: "",
-  pageNum: 1,
-  pageSize: 10,
-});
-const queryItemParams = ref({
-  dayworkId: "0",
-  isAmend: 0,
-  isWasteRecycling: 0,
-  pageNum: 1,
-  pageSize: 10,
-  technologicalProcessDetailId: null,
-});
+const queryParams = ref({
+	formCode: '',
+	formStartDate: null,
+	formEndDate: null,
+	lotCode: '',
+	productDescription: '',
+	pageNum: 1,
+	pageSize: 10
+})
 
 /***********************  工段相关事件  ****************************/
-function getList() {
-  loading.value = true;
-  getDept().then((response) => {
-    deptList.value = response.data;
-    loading.value = false;
-    if (deptList.value.length > 0) {
-      queryDayworkParams.value.deptId = deptList.value[0].value;
-      getDayworks();
-    } else {
-      dayworkList.value = [];
-    }
-  });
-}
-
-//切换工段
-function handleDeptChange() {
-  getDayworks();
-}
-
-/***********************  生产批次相关事件  ****************************/
-
-/** 查询计划明细 */
-function getDayworks() {
-  dayworkLoading.value = true;
-  listDaywork(queryDayworkParams.value).then((res) => {
-    dayworkList.value = res.rows;
-    for (var i = 0; i < dayworkList.value.length; i++) {
-      let timeStamp = dayworkList.value[i].totalWorkingHours;
-      let seconds = Math.floor((timeStamp / 1000) % 60);
-      let minutes = Math.floor((timeStamp / (1000 * 60)) % 60);
-      let hours = Math.floor(timeStamp / (1000 * 60 * 60));
-      let time = `${hours}小时${minutes}分钟${seconds}秒`;
-      dayworkList.value[i].totalWorkingHours = time;
-    }
-    total.value = res.total;
-    dayworkLoading.value = false;
-    // 批次
-    if (dayworkList.value.length > 0) {
-      proxy.$refs.dayworkTable.setCurrentRow(dayworkList.value[0]);
-    } else {
-      dayworkItemList.value = [];
-      itemTotal.value = 0;
-    }
-  });
+const getList = () => {
+	loading.value = true
+	listProcess(queryParams.value).then((res) => {
+		dataList.value = res.rows
+		total.value = res.total
+		loading.value = false
+		if (dataList.value.length > 0) {
+			getSpanArr(dataList.value, 'formCode')
+			getSpanArr(dataList.value, 'formDate')
+			getSpanArr(dataList.value, 'lotCode')
+			getSpanArr(dataList.value, 'productDescription')
+		}
+	})
 }
 
-/** 打开批次详情页 */
-function handleColumnClick(row) {
-  router.push({ path: "/reviseBath/lotFormParticulars/" + row.lotCode });
+const handleSaveRow = (row) => {
+	row.editStatus = true
 }
 
-/** 生产计划明细 current-change 事件 */
-function handleDayworkCurrentChange(row) {
-  if (row) {
-    queryItemParams.value.processId = null;
-    currentDaywork.value = row;
-    queryItemParams.value.dayworkId = currentDaywork.value.id;
-    queryItemParams.value.isAmend = row.isAmend;
-    queryItemParams.value.isWasteRecycling = row.isWasteRecycling;
-    queryItemParams.value.technologicalProcessDetailId = null;
-    queryItemParams.value.technologicalProcessId = row.technologicalProcessId;
-    getDayworkItems();
-    getProcess();
-  } else {
-    dayworkItemList.value = [];
-    itemTotal.value = 0;
-  }
+const rowSpanMethod = ({ row, column, rowIndex, columnIndex }) => {
+	if (columnIndex === 0 || columnIndex === 1 || columnIndex === 2 || columnIndex === 3 || columnIndex === 4) {
+		const _row = spanArr.value[rowIndex]
+		const _col = _row > 0 ? 1 : 0
+		return {
+			rowspan: _row,
+			colspan: _col
+		}
+	}
 }
 
-/***********************  报工信息相关事件  ****************************/
-//查询报工信息数据
-function handleGetDayworkItems() {
-  dayworkLoading.value = true;
-  listDaywork(queryDayworkParams.value).then((res) => {
-    dayworkList.value = res.rows;
-    for (var i = 0; i < dayworkList.value.length; i++) {
-      let timeStamp = dayworkList.value[i].totalWorkingHours;
-      let seconds = Math.floor((timeStamp / 1000) % 60);
-      let minutes = Math.floor((timeStamp / (1000 * 60)) % 60);
-      let hours = Math.floor(timeStamp / (1000 * 60 * 60));
-      let time = `${hours}小时${minutes}分钟${seconds}秒`;
-      dayworkList.value[i].totalWorkingHours = time;
-    }
-    total.value = res.total;
-    dayworkLoading.value = false;
-    if (dayworkList.value.length > 0) {
-      for (var i = 0; i < dayworkList.value.length; i++) {
-        if (dayworkList.value[i].id == currentDaywork.value.id) {
-          var index = i;
-          break;
-        }
-      }
-    }
-    proxy.$refs.dayworkTable.setCurrentRow(dayworkList.value[index]);
-  });
-}
-
-//修改报工信息
-function handleUpdateDayworkItem(row) {
-  //同工序下状态是否有工序已完成
-  let processFinish = false;
-  //除了编辑此条以外的同工序合格数
-  let totalQuailifiedNum = 0;
-  for (let i = 0; i < dayworkItemList.value.length; i++) {
-    if (
-      row.processId == dayworkItemList.value[i].processId &&
-      (dayworkItemList.value[i].status == 2 ||
-        dayworkItemList.value[i].status == 3) &&
-      row.id != dayworkItemList.value[i].id
-    ) {
-      totalQuailifiedNum += dayworkItemList.value[i].qualifiedNum;
-    }
-    if (
-      row.processId == dayworkItemList.value[i].processId &&
-      dayworkItemList.value[i].status == 3 &&
-      row.id != dayworkItemList.value[i].id
-    ) {
-      processFinish = true;
-    }
-  }
-  let maxQuailifiedNum =
-    Math.floor(row.prodNum * 1.03 - totalQuailifiedNum) > 0
-      ? Math.floor(row.prodNum * 1.03 - totalQuailifiedNum)
-      : 0;
-  //该daywork合格数总数不能超过投产数的103%
-  row.technologicalProcessId = queryItemParams.value.technologicalProcessId;
-  row.deptId = queryDayworkParams.value.deptId;
-  row.productionPlanDetailId = currentDaywork.value.productionPlanDetailId;
-  row.dayworkId = currentDaywork.value.id;
-  row.lotId = currentDaywork.value.lotId;
-  row.maxQuailifiedNum = maxQuailifiedNum;
-  row.totalQuailifiedNum = totalQuailifiedNum;
-  //判断是否是当前工段
-  if (row.deptId == currentDaywork.value.deptId) {
-    row.currentDept = true;
-  } else {
-    row.currentDept = false;
-  }
-  //修改向form表单传一个状态值
-  row.editStatus = true;
-  //如果为true，则同工序已有工序已完成
-  row.processFinish = processFinish;
-  proxy.$refs.dayworkItemRef.open(row);
-}
-
-//查看报工信息
-function handleCheckDayworkItem(row) {
-  row.technologicalProcessId = queryItemParams.value.technologicalProcessId;
-  row.deptId = queryDayworkParams.value.deptId;
-  row.productionPlanDetailId = currentDaywork.value.productionPlanDetailId;
-  row.dayworkId = currentDaywork.value.id;
-  row.lotId = currentDaywork.value.lotId;
-  //判断是否是当前工段
-  if (row.deptId == currentDaywork.value.deptId) {
-    row.currentDept = true;
-  } else {
-    row.currentDept = false;
-  }
-  //修改向form表单传一个状态值
-  row.editStatus = false;
-  // row.returnFlag = false;
-  // //如果是最新工序的已接收，则传一个状态值，给form表单一个退回按钮
-  // if (row.processId == latestProcessId.value && row.status == 7) {
-  //   row.returnFlag = true;
-  // }
-  proxy.$refs.dayworkItemRef.open(row);
-}
-
-/**切换工序 */
-function handleProcessChange() {
-  getDayworkItems();
-}
-
-/** 报工详情列表 */
-function getDayworkItems() {
-  dayworkItemLoading.value = true;
-  //查询该工段在工段资源分配时绑定的工序，传一个flag，如果flag有值则后端查询不分页
-  listDeptProcess({ deptId: queryDayworkParams.value.deptId, flag: 1 }).then(
-    (res) => {
-      deptProcessList.value = res.rows;
-    }
-  );
-  listDayworkItem(queryItemParams.value).then((res) => {
-    console.log(currentDaywork.value);
-    for (let i = 0; i < res.rows.length; i++) {
-      //如果时首序，投产数是单批数
-      if (res.rows[i].prodNum == 0) {
-        if (currentDaywork.value.isLast == 1) {
-          res.rows[i].prodNum = currentDaywork.value.lastLotQuantity;
-        } else {
-          res.rows[i].prodNum = currentDaywork.value.oneLotQuantity;
-        }
-      }
-      //拿到最新一条报工信息的工序id，只能编辑当前序
-      if (res.rows[i] == res.rows[res.rows.length - 1]) {
-        latestProcessId.value = res.rows[i].processId;
-      }
-    }
-    for (var i = 0; i < res.rows.length; i++) {
-      let timeStamp = res.rows[i].workingHours;
-      let seconds = Math.floor((timeStamp / 1000) % 60);
-      let minutes = Math.floor((timeStamp / (1000 * 60)) % 60);
-      let hours = Math.floor(timeStamp / (1000 * 60 * 60));
-      let time = `${hours}小时${minutes}分钟${seconds}秒`;
-      res.rows[i].workingHours = time;
-      res.rows[i].deptProcessStatus = false;
-      //报工记录的工序id是该工段绑定的工序时，允许编辑
-      for (var item = 0; item < deptProcessList.value.length; item++) {
-        if (res.rows[i].processId == deptProcessList.value[item].processId) {
-          res.rows[i].deptProcessStatus = true;
-        }
-      }
-    }
-    dayworkItemList.value = res.rows;
-    getProcess();
-    itemTotal.value = res.total;
-    dayworkItemLoading.value = false;
-  });
-}
-//工序信息
-function getProcess() {
-  //工序下拉框
-  getProcessList({
-    technologicalProcessId: queryItemParams.value.technologicalProcessId,
-  }).then((res) => {
-    processList.value = res.data;
-  });
+// groupBy 数组
+const groupBy = (data, params) => {
+	const groups = {}
+	data.forEach((v) => {
+		const group = JSON.stringify(v[params])
+		groups[group] = groups[group] || []
+		groups[group].push(v)
+	})
+	return Object.values(groups)
 }
 
-/** 搜索按钮操作 */
-function handleQuery() {
-  getDayworks();
+// 计算 数据合并 索引
+const getSpanArr = (data, params) => {
+	// 接收重构数组
+	let arr = []
+
+	// 设置索引
+	let pos = 0
+
+	// 控制合并的数组
+	spanArr.value = []
+
+	// arr 处理
+	groupBy(data, params).map((v) => (arr = arr.concat(v)))
+
+	arr.map((res) => {
+		data.shift()
+		data.push(res)
+	})
+
+	// spanArr 处理
+	const redata = arr.map((v) => v[params])
+	redata.reduce((old, cur, i) => {
+		if (i === 0) {
+			spanArr.value.push(1)
+			pos = 0
+		} else {
+			if (cur === old) {
+				spanArr.value[pos] += 1
+				spanArr.value.push(0)
+			} else {
+				spanArr.value.push(1)
+				pos = i
+			}
+		}
+		return cur
+	}, {})
 }
 
 onMounted(() => {
-  getList();
-});
+	getList()
+})
 </script>
 <style scoped>
 .el-form--inline .el-form-item {
-  margin-right: 20px;
+	margin-right: 20px;
 }
 </style>

vite.config.js

@@ -31,7 +31,7 @@ export default defineConfig(({ mode, command }) => {
 			proxy: {
 				// https://cn.vitejs.dev/config/#server-proxy
 				'/ezhizao-dms-supplier-api': {
-					target: 'http://localhost:8081',
+					target: 'http://localhost:8082',
 					changeOrigin: true,
 					rewrite: (p) => p.replace(/^\/ezhizao-dms-supplier-api/, '')
 				}