优化

src/api/mes/job.js

@@ -322,7 +322,7 @@ export const getOneWorkOrder = (params) => {
 //   })
 // }
 
-//出库报工搜索列表
+//月度客户订单汇总
 export const ProductInformation = (params) => {
   return service({
     url: '/mes_server/work_order/ProductInformation',
@@ -331,6 +331,16 @@ export const ProductInformation = (params) => {
   })
 }
 
+//报工删除记录
+export const ProcessDetailDel = (params) => {
+  return service({
+    url: '/mes_server/work_order/ProcessDetailDel',
+    method: 'get',
+    params
+  })
+}
+
+
 //出库报工搜索列表
 export const getSpotList = (params) => {
   return service({

src/view/performance/baozhuangbaogong.vue

@@ -272,6 +272,13 @@ const getMachineMacdata = async () => {
   console.log(_code,"机台获取物理地址",Machine.value)
   try {
     const data  = await getMachineMac({sys_sbID:Machine.value});
+	if (data.data === null) {
+		ElMessage({
+			type: 'error',
+			message: '未获取到机台编号请确认MAC地址或与管理员联系'
+		})
+		return;
+	}
 	add_formData['机台号'] = data.data['机台号']
 	add_formData['工序'] = data.data['生产工序']
 	add_formData['组别'] = data.data['组别']

src/view/performance/caiqiebaogong.vue

@@ -274,6 +274,13 @@ const UniqId = ref('')
 const getMachineMacdata = async () => {
   try {
     const data  = await getMachineMac({sys_sbID:Machine.value});
+	if (data.data === null) {
+		ElMessage({
+			type: 'error',
+			message: '未获取到机台编号请确认MAC地址或与管理员联系'
+		})
+		return;
+	}
 	// console.log(data)
 	add_formData['机台号'] = data.data['机台号']
 	add_formData['工序'] = data.data['生产工序']

src/view/performance/datangbaogong.vue

@@ -272,6 +272,13 @@ const getMachineMacdata = async () => {
   console.log(_code,"机台获取物理地址",Machine.value)
   try {
     const data  = await getMachineMac({sys_sbID:Machine.value});
+	if (data.data === null) {
+		ElMessage({
+			type: 'error',
+			message: '未获取到机台编号请确认MAC地址或与管理员联系'
+		})
+		return;
+	}
 	add_formData['机台号'] = data.data['机台号']
 	add_formData['工序'] = data.data['生产工序']
 	add_formData['组别'] = data.data['组别']

src/view/performance/houdaoshougong.vue

@@ -272,6 +272,13 @@ const getMachineMacdata = async () => {
   console.log(_code,"机台获取物理地址",Machine.value)
   try {
     const data  = await getMachineMac({sys_sbID:Machine.value});
+	if (data.data === null) {
+		ElMessage({
+			type: 'error',
+			message: '未获取到机台编号请确认MAC地址或与管理员联系'
+		})
+		return;
+	}
 	add_formData['机台号'] = data.data['机台号']
 	add_formData['工序'] = data.data['生产工序']
 	add_formData['组别'] = data.data['组别']

src/view/performance/zongjianbaogong.vue

@@ -272,6 +272,13 @@ const getMachineMacdata = async () => {
   console.log(_code,"机台获取物理地址",Machine.value)
   try {
     const data  = await getMachineMac({sys_sbID:Machine.value});
+	if (data.data === null) {
+		ElMessage({
+			type: 'error',
+			message: '未获取到机台编号请确认MAC地址或与管理员联系'
+		})
+		return;
+	}
 	add_formData['机台号'] = data.data['机台号']
 	add_formData['工序'] = data.data['生产工序']
 	add_formData['组别'] = data.data['组别']

src/view/yunyin/shengchanguanli/baogongshuju.vue

@@ -8,15 +8,16 @@
 				<el-input v-model="searchInfo"  placeholder="搜索订单编号" style="width: 180px;" @keyup.enter="onSubmit()"></el-input>
 				<el-button type="primary" icon="search" @click="onSubmit" title="搜索">查询</el-button>
 				<el-button type="primary" icon="document"  @click="statusExcel" title="查看当前月产量汇总">产量进度表汇总</el-button>
+        <el-button type="primary" icon="edit"   @click="delete_onclick"   class="bt"   title="删除记录">报工删除记录</el-button>
 				<el-button  type="danger"  icon="delete"  title="请选择要删除的数据"  @click="del_delclick"  v-if="delall === true" 
-				  :disabled="Selection === ''"  class="bt"
+        :disabled="Selection === ''"  class="bt"
 				  :style="{
 				    backgroundColor: Selection === '' ? '' : 'red',
 				    borderColor: Selection === '' ? '' : 'red',
 				    color: Selection === '' ? '' : '#fff'
 				  }">删除报工
 				</el-button>
-				 
+
 				<!-- 查询产量进度表弹窗 -->
 				<el-dialog v-model="statusExceldialog" :before-close="luckyexcelCloseDialog" style='height: 100%;margin: 0px;' width="100%"  >
 					<div class="block">
@@ -33,15 +34,15 @@
 					          size="small" highlight-current-row="true" :show-overflow-tooltip="true"
 					          @row-click="add_tableRowClick" @row-dblclick="add_updateCompanyFunc"
 					          @selection-change="Excel_Selection">
-					    <el-table-column  align="left" label="订单编号" prop="订单编号" width="105"/>
-						<el-table-column  align="left" label="客户" prop="客户编号" width="70"/>
-					    <el-table-column  align="left" label="组别" prop="组别" width="80"/>
-					    <el-table-column  align="left" label="款式" prop="款式" width="110"/>
-						<el-table-column  align="left" label="生产款号" prop="款号" width="110"/>
-					    <el-table-column  align="left" label="制单数" prop="制单数" width="75"/>
-					    <el-table-column  align="left" label="裁剪数" prop="裁剪数" width="75"/>
-					    <el-table-column  align="left" label="上月累计" prop="上月累计" width="75"/>
-						<el-table-column  align="left" label="本月累计" prop="本月累计" width="75"/>
+                    <el-table-column  align="left" label="订单编号" prop="订单编号" width="105"/>
+                    <el-table-column  align="left" label="客户" prop="客户编号" width="70"/>
+                    <el-table-column  align="left" label="组别" prop="组别" width="80"/>
+                    <el-table-column  align="left" label="款式" prop="款式" width="110"/>
+                    <el-table-column  align="left" label="生产款号" prop="款号" width="110"/>
+                    <el-table-column  align="left" label="制单数" prop="制单数" width="75"/>
+                    <el-table-column  align="left" label="裁剪数" prop="裁剪数" width="75"/>
+                    <el-table-column  align="left" label="上月累计" prop="上月累计" width="75"/>
+                    <el-table-column  align="left" label="本月累计" prop="本月累计" width="75"/>
 					
 					    <!-- 动态生成从 1 号到 31 号的列 -->
 					    <el-table-column v-for="day in 31" :key="day" :label="day" :prop="day" width="45" align="left"/>
@@ -52,7 +53,31 @@
             </el-form>
           </div>
         </layout-header>
-  
+
+				<!-- 删除弹窗 -->
+        <el-dialog v-model="deletedialog" :before-close="luckyexcelCloseDialog" style='height: 75%;margin-left: 15%;' width="70%"  >
+					<div class="block">
+            <h3 style="color:red;font-size: 24px;margin:-5px 0px 8px 12px;">报工删除历史记录</h3>
+						<!-- <el-button type="primary" @click="ExcelonSubmit" style='margin-left: 10px;'>查询</el-button> -->
+					  </div>
+					  <br>
+					<el-table ref="multipleTable" style="width: 100%;height: 60vh" tooltip-effect="dark"
+					          :row-style="{ height: '30px' }" :header-cell-style="{ padding: '0px' }"
+					          :cell-style="{ padding: '0px' }" :header-row-style="{ height: '0px' }"
+					          :data="deletetableData" border row-key="ID" id="Excel_table"
+					          size="small" highlight-current-row="true" :show-overflow-tooltip="true"
+					          @row-click="add_tableRowClick" @row-dblclick="add_updateCompanyFunc"
+					          @selection-change="Excel_Selection">
+                    <el-table-column  align="center" label="订单编号" prop="订单编号" width="200"/>
+                    <el-table-column  align="center" label="客户编号" prop="客户编号" width="100"/>
+                    <el-table-column  align="center" label="删除用户" prop="delsys_id" width="160"/>
+                    <el-table-column  align="center" label="款式" prop="款式" width="130"/>
+                    <el-table-column  align="center" label="生产款号" prop="款号" width="200"/>
+                    <el-table-column  align="center" label="制单数" prop="制单数" width="120"/>
+                    <el-table-column  align="center" label="删除时间" prop="mod_rq" width="300"/>
+					</el-table>
+          <h3 style="font-size: 15px;margin:15px 0px 8px 1250px;">共{{del_total}}条</h3>
+				</el-dialog>  
         <layout>
           <!--左侧树侧形结构-->
           <layout-sider :resize-directions="['right']" :width="190" style="margin-right: 10px;">
@@ -98,6 +123,24 @@
   
           </el-main>
         </layout-content>
+        <el-dialog v-model="add_gddialogFormVisible" :before-close="add_gdcloseDialog"
+		          title="新增订单资料" width="70%" top="3%" destroy-on-close>
+              <div style="display: flex; gap: 0px;">
+                         <el-form-item label="制单数:" class="mab" prop="keyOrder" label-width='110'>
+                             <el-input v-model="edit_zdsformdata.zds1" @input="updateTotal" style="width: 80px;" id="zds1" @keydown="add_gdzlent($event, '是否船样', 'zds1', 'zds2')" />
+                             <el-input v-model="edit_zdsformdata.zds2" @input="updateTotal" style="width: 80px;" id="zds2" @keydown="add_gdzlent($event, 'zds1', 'zds2', 'zds3')" />
+                             <el-input v-model="edit_zdsformdata.zds3" @input="updateTotal" style="width: 80px;" id="zds3" @keydown="add_gdzlent($event, 'zds2', 'zds3', 'zds4')" />
+                             <el-input v-model="edit_zdsformdata.zds4" @input="updateTotal" style="width: 80px;" id="zds4" @keydown="add_gdzlent($event, 'zds3', 'zds4', 'zds5')" />
+                             <el-input v-model="edit_zdsformdata.zds5" @input="updateTotal" style="width: 80px;" id="zds5" @keydown="add_gdzlent($event, 'zds4', 'zds5', 'zds6')" />
+                             <el-input v-model="edit_zdsformdata.zds6" @input="updateTotal" style="width: 80px;" id="zds6" @keydown="add_gdzlent($event, 'zds5', 'zds6', 'zds7')" />
+                             <el-input v-model="edit_zdsformdata.zds7" @input="updateTotal" style="width: 80px;" id="zds7" @keydown="add_gdzlent($event, 'zds6', 'zds7', 'zds8')" />
+                             <el-input v-model="edit_zdsformdata.zds8" @input="updateTotal" style="width: 80px;" id="zds8" @keydown="add_gdzlent($event, 'zds7', 'zds8', 'zds9')" />
+							               <el-input v-model="edit_zdsformdata.zds9" @input="updateTotal" style="width: 80px;" id="zds9" @keydown="add_gdzlent($event, 'zds8', 'zds9', '色系名称')" />
+                             <el-input v-model="edit_zdsformdata.zds10" readonly style="width: 80px;" />
+                         </el-form-item>
+                     </div>
+
+		</el-dialog>
         </layout>
       </layout>
     </div>
@@ -177,7 +220,7 @@ import { Layout, LayoutSider, LayoutContent } from '@arco-design/web-vue';
 import * as XLSX from 'xlsx'
 import FileSaver from 'file-saver'
 import {ref, reactive,onMounted } from 'vue'
-import {MachineList,MachineDetail,getOneWorkOrder,spotcheckdel} from '@/api/mes/job'
+import {MachineList,MachineDetail,getOneWorkOrder,spotcheckdel,ProcessDetailDel} from '@/api/mes/job'
 import {ElMessage} from "element-plus";
 import { useUserStore } from '@/pinia/modules/user';
 defineOptions({name: 'Company'})
@@ -564,6 +607,21 @@ const ids = selection.map(item => {
 bgSelection.value = ids.join(',')
 }
 
+
+
+//=========删除记录============
+const deletedialog = ref(false)
+const deletetableData = reactive([]);
+const delete_onclick = async () => {
+  const ProcessDetailtable = await ProcessDetailDel()
+  console.log('删除记录',ProcessDetailtable.data.total)
+
+	deletetableData.splice(0,deletetableData.length,...ProcessDetailtable.data.table);
+  del_total.value = ProcessDetailtable.data.total
+deletedialog.value = true
+}
+
+
 // =========== 修改 ===========
 const dialogFormVisible = ref(false)
 const edit_formData = ref({})
@@ -579,6 +637,10 @@ const edit_closeDialog = async (row) => {
   dialogFormVisible.value = false;
 };
 // =========== 分页 ===========
+
+const del_total = ref(0)
+
+
 // 分页相关的响应式变量
 const page = ref(1)
 const total = ref(0)

src/view/yunyin/shengchanguanli/gongdanziliao.vue

@@ -43,7 +43,7 @@
 						@row-click="tableRowClick" @row-dblclick="updateCompanyFunc"
                         @selection-change="ddzlSelectionChange" :show-overflow-tooltip="true">
                 <el-table-column align="center" type="selection" width="30"/>
-				<el-table-column align="center"  label="订单状态"     	prop="status" 	width="100" />
+				<el-table-column align="center"  label="附件状态"     	prop="status" 	width="100" />
                 <el-table-column align="left" sortable label="订单编号"     	prop="订单编号" 	width="105" />
 				<el-table-column align="left" sortable label="客户"      	prop="客户编号" 		width="80" />
                 <el-table-column align="left" sortable label="生产款号"   	prop="生产款号"  width="110" />

src/view/yunyin/shengchanguanli/yangyipihe.vue

@@ -31,29 +31,30 @@
 							 highlight-current-row="true"
 							 :show-overflow-tooltip="true"
 							style="width: 100%;height: 65vh" border  :data="tableData1" row-key="ID" @selection-change="handleSelectionChange">
-						<el-table-column align="center" type="selection" width="40"/>
-						<el-table-column  sortable align="left" label="客户" prop="客户编号"  width="80" />
-						<el-table-column  sortable align="left" label="订单编号" prop="订单编号"  width="110" />
-						<el-table-column  sortable align="left" label="生产款号" prop="生产款号"  width="150" />
-						<el-table-column  sortable align="left" label="款式" prop="款式"  width="110" />
-						<el-table-column  sortable align="left" label="工单状态" prop="gd_statu"  width="105" />
-						<el-table-column  sortable align="left" label="订单数量" prop="订单数量"  width="120" />
-						<el-table-column  sortable align="left" label="船样合计" prop="船样合计"  width="105" />
-						<el-table-column  sortable align="left" label="船样描述" prop="船样描述"  width="200" />
-						<el-table-column  sortable align="left" label="单位" prop="单位"  width="80" />
-						<el-table-column  sortable align="left" label="粘衬" prop="粘衬"  width="80" />
-						<el-table-column  sortable align="left" label="要求" prop="要求"  width="360" />
-						<el-table-column  sortable align="left" label="箱唛要求" prop="箱唛要求"  width="360" />
-						<el-table-column  sortable align="left" label="工单完工数量" prop="工单完工数量"  width="140" />
-						<el-table-column  sortable align="left" label="工单完工日期" prop="工单完工日期"  width="140" />
-						<el-table-column  sortable align="left" label="制单人" prop="Sys_id"  width="120" />
-						<el-table-column  sortable align="left" label="制单日期" prop="Sys_rq"  width="120" />
-						<el-table-column  sortable align="left" label="接单日期" prop="接单日期"  width="120" />
-						<el-table-column  sortable align="left" label="出库日期" prop="出库日期"  width="120" />
-						<el-table-column  sortable align="left" label="落货日期" prop="落货日期"  width="120" />
-						<el-table-column  sortable align="left" label="更新时间" prop="Mod_rq"  width="120" />
-						<el-table-column  sortable align="left" label="审核" prop="审核"  width="100" />
-						<el-table-column  sortable align="left" label="审核日期" prop="审核日期"  width="120" />
+						<el-table-column   align="center" type="selection" width="40"/>
+						<el-table-column   align="center" label="附件状态" prop="status"  width="100" />
+						<el-table-column   align="left" label="客户" prop="客户编号"  width="70" />
+						<el-table-column   align="left" label="订单编号" prop="订单编号"  width="120" />
+						<el-table-column   align="left" label="生产款号" prop="生产款号"  width="150" />
+						<el-table-column   align="left" label="款式" prop="款式"  width="110" />
+						<el-table-column   align="left" label="工单状态" prop="gd_statu"  width="90" />
+						<el-table-column   align="left" label="订单数量" prop="订单数量"  width="90" />
+						<el-table-column   align="left" label="船样合计" prop="船样合计"  width="90" />
+						<el-table-column   align="left" label="船样描述" prop="船样描述"  width="150" />
+						<el-table-column   align="left" label="单位" prop="单位"  width="60" />
+						<el-table-column   align="left" label="粘衬" prop="粘衬"  width="120" />
+						<el-table-column   align="left" label="要求" prop="要求"  width="360" />
+						<el-table-column   align="left" label="箱唛要求" prop="箱唛要求"  width="360" />
+						<el-table-column   align="left" label="工单完工数量" prop="工单完工数量"  width="140" />
+						<el-table-column   align="left" label="工单完工日期" prop="工单完工日期"  width="140" />
+						<el-table-column   align="left" label="制单人" prop="Sys_id"  width="160" />
+						<el-table-column   align="left" label="制单日期" prop="Sys_rq"  width="160" />
+						<!-- <el-table-column   align="left" label="接单日期" prop="接单日期"  width="120" /> -->
+						<el-table-column   align="left" label="出库日期" prop="出库日期"  width="120" />
+						<el-table-column   align="left" label="落货日期" prop="落货日期"  width="120" />
+						<el-table-column   align="left" label="更新时间" prop="Mod_rq"  width="120" />
+						<el-table-column   align="left" label="审核" prop="审核"  width="100" />
+						<el-table-column   align="left" label="审核日期" prop="审核日期"  width="120" />
 					</el-table>
 				</el-tab-pane>
             </el-tabs>
@@ -120,8 +121,10 @@ const getUnapprovalList = async () => {
   try {
     const UnapprovalListtable  = await UnapprovalList({search:''});
 	console.log(1484,UnapprovalListtable)
-	const workOrderDetaildata1 = UnapprovalListtable.data
+	const workOrderDetaildata1 = UnapprovalListtable.data.table
 	tableData1.splice(0,tableData1.length,...workOrderDetaildata1);
+	total.value = UnapprovalListtable.data.total
+
   setTimeout(() => {
 				const inputElement = document.getElementById('searchInput');
 				if (inputElement) {