优化

src/view/performance/caiqiebaogong.vue

@@ -1,154 +1,10 @@
 <template>
-  <div>
-    <layout>
-      <layout-header>
-        <div class="">
-          <!--          按钮部分-->
-          <el-form ref="elSearchFormRef"   class="demo-form-inline" :rules="searchRule" @keyup.enter="onSubmit">
-            <el-form-item>
-              <el-input v-model="searchInfo" placeholder="搜索" clearable style="margin: 0px 5px 0px 0px;width: 180px;height:40px;border-radius: 5%;"></el-input>
-              <el-button type="primary" icon="search" @click="onSubmit" style="margin: 0px 5px 0px 0px;width: 80px;height:40px;border-radius: 5%;">查询</el-button>
-			  <el-button type="primary"  @click="onAttendance" style="margin: 0px 5px 0px 0px;width: 80px;height:40px;border-radius: 5%;">新增</el-button>
-              <el-button type="primary"  @click="baogong_del" 
-			  style="margin: 0px 5px 0px 0px;width: 80px;height:40px;border-radius: 5%;float: right;background-color: red">删除</el-button>
-            </el-form-item>
-          </el-form>
-        </div>
-      </layout-header>
-
-      <layout>
-        <!--左侧树侧形结构-->
-        <layout-sider :resize-directions="['right']" :width="190" style="margin-right: 10px;">
-          <div class="JKWTree-tree" style="height: 200px">
-            <h3>裁切完工报工</h3>
-            <el-tree :data="treeData" class="treecolor"   @node-click="handleNodeClick"></el-tree>
-          </div>
-        </layout-sider>
-
-        <!-- 右侧区域 -->
-        <layout-content >
-        <el-main>
-          <div class="gva-table-box">
-            <!-- 表格数据 -->
-           <el-table ref="multipleTable" style="width: 100%;height: 65vh" tooltip-effect="dark"
-                      :row-style="{ height: '20px' }"  :header-cell-style="{ padding: '0px' }"
-                      :cell-style="{ padding: '0px' }" :header-row-style="{ height: '20px' }"
-                      :data="tableData"  border row-key="ID"
-                      size="small" 
-                      highlight-current-row="true" @row-dblclick="updateCompanyFunc"
-                      @row-click="tableRowClick" :show-overflow-tooltip="true"
-                      @selection-change="handleSelectionChange">
-			  <el-table-column type="selection" width="55" />
-              <el-table-column  sortable align="center" label="序号" prop="序号"  width="80" />
-              <el-table-column  sortable align="left" label="订单子编号" prop="订单子编号"  width="120"/>
-              <el-table-column  sortable  align="center" label="订单号" prop="订单号" width="120"/>
-              <el-table-column  sortable  align="left" label="生产款号" prop="生产款号" width="120" />
-              <el-table-column  sortable  align="left" label="款式" prop="款式" width="110" />
-              <el-table-column  sortable  align="left" label="颜色" prop="颜色" width="80"  />
-              <el-table-column  sortable  align="left" label="制单总数" prop="制单总数" width="100" />
-              <el-table-column  sortable  align="left" label="实裁总数" prop="实裁总数" width="110" />
-              <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="90" />
-              <el-table-column  sortable  align="left" label="日期" prop="日期" width="120" />
-            </el-table>
-            <!-- 分页 -->
-            <div class="gva-pagination">
-              <el-pagination layout="total" :current-page="page" :page-size="pageSize"
-               :total="total" @current-change="handleCurrentChange" @size-change="handleSizeChange" />
-<!--              <el-pagination layout="total, sizes, prev, pager, next, jumper" :current-page="page" :page-size="pageSize" :page-sizes="[10, 30, 50, 100]"-->
-<!--                             :total="total" @current-change="handleCurrentChange" @size-change="handleSizeChange" />-->
-            </div>
-          </div>
-
-
-          <!-- 修改弹窗 -->
-			<el-dialog v-model="dialogFormVisible" :before-close="edit_closeDialog"  destroy-on-close style="width: 60%; height: 70%;">
-				<h1 style="margin: 0%;margin-bottom: 10px;">裁切报工修改</h1>
-				<el-row :gutter="24"  style="margin-bottom: 5px;">
-					<el-col :span="10">
-						<el-form-item label="订单号:" prop="deliveryDate" class="mab" label-width="120px" style="font-size: 20px;">
-							<el-input v-model="edit_formData['订单号']" style="width: 70%; height: 40px;" id="订单号:" />
-						</el-form-item>
-					</el-col>
-					<el-col :span="10">
-						<el-form-item label="订单子编号:" prop="deliveryDate" class="mab" label-width="120px" style="font-size: 20px;">
-							<el-input v-model="edit_formData['订单子编号']" style="width: 70%; height: 40px;" id="订单子编号" />
-						</el-form-item>
-					</el-col>
-				</el-row>
-
-				<el-row :gutter="24"  style="margin-bottom: 5px;">
-					<el-col :span="10">
-						<el-form-item label="生产款号:" prop="deliveryDate" class="mab" label-width="120px" style="font-size: 20px;">
-							<el-input v-model="edit_formData['生产款号']" style="width: 70%; height: 40px;" id="生产款号" />
-						</el-form-item>
-					</el-col>
-					<el-col :span="10">
-						<el-form-item label="款式:" prop="deliveryDate" class="mab" label-width="120px" style="font-size: 20px;">
-							<el-input v-model="edit_formData['款式']" style="width: 70%; height: 40px;" id="款式" />
-						</el-form-item>
-					</el-col>	
-				</el-row>
-
-				<el-row :gutter="24"  style="margin-bottom: 5px;">
-					<el-col :span="10">
-						<el-form-item label="颜色:" prop="deliveryDate" class="mab" label-width="120px" style="font-size: 20px;">
-							<el-input v-model="edit_formData['颜色']" style="width: 70%; height: 40px;" id="颜色" />
-						</el-form-item>
-					</el-col>
-					<el-col :span="10">
-						<el-form-item label="制单总数:" prop="deliveryDate" class="mab" label-width="120px" style="font-size: 20px;">
-							<el-input v-model="edit_formData['制单总数']" style="width: 70%; height: 40px;" id="制单总数" />
-						</el-form-item>
-					</el-col>
-				</el-row>
-				
-				<el-row :gutter="24"  style="margin-bottom: 5px;">
-					<el-col :span="10">
-						<el-form-item label="实裁总数:" prop="deliveryDate" class="mab" label-width="120px" style="font-size: 20px;">
-							<el-input v-model="edit_formData['实裁总数']" style="width: 70%; height: 40px;" id="实裁总数" />
-						</el-form-item>
-					</el-col>
-					<el-col :span="10">
-						<el-form-item label="单位:" prop="deliveryDate" class="mab" label-width="120px" style="font-size: 20px;">
-							<el-input v-model="edit_formData['单位']" style="width: 70%; height: 40px;" id="单位" />
-						</el-form-item>
-					</el-col>
-				</el-row>
-				
-				<el-row :gutter="24"  style="margin-bottom: 5px;">
-					<el-col :span="10">
-						<el-form-item label="工序:" prop="deliveryDate" class="mab" label-width="120px" style="font-size: 20px;">
-							<el-input v-model="edit_formData['工序']" style="width: 70%; height: 40px;" id="工序" />
-						</el-form-item>
-					</el-col>
-					<el-col :span="10">
-						<el-form-item label="验片人:" prop="deliveryDate" class="mab" label-width="120px" style="font-size: 20px;">
-							<el-input v-model="edit_formData['验片人']" style="width: 70%; height: 40px;" id="验片人" />
-						</el-form-item>
-					</el-col>
-				</el-row>
-
-				<el-row :gutter="24"  style="margin-bottom: 5px;">
-					<el-col :span="10">
-						<el-form-item label="日期:" prop="deliveryDate" class="mab" label-width="120px" style="font-size: 20px;">
-							<el-input v-model="edit_formData['日期']" style="width: 70%; height: 40px;" id="日期" />
-						</el-form-item>
-					</el-col>
-				</el-row>
-
-				<template #footer>
-					<div class="dialog-footer">
-						<el-button @click="edit_closeDialog"  style="width: 110px;height: 60px;font-size: 20px;">取消</el-button>
-						<el-button type="primary" @click="edit_Dialog"  style="width: 110px;height: 60px;font-size: 20px;">确认</el-button>
-					</div>
-				</template>
-			</el-dialog>
-
-		 <!-- 新增弹窗 -->
-		  <el-dialog v-model="AttendanceVisible" destroy-on-close  style="width: 100%;height: 100%;margin: 0px;">
-			  <h1 style="margin: 0%;margin-bottom: 10px;">新增</h1>
+	<div>
+	  <layout>
+		  <layout-content >
+		  <el-main>
+			<div class="gva-table-box">
+				<h1 style="margin: 0%;margin-bottom: 10px;">裁切完工报工</h1>
 		      <el-row :gutter="24" style="margin-bottom: 20px;">
 		          <el-input v-model="add_searchInfo" placeholder="扫描订单二维码获取订单信息" 
 			  				  @keyup.enter="add_onSubmit"
@@ -157,33 +13,10 @@
 			  				  </el-input>
 			      <el-button type="primary" icon="search" @click="add_onSubmit" style="margin: 5px;height: 50px;">查询</el-button>
 				  
-				  <el-form-item label="日期:" prop="deliveryDate" class="mab" label-width="100" style="font-size: 30px;margin: 10px;">
-				      <el-date-picker v-model="add_riqiformData['日期']" type="date" style="width: 150px;height: 40px;"/>
-				  </el-form-item>
-		      </el-row>
-		      
-		      <el-row :gutter="24" >
-		          <el-table ref="multipleTable" style="width: 100%;height: 40vh" tooltip-effect="dark"
-		                    :row-style="{ height: '50px' }" :header-cell-style="{ padding: '5px' }"
-		                    :cell-style="{ padding: '10px' }" :header-row-style="{ height: '20px' }"
-		                    :data="add_tableData" border row-key="ID"
-		                    size="small" highlight-current-row="true" @row-dblclick="add_updateCompanyFunc"
-		                    @row-click="add_tableRowClick" :show-overflow-tooltip="true"
-		                    @selection-change="handleSelectionChange">
-						<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="生产款号" width="140"/>
-						<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="S" prop="S" width="140"/>
-						<el-table-column sortable align="left" label="M" prop="M" width="140"/>
-						<el-table-column sortable align="left" label="L" prop="L" width="140"/>
-						<el-table-column sortable align="left" label="XL" prop="XL" width="140"/>
-						<el-table-column sortable align="left" label="2XL" prop="2XL" width="140"/>
-		          </el-table>
+				  
 		      </el-row>
-		      
-		      <el-row :gutter="24">
+
+			  <el-row :gutter="24">
 		          <el-form-item label="尺码:" class="mab" prop="keyOrder" label-width="120" style="font-size: 30px;margin: 10px;">
 		              <el-input v-model="cmformdata.cm1" disabled style="width: 90px;height: 40px;"/>
 		              <el-input v-model="cmformdata.cm2" disabled style="width: 90px;height: 40px;"/>
@@ -193,7 +26,9 @@
 		              <el-input v-model="cmformdata.cm6" disabled style="width: 90px;height: 40px;"/>
 		              <el-input v-model="cmformdata.cm7" disabled style="width: 90px;height: 40px;"/>
 		              <el-input v-model="cmformdata.cm8" disabled style="width: 90px;height: 40px;"/>
-		              <el-input v-model="cmformdata.cm9" disabled style="width: 90px;height: 40px;"/>
+					  <el-input v-model="cmformdata.cm9" disabled style="width: 90px;height: 40px;"/>	
+		              <el-input v-model="cmformdata.cm10" disabled style="width: 90px;height: 40px;"/>
+					  <el-input v-model="cmformdata.cm11" disabled style="width: 90px;height: 40px;"/>
 		          </el-form-item>
 		      </el-row>
 		      
@@ -208,38 +43,69 @@
 		              <el-input v-model="zdsformdata.zds7" disabled style="width: 90px;height: 40px;" id="zds7"/>
 		              <el-input v-model="zdsformdata.zds8" disabled style="width: 90px;height: 40px;" id="zds8"/>
 		              <el-input v-model="zdsformdata.zds9" disabled style="width: 90px;height: 40px;" id="zds9"/>
+					  <el-input v-model="zdsformdata.zds10" disabled style="width: 90px;height: 40px;" id="zds10"/>
+					  <el-input v-model="zdsformdata.zdtotal" disabled style="width: 90px;height: 40px;" id="zds11"/>
 		          </el-form-item>
 		      </el-row>
 		      
 		      <el-row :gutter="24">
 		          <el-form-item label="实裁数" class="mab" prop="keyOrder" label-width="120" style="font-size: 30px;margin: 10px;">
-		              <el-input v-model="scsformdata.scs1" style="width: 90px;height: 40px;" id="scs1"/>
-		              <el-input v-model="scsformdata.scs2" style="width: 90px;height: 40px;" id="scs2"/>
-		              <el-input v-model="scsformdata.scs3" style="width: 90px;height: 40px;" id="scs3"/>
-		              <el-input v-model="scsformdata.scs4" style="width: 90px;height: 40px;" id="scs4"/>
-		              <el-input v-model="scsformdata.scs5" style="width: 90px;height: 40px;" id="scs5"/>
-		              <el-input v-model="scsformdata.scs6" style="width: 90px;height: 40px;" id="scs6"/>
-		              <el-input v-model="scsformdata.scs7" style="width: 90px;height: 40px;" id="scs7"/>
-		              <el-input v-model="scsformdata.scs8" style="width: 90px;height: 40px;" id="scs8"/>
-		              <el-input v-model="scsformdata.scs9" style="width: 90px;height: 40px;" id="scs9"/>
+		              <el-input  v-model="scsformdata.scs1" style="width: 90px;height: 40px;" id="scs1" @keydown="handleKeyDown($event, 'scs10', 'scs1', 'scs2')"/>
+		              <el-input  v-model="scsformdata.scs2" style="width: 90px;height: 40px;" id="scs2" @keydown="handleKeyDown($event, 'scs1', 'scs2', 'scs3')"/>
+		              <el-input  v-model="scsformdata.scs3" style="width: 90px;height: 40px;" id="scs3"/>
+		              <el-input  v-model="scsformdata.scs4" style="width: 90px;height: 40px;" id="scs4"/>
+		              <el-input  v-model="scsformdata.scs5" style="width: 90px;height: 40px;" id="scs5"/>
+		              <el-input  v-model="scsformdata.scs6" style="width: 90px;height: 40px;" id="scs6"/>
+		              <el-input  v-model="scsformdata.scs7" style="width: 90px;height: 40px;" id="scs7"/>
+		              <el-input  v-model="scsformdata.scs8" style="width: 90px;height: 40px;" id="scs8"/>
+		              <el-input  v-model="scsformdata.scs9" style="width: 90px;height: 40px;" id="scs9"/>
+					  <el-input  v-model="scsformdata.scs10" style="width: 90px;height: 40px;" id="scs10"/>
+					  <el-input  v-model="scsformdata.sctotal" disabled style="width: 90px;height: 40px;" id="sctotal"/>
 		          </el-form-item>
 		      </el-row>
-		      
-		      <template #footer>
-		          <div class="dialog-footer">
-		              <el-button @click="add_closeDialog"  style="width: 110px;height: 60px;font-size: 20px;">取消</el-button>
-		              <el-button type="primary" @click="add_Dialog"  style="width: 110px;height: 60px;font-size: 20px;">确认</el-button>
-		          </div>
-		      </template>
-		  </el-dialog>
 
-
-        </el-main>
-      </layout-content>
-      </layout>
-    </layout>
-  </div>
-</template>
+				<el-row :gutter="24" style="margin-bottom: 15px;">
+					<el-table ref="multipleTable" style="width: 100%;height: 43vh" tooltip-effect="dark"
+                      :row-style="{ height: '20px' }"  :header-cell-style="{ padding: '0px' }"
+                      :cell-style="{ padding: '0px' }" :header-row-style="{ height: '20px' }"
+                      :data="add_tableData"  border row-key="ID"
+                      size="small" 
+                      highlight-current-row="true" @row-dblclick="updateCompanyFunc"
+                      @row-click="tableRowClick" :show-overflow-tooltip="true"
+                      @selection-change="handleSelectionChange">
+			  <!-- <el-table-column type="selection" width="55" /> -->
+			  <el-table-column  sortable  align="center" 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="款式" width="110" />
+              <el-table-column  sortable  align="left" label="颜色" prop="颜色" width="80"  />
+              <el-table-column  sortable  align="left" label="制单总数" prop="制单总数" width="100" />
+              <el-table-column  sortable  align="left" label="实裁总数" prop="实裁总数" width="110" />
+              <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="90" />
+              <el-table-column  sortable  align="left" label="日期" prop="日期" width="120" />
+            </el-table>
+			</el-row>
+				<div class="dialog-footer" style="text-align: right;margin-right: 60px;">
+					<el-button type="primary" @click="add_Dialog"  style="width: 110px;height: 60px;font-size: 20px;">确认</el-button>
+				</div>
+			</div>
+  
+			  <!-- 是否订单尾包确认弹窗 -->
+			   <el-dialog v-model="DialogVisible" title="是否订单尾包" destroy-on-close width="30%" style="top: 20%;">
+				  <h3>请再次确认是否该订单产品已全部报工，该批为订单尾包？</h3>
+				 <div class="dialog-footer" style="text-align: right;">
+					 <el-button @click="confirmDialogVisible">取消</el-button>
+					 <el-button type="primary" @click="handleConfirm">确认</el-button>
+				 </div>
+			   </el-dialog>
+  
+		  </el-main>
+		</layout-content>
+	  </layout>
+	</div>
+  </template>
 <script>
 export default {
   data() {
@@ -250,7 +116,7 @@ export default {
       },
       rule: {} // 初始化rule对象
     };
-  },
+  }, 
   methods: {
     handleKeyDown(event, currentId, prevId, nextId) {
       const currentElement = document.getElementById(currentId);
@@ -288,25 +154,7 @@ export default {
           break;
       }
     },
-    closeDialog() {
-      // 关闭对话框的逻辑
-      this.dialogFormVisible = false;
-    },
-    enterDialog() {
-      // 确定按钮的逻辑
-      // 在这里可以执行提交表单的逻辑
-    },
-    handleFileUpload(event) {
-      // 处理文件上传逻辑
-      const file = event.target.files[0];
-      console.log(file)
-      // 模拟上传并保存文件路径
-      // 在实际应用中，您需要将文件上传到服务器并保存路径
-      this.formDataTest.imageUrl = URL.createObjectURL(file);
-      // 手动触发Vue的更新
-      this.$forceUpdate();
-    }
-  }
+  },
 };
 </script>
 <script setup>
@@ -314,145 +162,12 @@ export default {
 import { Layout, LayoutSider, LayoutContent } from '@arco-design/web-vue';
 
 import {ref, reactive} from 'vue'
-import {getCustom, getDepartment, getProductData,getStaffInfo, getStaffList, ygjbzledit,clockUpdate} from '@/api/yunyin/yunying'
+import {getSpotList} from '@/api/mes/job'
 import {ElMessage} from "element-plus";
 defineOptions({name: 'Company'})
 
-// =========== 获取左侧树侧形结构 ===========
-const treeData = ref({})
-const DataListdata = async () => {
-  try {
-    const data = 
-    [
-      {label : '2024.7.16'},
-      {label : '2024.7.15'},
-      {label : '2024.7.14'},
-      {label : '2024.7.13'},
-      {label : '2024.7.12'},
-      {label : '2024.7.11'}
-    ];
-    treeData.value = data
-  } catch (error) {
-    console.error(error);
-  }
-};
-DataListdata();
-
-//点击左侧树形 获取右侧table列表
-const tableData = reactive([]);
-const _u8 = ref(null);  // U8系统的值
-const _mes = ref(null); // MES系统的值
-const handleNodeClick = async (node) => {
-  _getStaffList();  // 执行获取员工列表的函数
-};
-
-//点击管理中心 显示部门的全部数据
-const handleNodeExpand = async (node) => {
-  // _department_code.value = node['编号'];
-  searchInfo.value = '';
-  _getStaffList()
-}
-
-// =========== 搜索 ===========
-const searchInfo = ref('')
-const _department_code = ref(null)
-//点击【查询】按钮
-const onSubmit = () => {
-  _department_code.value = '';
-  if(searchInfo.value === ''){
-    tableData.length = 0;
-  }else{
-    _getStaffList();
-  }
-};
-
-//获取员工信息列表
-const _getStaffList = async ()=>{
-	console.log(123)
-    try {
-		const WorkListdata = [
-		    {
-		      '序号':'1',
-		      '订单子编号':'2408001-1',
-			  '订单号':'2408001',
-		      '生产款号':'2401-1622款',
-		      '款式':'连衣裙',
-		      '颜色':'红色',
-			  '制单总数':'90',
-			  '组别':'车缝1组',
-			  '排产单数':'50',
-			  '尺码':'32',
-			  '报工数量':'10',
-			  '是否尾包':'否',
-		      '工序':'仓库出库',
-		      '验片人':'xxx',
-		      '日期':'2024-07-16'
-		    },
-			{
-			  '序号':'2',
-			  '订单子编号':'2408001-2',
-			  '订单号':'2408001',
-			  '生产款号':'2402-1623款',
-			  '款式':'长袖',
-			  '颜色':'蓝色',
-			  '制单总数':'90',
-			  '组别':'车缝2组',
-			  '排产单数':'60',
-			  '尺码':'35',
-			  '报工数量':'58',
-			  '是否尾包':'否',
-			  '工序':'仓库出库',
-			  '验片人':'xxx',
-			  '日期':'2024-07-16'
-			},
-			{
-			  '序号':'3',
-			  '订单子编号':'2408002-2',
-			  '订单号':'2408002',
-			  '生产款号':'2403-1624款',
-			  '款式':'西服',
-			  '颜色':'白色',
-			  '制单总数':'90',
-			  '组别':'车缝3组',
-			  '排产单数':'60',
-			  '尺码':'35',
-			  '报工数量':'58',
-			  '是否尾包':'否',
-			  '工序':'仓库出库',
-			  '验片人':'xxx',
-			  '日期':'2024-07-16'
-			},
-			{
-			  '序号':'4',
-			  '订单子编号':'2408003-3',
-			  '订单号':'2408003',
-			  '生产款号':'2403-1625款',
-			  '款式':'裤子',
-			  '颜色':'黑色',
-			  '制单总数':'90',
-			  '组别':'车缝4组',
-			  '排产单数':'40',
-			  '尺码':'36',
-			  '报工数量':'37',
-			  '是否尾包':'是',
-			  '工序':'仓库出库',
-			  '验片人':'xxx',
-			  '日期':'2024-07-16'
-			},
-		    
-		];
-		console.log(WorkListdata)
-		tableData.splice(0,tableData.length,...WorkListdata);//表格数据
-		// total.value =WorkListdata.data.total;//共多少条
-  } catch (error) {
-    console.error(error);
-  }
-}
-
-// =========== 新增按钮 ===========
-const AttendanceVisible=ref(false)
-const add_tableData = reactive([]);
-// 获取当前日期
+//
+//全局调用获取当前日期
 const today = new Date();
 const year = today.getFullYear();
 const month = String(today.getMonth() + 1).padStart(2, '0'); // 月份从 0 开始，需要补零
@@ -461,217 +176,158 @@ const hours = String(today.getHours()).padStart(2, '0');
 const minutes = String(today.getMinutes()).padStart(2, '0');
 const seconds = String(today.getSeconds()).padStart(2, '0');
 const currentDate = `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+const currentDates = `${year}-${month}-${day}`;
+
 
+const add_searchInfo = ref('')
 //清空对象的属性值
 const gd_clearFormData = () => {
   Object.keys(add_formData).forEach(key => {
     add_formData[key] = '';
   });
 };
-//新增按钮
-const onAttendance = () => {
-    AttendanceVisible.value=true
-	add_riqiformData['日期'] = currentDate
-	setTimeout(() => {
-        const inputElement = document.querySelector('#searchInput');
-        if (inputElement) {
-            inputElement.focus();
-        }
-    }, 100); // 延迟100毫秒
-	gd_clearFormData();
-	add_searchInfo.value = ''
-	const WorkListdata = [];
-	add_tableData.splice(0,add_tableData.length,...WorkListdata);
-};
 // 尺码
 const cmformdata = reactive({
-  cm1:'S',
-  cm2:'M',
-  cm3:'L',
-  cm4:'XL',
-  cm5:'2XL',
+  cm1:'',
+  cm2:'',
+  cm3:'',
+  cm4:'',
+  cm5:'',
   cm6:'',
   cm7:'',
   cm8:'',
-  cm9:'合计',
+  cm9:'',
+  cm10:'',
+  cm11:'合计',
 });
 // 制单数
 const zdsformdata = reactive({
-  zds1:'10',
-  zds2:'10',
-  zds3:'10',
-  zds4:'10',
-  zds5:'10',
+  zds1:'',
+  zds2:'',
+  zds3:'',
+  zds4:'',
+  zds5:'',
   zds6:'',
   zds7:'',
   zds8:'',
-  zds9:'50',
+  zds9:'',
+  zds10:'',
+  zdtotal:'',
 });
 // 实裁数
 const scsformdata = reactive({
-  scs1:'10',
-  scs2:'10',
-  scs3:'10',
-  scs4:'10',
-  scs5:'10',
+  scs1:'',
+  scs2:'',
+  scs3:'',
+  scs4:'',
+  scs5:'',
   scs6:'',
   scs7:'',
   scs8:'',
-  scs9:'50',
+  scs9:'',
+  scs10:'',
+  sctotal:'',
 });
-const add_riqiformData = reactive({
-  日期: '',
-});
-// 新增确定
-const add_Dialog = () => {
-   
-};
-// 新增取消
-const add_closeDialog = () => {
-    AttendanceVisible.value = false
-};
+// const sctotal = async ()=>{
+// 	return [  
+//       scsformdata.scs1,  
+//       scsformdata.scs2,  
+//       scsformdata.scs3,  
+//       scsformdata.scs4,  
+//       scsformdata.scs5,  
+//       scsformdata.scs6,  
+//       scsformdata.scs7,  
+//       scsformdata.scs8,  
+//       scsformdata.scs9,  
+//     ].reduce((total, currentValue) => total + currentValue, 0);  
+// }
+const add_tableData = ref([]);
+const _order = ref('');
 
-// =========== 新增搜索 ===========
-const add_searchInfo = ref('')
 //点击【查询】按钮
 const add_onSubmit = async ()=>{
   if(add_searchInfo.value === '' || add_searchInfo.value === undefined){
-	const WorkListdata = [];
-	add_tableData.splice(0,add_tableData.length,...WorkListdata);
-    ElMessage({type: 'warning',message: '搜索内容不能为空' })
+    const WorkListdata = [];
+    add_tableData.splice(0,add_tableData.length,...WorkListdata);
+      ElMessage({type: 'warning',message: '搜索内容不能为空' })
   }else{
-	console.log(add_searchInfo.value)
-	if(add_searchInfo.value === '2408001'){
-		const WorkListdata = [
-		    {
-			  '订单子编号':'2408001-1',
-		      '订单号':'2408001',
-		      '生产款号':'2401-1622款',
-		      '款式':'连衣裙',
-			  '颜色':'红色',
-		      'S':'34',
-			  'M':'12',
-			  'L':'53',
-			  'XL':'44',
-			  '2XL':'15'
-		    },
-			{
-			  '订单子编号':'2408001-2',
-			  '订单号':'2408001',
-			  '生产款号':'2401-1623款',
-			  '款式':'长袖',
-			  '颜色':'蓝色',
-			  'S':'23',
-			  'M':'26',
-			  'L':'48',
-			  'XL':'67',
-			  '2XL':'12'
-			},
-		];
-		add_tableData.splice(0,add_tableData.length,...WorkListdata);//表格数据
-	}else if(add_searchInfo.value === '2408002'){
-		const WorkListdata = [
-		    {
-			  '订单子编号':'2408002-2',
-		      '订单号':'2408002',
-		      '生产款号':'2402-1624款',
-		      '款式':'西服',
-		      '颜色':'白色'
-		    },
-		];
-		add_tableData.splice(0,add_tableData.length,...WorkListdata);//表格数据
-	}else if(add_searchInfo.value === '2408003'){
-		const WorkListdata = [
-		    {
-			  '订单子编号':'2408003-3',
-		      '订单号':'2408003',
-		      '生产款号':'2403-1625款',
-		      '款式':'西服',
-		      '颜色':'白色'
-		    },
-		];
-		add_tableData.splice(0,add_tableData.length,...WorkListdata);//表格数据
-	}else if(add_searchInfo.value === '2408001-1'){
-		const WorkListdata = [
-		    {
-			  '订单子编号':'2408001-1',
-		      '订单号':'2408001',
-		      '生产款号':'2401-1622款',
-		      '款式':'连衣裙',
-			  '颜色':'红色',
-		      'S':'34',
-			  'M':'12',
-			  'L':'53',
-			  'XL':'44',
-			  '2XL':'15'
-		    },
-		];
-		add_tableData.splice(0,add_tableData.length,...WorkListdata);//表格数据
-	}else if(add_searchInfo.value === '2408001-2'){
-		const WorkListdata = [
-			{
-			  '订单子编号':'2408001-2',
-			  '订单号':'2408001',
-			  '生产款号':'2401-1623款',
-			  '款式':'长袖',
-			  '颜色':'蓝色',
-			  'S':'23',
-			  'M':'26',
-			  'L':'48',
-			  'XL':'67',
-			  '2XL':'12'
-			},
-		];
-		add_tableData.splice(0,add_tableData.length,...WorkListdata);//表格数据
+    const order =add_searchInfo.value;
+	_order.value =add_searchInfo.value;
+    const getSpotLists = await getSpotList({order:order,code:'裁切'});
+	console.log(getSpotLists)
+	add_tableData.value = getSpotLists.data.data;
+
+	const keys1 = ['cm1', 'cm2', 'cm3', 'cm4','cm5','cm6','cm7','cm8','cm9','cm10',];
+	const keys2 = ['zds1', 'zds2', 'zds3', 'zds4','zds5','zds6','zds7','zds8','zds9','zds10','zdtotal',];
+	if(order.includes('-')){
+		for (let key of keys1) {  
+			if (getSpotLists.data.list[0].hasOwnProperty(key)) { // 确保键存在于对象中  
+				cmformdata[key] = getSpotLists.data.list[0][key];  
+			}  
+		}  
+		for (let key of keys2) {  
+			if (getSpotLists.data.list[0].hasOwnProperty(key)) { // 确保键存在于对象中  
+				zdsformdata[key] = getSpotLists.data.list[0][key];  
+			}  
+		}  
+		setTimeout(() => {
+        const inputElement = document.getElementById('scs1');
+        if (inputElement) {
+            inputElement.focus();		
+        }
+    }, 100); // 延迟100毫秒
+	}else{
+		for (let key of keys1) {  
+			cmformdata[key] = '';  
+		}  
+		for (let key of keys2) {  
+			zdsformdata[key] = '';  
+		}   
 	}
-	setTimeout(() => {
-	    const inputElement = document.querySelector('#searchInput');
-	    if (inputElement) {
-	        inputElement.focus();
-	    }
-	}, 100); // 延迟100毫秒
-	add_searchInfo.value = ''
+    setTimeout(() => {
+        const inputElement = document.querySelector('#searchInput');
+        if (inputElement) {
+            inputElement.focus();
+        }
+    }, 100); // 延迟100毫秒
   }
 };
 
-
-// =========== 删除按钮 ===========
-const bgSelection = ref(null)
-const baogong_del = () => {
-	if(bgSelection.value === null || bgSelection.value === ''){
-		  ElMessage({type: 'warning',message: '请选择删除的数据' })
-	}else{
-		 console.log(bgSelection.value)
-	}
-}
-// 复选框
+//复选框选择
+const ckSelection = ref('')
 const handleSelectionChange = (selection, type) => {
   const ids = selection.map(item => {
-    return item.订单子编号
+    return item.子订单编号
   })
-  bgSelection.value = ids.join(',')
+  ckSelection.value = ids.join(',')
+  console.log(ckSelection.value)
 }
 
-// =========== 修改 ===========
-const dialogFormVisible = ref(false)
-const edit_formData = ref({})
-// 双击修改
-const updateCompanyFunc = async (row) => {
-	console.log(row)
-	dialogFormVisible.value = true;
-	Object.assign(edit_formData.value,row);
-  // let code = row['员工编号'];
-  // const getStaffInfo_data = await getStaffInfo({code:code});
-  // formDataTest.value = getStaffInfo_data.data;
-};
-// 弹窗修改确定
-const edit_Dialog = async () => {
-	_ygjbzledit();
-}
-
-// 弹窗修改关闭
-const edit_closeDialog = () => {
-	dialogFormVisible.value = false
+//确认出库按钮
+const add_Dialog = async ()=>{
+  if(_order.value === ''){
+    ElMessage({type: 'warning',message: '请扫描子订单后，再操作此功能'})
+  }else{
+    let params = {}
+    for (let i = 1; i <= 10; i++) {  
+    const key = `scs${i}`; // 动态构建键名  
+		if (scsformdata.hasOwnProperty(key)) { // 检查 scsformdata 是否包含该属性  
+			params[key] = scsformdata[key]; // 将属性复制到 params  
+		}  
+	}  
+	params.sctotal = scsformdata['sctotal'];
+    params.order = _order.value;
+    console.log(params)
+    // const ck_gettab = await getSpotTab(params);
+    // if (ck_gettab.code === 0) {
+    //   ElMessage({type: 'success',message: '出库成功'});
+    //     const getSpotToLists = await getSpotToList();
+    //     add_tableData.splice(0,add_tableData.length,...getSpotToLists.data.data);//表格数据
+    //     add_searchInfo.value = ''
+    // } else {
+    //   ElMessage({ type: 'error',message: '出库失败'})
+    // }
+  }
 }
 
 
@@ -692,114 +348,6 @@ const handleSizeChange = (val) => {
   pageSize.value = val;
   _getStaffList();
 };
-
-
-//修改
-const formDataTest = ref({})
-
-
-const Attendancevalue = ref({})
-//考勤建立弹窗确定
- const AttendanceDialog = async () => {
-  _clockUpdate()
- }
- //设置法定天数
- const _clockUpdate = async ()=>{
-   const formattedData = {
-    month:Attendancevalue.value['month'],
-	number:Attendancevalue.value['day'],
-	typeA:Attendancevalue.value['typeA'],
-	typeB:Attendancevalue.value['typeB'],
-	typeC:Attendancevalue.value['typeC'],
-	sys_id:'[1010/郑梅芳]'
-   };
-   console.log(formattedData)
-   const response = await clockUpdate(formattedData);
-   if (response.code === 0) {
-    	  ElMessage({
-    	    type: 'success',
-    	    message: '成功'
-    	  })
-		 AttendanceVisible.value=false
-    }else{
-   	   ElMessage({
-   	     type: 'error',
-   	     message: '失败'
-   	   })
-    }
- }
- //获取小时数
- const getdays = () => {
-	 console.log(Attendancevalue.value['day'])
- 	if(Attendancevalue.value['day']!=''){
-		Attendancevalue.value['typeA']=Attendancevalue.value['day']*7.5
-		Attendancevalue.value['typeB']=Attendancevalue.value['day']*8
-		Attendancevalue.value['typeC']=Attendancevalue.value['day']*8
-	}else{
-		ElMessage({
-		  type: 'error',
-		  message: '请输入法定天数'
-		})
-	}
- }
-// 修改关闭弹窗
-const closeDialog = () => {dialogFormVisible.value = false,AttendanceVisible.value=false}
-
-// 弹窗确定
-const enterDialog = async () => {
-	console.log(formDataTest.value['出生日期'])
-	if(formDataTest.value['出生日期'] === '' || formDataTest.value['出生日期'] === null){
-		ElMessage({
-		  type: 'error',
-		  message: '出生日期不能为空'
-		})
-		return false;
-	}
-	if(formDataTest.value['身份证号'] === '' || formDataTest.value['身份证号'] === null){
-		ElMessage({
-		  type: 'error',
-		  message: '身份证号不能为空'
-		})
-		return false;
-	}
-  _ygjbzledit();
-}
-//修改员工资料
-const _ygjbzledit = async ()=>{
-  const formattedData = {
-    '员工编号': formDataTest.value['员工编号'],
-    '员工姓名': formDataTest.value['员工姓名'],
-    '性别': formDataTest.value['性别'],
-    '出生日期': formDataTest.value['出生日期'],
-    '身份证号': formDataTest.value['身份证号'],
-    '职称职务': formDataTest.value['职称职务'],
-    '所在部门': formDataTest.value['所在部门'],
-    '聘用日期': formDataTest.value['聘用日期'],
-    '转正日期': formDataTest.value['转正日期'],
-    '扣减司龄': formDataTest.value['扣减司龄'] ? formDataTest.value['扣减司龄'] : '0',
-    '人员类别': formDataTest.value['人员类别'],
-    '人员性质': formDataTest.value['人员性质'],
-    '班次类型': formDataTest.value['班次类型'],
-    '薪酬核算分组': formDataTest.value['薪酬核算分组'],
-    '工资表类别': formDataTest.value['工资表类别'],
-    'U8在职': formDataTest.value['U8在职'],
-    '在职状态': formDataTest.value['在职状态'],
-    '部门编码': formDataTest.value['部门编码'],
-  };
-  try {
-    const ygjbzledit_eddt = await ygjbzledit(formattedData);
-    if (ygjbzledit_eddt .code === 0) {
-      dialogFormVisible.value = false;
-      ElMessage({type: 'success',message: '更新成功'})
-    } else {
-      console.log(ygjbzledit_eddt);
-      ElMessage({ type: 'error',message: '更新失败'})
-    }
-  } catch (error) {
-    console.error(error);
-  }
-}
-
 </script>
 
 <style scoped>

src/view/performance/chukubaogong.vue

@@ -3,341 +3,55 @@
     <layout>
       <layout-header>
         <div class="">
-          <!--          按钮部分-->
-          <el-form ref="elSearchFormRef"   class="demo-form-inline" :rules="searchRule" @keyup.enter="onSubmit">
-            <el-form-item>
-              <el-input v-model="searchInfo" placeholder="搜索" clearable style="width: 180px;"></el-input>
-              <el-button type="primary" icon="search" @click="onSubmit" 
-			  style="margin: 0px 5px 0px 0px;width: 80px;height:40px;border-radius: 5%;">查询</el-button>
-			  <el-button type="primary"  @click="onAttendance" 
-			  style="margin: 0px 5px 0px 0px;width: 80px;height:40px;border-radius: 5%;">新增</el-button>
-              <el-button type="primary"  @click="baogong_del" 
-			  style="margin: 0px 5px 0px 0px;width: 80px;height:40px;border-radius: 5%;float: right;background-color: red">删除</el-button>
-            </el-form-item>
-          </el-form>
+          <h1 style="margin: 0%;margin-bottom: 10px;">出库报工</h1>
+          <el-input v-model="add_searchInfo" placeholder="扫描订单二维码获取订单信息" 
+			  				  @keyup.enter="add_onSubmit"
+							  id="searchInput" 
+			  				  style="width: 270px;margin: 5px;height: 50px;">
+			  				  </el-input>
+			      <el-button type="primary" icon="search" @click="add_onSubmit" style="margin: 5px;height: 50px;">查询</el-button>
+            <!-- <el-date-picker v-model="add_riqiformData['日期']" type="date" style="width: 150px;height: 40px;"/> -->
+            <el-button type="primary" @click="add_Dialog" style="margin: 5px;height: 50px;">确认出库</el-button>
         </div>
       </layout-header>
-
       <layout>
-        <!--左侧树侧形结构-->
-        <layout-sider :resize-directions="['right']" :width="190" style="margin-right: 10px;">
-          <div class="JKWTree-tree" style="height: 200px">
-            <h3>出库报工</h3>
-            <el-tree :data="treeData" class="treecolor"   @node-click="handleNodeClick"></el-tree>
-          </div>
-        </layout-sider>
-
-        <!-- 右侧区域 -->
         <layout-content >
         <el-main>
           <div class="gva-table-box">
-            <!-- 表格数据 -->
            <el-table ref="multipleTable" style="width: 100%;height: 65vh" tooltip-effect="dark"
                       :row-style="{ height: '20px' }"  :header-cell-style="{ padding: '0px' }"
                       :cell-style="{ padding: '0px' }" :header-row-style="{ height: '20px' }"
-                      :data="tableData"  border row-key="ID"
+                      :data="add_tableData"  border row-key="ID"
                       size="small" 
-                      highlight-current-row="true" @row-dblclick="updateCompanyFunc"
-                      @row-click="tableRowClick" :show-overflow-tooltip="true"
+                      highlight-current-row="true"  @row-dblclick="add_updateCompanyFunc"
+                      @row-click="add_tableRowClick" :show-overflow-tooltip="true"
                       @selection-change="handleSelectionChange">
-			  <el-table-column type="selection" width="55" />
-              <el-table-column  sortable align="center" label="序号" prop="序号"  width="100" />
-1              <el-table-column  sortable  align="center" label="订单号" prop="订单号" width="150"/>
-              <el-table-column  sortable  align="left" label="生产款号" prop="生产款号" width="150" />
-              <el-table-column  sortable  align="left" label="款式" prop="款式" width="150" />
-              <el-table-column  sortable  align="left" label="颜色" prop="颜色" width="150"  />
-              <el-table-column  sortable  align="left" label="工序" prop="工序" width="150" />
+			        <el-table-column type="selection" width="80" />
+              <el-table-column  sortable  align="left" label="订单编号" prop="订单编号" width="300" />
+              <el-table-column  sortable  align="left" label="订单子编号" prop="子订单编号" width="300"/>
+              <el-table-column  sortable  align="left" label="生产款号" prop="生产款号" width="300" />
+              <el-table-column  sortable  align="left" label="款式" prop="款式" width="300" />
+              <el-table-column  sortable  align="left" label="颜色" prop="颜色" width="300"  />
+              <!-- <el-table-column  sortable  align="left" label="工序" prop="工序" width="150" />
               <el-table-column  sortable  align="left" label="面料出库人" prop="面料出库人" width="150" />
-              <el-table-column  sortable  align="left" label="日期" prop="日期" width="160" />
+              <el-table-column  sortable  align="left" label="日期" prop="日期" width="160" /> -->
             </el-table>
-            <!-- 分页 -->
-            <div class="gva-pagination">
-              <el-pagination layout="total" :current-page="page" :page-size="pageSize"
-               :total="total" @current-change="handleCurrentChange" @size-change="handleSizeChange" />
-<!--              <el-pagination layout="total, sizes, prev, pager, next, jumper" :current-page="page" :page-size="pageSize" :page-sizes="[10, 30, 50, 100]"-->
-<!--                             :total="total" @current-change="handleCurrentChange" @size-change="handleSizeChange" />-->
-            </div>
           </div>
-
-          <!-- 修改弹窗 -->
-			<el-dialog v-model="dialogFormVisible" :before-close="edit_closeDialog"  destroy-on-close style="width: 60%; height: 70%;">
-				<h1 style="margin: 0%;margin-bottom: 10px;">出库报工修改</h1>
-				<el-row :gutter="24"  style="margin-bottom: 20px;">
-					<el-col :span="10">
-						<el-form-item label="订单号:" prop="deliveryDate" class="mab" label-width="80px" style="font-size: 20px; margin: 10px;">
-							<el-input v-model="edit_formData['订单号']" style="width: 70%; height: 40px;" id="订单号:" />
-						</el-form-item>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="生产款号:" prop="deliveryDate" class="mab" label-width="120px" style="font-size: 20px; margin: 10px;">
-							<el-input v-model="edit_formData['生产款号']" style="width: 70%; height: 40px;" id="生产款号" />
-						</el-form-item>
-					</el-col>
-				</el-row>
-
-				<el-row :gutter="24"  style="margin-bottom: 20px;">
-					<el-col :span="10">
-						<el-form-item label="款式:" prop="deliveryDate" class="mab" label-width="80px" style="font-size: 20px; margin: 10px;">
-							<el-input v-model="edit_formData['款式']" style="width: 70%; height: 40px;" id="款式" />
-						</el-form-item>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="颜色:" prop="deliveryDate" class="mab" label-width="120px" style="font-size: 20px; margin: 10px;">
-							<el-input v-model="edit_formData['颜色']" style="width: 70%; height: 40px;" id="颜色" />
-						</el-form-item>
-					</el-col>
-				</el-row>
-
-				<el-row :gutter="24"  style="margin-bottom: 20px;">
-					<el-col :span="10">
-						<el-form-item label="工序:" prop="deliveryDate" class="mab" label-width="80px" style="font-size: 20px; margin: 10px;">
-							<el-input v-model="edit_formData['工序']" style="width: 70%; height: 40px;" id="工序" />
-						</el-form-item>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="面料出库人:" prop="deliveryDate" class="mab" label-width="120px" style="font-size: 20px; margin: 10px;">
-							<el-input v-model="edit_formData['面料出库人']" style="width: 70%; height: 40px;" id="面料出库人" />
-						</el-form-item>
-					</el-col>
-				</el-row>
-
-				<el-row :gutter="24"  style="margin-bottom: 20px;">
-					<el-col :span="10">
-						<el-form-item label="日期:" prop="deliveryDate" class="mab" label-width="80px" style="font-size: 20px; margin: 10px;">
-							<el-input v-model="edit_formData['日期']" style="width: 70%; height: 40px;" id="日期" />
-						</el-form-item>
-					</el-col>
-				</el-row>
-
-				<template #footer>
-					<div class="dialog-footer">
-						<el-button @click="edit_closeDialog"  style="width: 110px;height: 60px;font-size: 20px;">取消</el-button>
-						<el-button type="primary" @click="edit_Dialog"  style="width: 110px;height: 60px;font-size: 20px;">确认</el-button>
-					</div>
-				</template>
-			</el-dialog>
-
-
-		 <!-- 新增弹窗 -->
-		  <el-dialog v-model="AttendanceVisible"  destroy-on-close  style="width: 100%;height: 100%;margin: 0px;">
-			  <h1 style="margin: 0%;margin-bottom: 10px;">新增</h1>
-		      <el-row :gutter="24" style="margin-bottom: 20px;">
-		          <el-input v-model="add_searchInfo" placeholder="扫描订单二维码获取订单信息" 
-			  				  @keyup.enter="add_onSubmit"
-							  id="searchInput" 
-			  				  style="width: 270px;margin: 5px;height: 50px;">
-			  				  </el-input>
-			      <el-button type="primary" icon="search" @click="add_onSubmit" style="margin: 5px;height: 50px;">查询</el-button>
-				  
-				  <el-form-item label="日期:" prop="deliveryDate" class="mab" label-width="100" style="font-size: 30px;margin: 10px;">
-				      <el-date-picker v-model="add_riqiformData['日期']" type="date" style="width: 150px;height: 40px;"/>
-				  </el-form-item>
-				  
-		      </el-row>
-		      
-		      <el-row :gutter="24" style="margin-bottom: 50px;">
-		          <el-table ref="multipleTable" style="width: 100%;height: 54vh" tooltip-effect="dark"
-		                    :row-style="{ height: '50px' }" :header-cell-style="{ padding: '5px' }"
-		                    :cell-style="{ padding: '10px' }" :header-row-style="{ height: '20px' }"
-		                    :data="add_tableData" border row-key="ID"
-		                    size="small" highlight-current-row="true" @row-dblclick="add_updateCompanyFunc"
-		                    @row-click="add_tableRowClick" :show-overflow-tooltip="true"
-		                    @selection-change="handleSelectionChange">
-		              <el-table-column sortable align="left" label="订单号" prop="订单号" width="270"/>
-		              <el-table-column sortable align="left" label="生产款号" prop="生产款号" width="305"/>
-		              <el-table-column sortable align="left" label="款式" prop="款式" width="270"/>
-		              <el-table-column sortable align="left" label="颜色" prop="颜色" width="270"/>
-		          </el-table>
-		      </el-row>
-		      <template #footer>
-		          <div class="dialog-footer">
-		              <el-button @click="add_closeDialog"  style="width: 110px;height: 60px;font-size: 20px;">取消</el-button>
-		              <el-button type="primary" @click="add_Dialog"  style="width: 110px;height: 60px;font-size: 20px;">确认出库</el-button>
-		          </div>
-		      </template>
-		  </el-dialog>
-
-
         </el-main>
       </layout-content>
       </layout>
     </layout>
   </div>
 </template>
-<script>
-export default {
-  data() {
-    return {
-      dialogFormVisible: false,
-      formDataTest: {
-        imageUrl: '' // 添加一个字段来保存上传的图片路径
-      },
-      rule: {} // 初始化rule对象
-    };
-  },
-  methods: {
-    handleKeyDown(event, currentId, prevId, nextId) {
-      const currentElement = document.getElementById(currentId);
-      const isEmpty = currentElement.value === '';
-      const atStart = currentElement.selectionStart === 0;
-      const atEnd = currentElement.selectionStart === currentElement.value.length;
-      switch (event.keyCode) {
-        case 13: // Enter
-        case 40: // 向下箭头
-          if (nextId) {
-            document.getElementById(nextId).focus();
-          }
-          break;
-        case 38: // 向上箭头
-          if (prevId) {
-            document.getElementById(prevId).focus();
-          }
-          break;
-        case 8: // 删除键
-          if (prevId && (isEmpty || atStart)) {
-            document.getElementById(prevId).focus();
-          }
-          break;
-        case 37: // 向左箭头
-          if (prevId && atStart) {
-            document.getElementById(prevId).focus();
-          }
-          break;
-        case 39: // 向右箭头
-          if (nextId && atEnd) {
-            document.getElementById(nextId).focus();
-          }
-          break;
-        default:
-          break;
-      }
-    },
-    closeDialog() {
-      // 关闭对话框的逻辑
-      this.dialogFormVisible = false;
-    },
-    enterDialog() {
-      // 确定按钮的逻辑
-      // 在这里可以执行提交表单的逻辑
-    },
-    handleFileUpload(event) {
-      // 处理文件上传逻辑
-      const file = event.target.files[0];
-      console.log(file)
-      // 模拟上传并保存文件路径
-      // 在实际应用中，您需要将文件上传到服务器并保存路径
-      this.formDataTest.imageUrl = URL.createObjectURL(file);
-      // 手动触发Vue的更新
-      this.$forceUpdate();
-    }
-  }
-};
-</script>
 <script setup>
 // 全量引入格式化工具 请按需保留
 import { Layout, LayoutSider, LayoutContent } from '@arco-design/web-vue';
-
 import {ref, reactive} from 'vue'
-import {getCustom, getDepartment, getProductData,getStaffInfo, getStaffList, ygjbzledit,clockUpdate} from '@/api/yunyin/yunying'
+import {getSpotList,getSpotTab} from '@/api/mes/job'
 import {ElMessage} from "element-plus";
 defineOptions({name: 'Company'})
 
-// =========== 获取左侧树侧形结构 ===========
-const treeData = ref({})
-const DataListdata = async () => {
-  try {
-    const data = 
-    [
-      {label : '2024.7.16'},
-      {label : '2024.7.15'},
-      {label : '2024.7.14'},
-      {label : '2024.7.13'},
-      {label : '2024.7.12'},
-      {label : '2024.7.11'}
-    ];
-    treeData.value = data
-  } catch (error) {
-    console.error(error);
-  }
-};
-DataListdata();
-
-//点击左侧树形 获取右侧table列表
-const tableData = reactive([]);
-const _u8 = ref(null);  // U8系统的值
-const _mes = ref(null); // MES系统的值
-const handleNodeClick = async (node) => {
-  _getStaffList();  // 执行获取员工列表的函数
-};
-
-//点击管理中心 显示部门的全部数据
-const handleNodeExpand = async (node) => {
-  // _department_code.value = node['编号'];
-  searchInfo.value = '';
-  _getStaffList()
-}
-
-// =========== 搜索 ===========
-const searchInfo = ref('')
-const _department_code = ref(null)
-//点击【查询】按钮
-const onSubmit = () => {
-  _department_code.value = '';
-  if(searchInfo.value === ''){
-    tableData.length = 0;
-  }else{
-    _getStaffList();
-  }
-};
-
-//获取员工信息列表
-const _getStaffList = async ()=>{
-	console.log(123)
-    try {
-		const WorkListdata = [
-		    {
-		      '序号':'1',
-		      '订单号':'2408001',
-		      '生产款号':'2403-1622款',
-		      '款式':'连衣裙',
-		      '颜色':'红色',
-		      '工序':'仓库出库',
-		      '面料验片人':'xxx',
-		      '日期':'2024-07-16'
-		    },
-		    {
-		      '序号':'2',
-		      '订单号':'2408002',
-		      '生产款号':'2403-1622款',
-		      '款式':'裤子',
-		      '颜色':'蓝色',
-		      '工序':'仓库出库',
-		      '面料验片人':'xxx',
-		      '日期':'2024-07-16'
-		    },
-			{
-			  '序号':'3',
-			  '订单号':'2408003',
-			  '生产款号':'2403-1622款',
-			  '款式':'西服',
-			  '颜色':'黑色 ',
-			  '工序':'仓库出库',
-			  '面料验片人':'xxx',
-			  '日期':'2024-07-16'
-			},
-		];
-		console.log(WorkListdata)
-		tableData.splice(0,tableData.length,...WorkListdata);//表格数据
-		// total.value =WorkListdata.data.total;//共多少条
-  } catch (error) {
-    console.error(error);
-  }
-}
-
-// =========== 新增按钮 ===========
-const AttendanceVisible=ref(false)
-const add_tableData = reactive([]);
-// 获取当前日期
+//全局调用获取当前日期
 const today = new Date();
 const year = today.getFullYear();
 const month = String(today.getMonth() + 1).padStart(2, '0'); // 月份从 0 开始，需要补零
@@ -346,125 +60,66 @@ const hours = String(today.getHours()).padStart(2, '0');
 const minutes = String(today.getMinutes()).padStart(2, '0');
 const seconds = String(today.getSeconds()).padStart(2, '0');
 const currentDate = `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+const currentDates = `${year}-${month}-${day}`;
 
-//新增按钮
-const onAttendance = () => {
-    AttendanceVisible.value=true
-	setTimeout(() => {
-	    const inputElement = document.querySelector('#searchInput');
-	    if (inputElement) {
-	        inputElement.focus();
-	    }
-	}, 100); // 延迟100毫秒
-	add_riqiformData['日期'] = currentDate
-};
-const add_riqiformData = reactive({
-  日期: '',
-});
-// 新增确定
-const add_Dialog = () => {
-   AttendanceVisible.value = false
-};
-// 新增取消
-const add_closeDialog = () => {
-    AttendanceVisible.value = false
-};
 
-// =========== 新增搜索 ===========
 const add_searchInfo = ref('')
+const add_tableData = reactive([])
+
 //点击【查询】按钮
 const add_onSubmit = async ()=>{
-	
   if(add_searchInfo.value === '' || add_searchInfo.value === undefined){
-	const WorkListdata = [];
-	add_tableData.splice(0,add_tableData.length,...WorkListdata);
-    ElMessage({type: 'warning',message: '搜索内容不能为空' })
+    const WorkListdata = [];
+    add_tableData.splice(0,add_tableData.length,...WorkListdata);
+      ElMessage({type: 'warning',message: '搜索内容不能为空' })
   }else{
-	console.log(add_searchInfo.value)
-	if(add_searchInfo.value === '2408001'){
-		const WorkListdata = [
-		    {
-			  '订单子编号':'2408001-1',
-		      '订单号':'2408001',
-		      '生产款号':'2401-1622款',
-		      '款式':'连衣裙',
-		      '颜色':'红色'
-		    },
-			{
-			  '订单子编号':'2408001-2',
-			  '订单号':'2408001',
-			  '生产款号':'2401-1623款',
-			  '款式':'长袖',
-			  '颜色':'蓝色'
-			},
-		];
-		add_tableData.splice(0,add_tableData.length,...WorkListdata);//表格数据
-	}else if(add_searchInfo.value === '2408002'){
-		const WorkListdata = [
-		    {
-			  '订单子编号':'2408002-2',
-		      '订单号':'2408002',
-		      '生产款号':'2402-1624款',
-		      '款式':'西服',
-		      '颜色':'白色'
-		    },
-		];
-		add_tableData.splice(0,add_tableData.length,...WorkListdata);//表格数据
-	}else if(add_searchInfo.value === '2408003'){
-		const WorkListdata = [
-		    {
-			  '订单子编号':'2408003-3',
-		      '订单号':'2408003',
-		      '生产款号':'2403-1625款',
-		      '款式':'西服',
-		      '颜色':'白色'
-		    },
-		];
-		add_tableData.splice(0,add_tableData.length,...WorkListdata);//表格数据
-	}
-	add_searchInfo.value  = '';
-	setTimeout(() => {
-	    const inputElement = document.querySelector('#searchInput');
-	    if (inputElement) {
-	        inputElement.focus();
-	    }
-	}, 100); // 延迟100毫秒
+    const order =add_searchInfo.value;
+    const getSpotLists = await getSpotList({order:order,code:'出库'});
+    console.log(getSpotLists)
+    add_tableData.splice(0,add_tableData.length,...getSpotLists.data.data);//表格数据
+
+    // add_searchInfo.value  = '';
+    setTimeout(() => {
+        const inputElement = document.querySelector('#searchInput');
+        if (inputElement) {
+            inputElement.focus();
+        }
+    }, 100); // 延迟100毫秒
   }
 };
-// =========== 删除按钮 ===========
-const bgSelection = ref(null)
-const baogong_del = () => {
-	if(bgSelection.value === null || bgSelection.value === ''){
-		  ElMessage({type: 'warning',message: '请选择删除的数据' })
-	}else{
-		 console.log(bgSelection.value)
-	}
-}
-// 复选框
+
+//复选框选择
+const ckSelection = ref('')
 const handleSelectionChange = (selection, type) => {
   const ids = selection.map(item => {
-    return item.订单子编号
+    return item.子订单编号
   })
-  bgSelection.value = ids.join(',')
+  ckSelection.value = ids.join(',')
+  console.log(ckSelection.value)
+}
+
+//确认出库按钮
+const add_Dialog = async ()=>{
+  if(ckSelection.value === ''){
+    ElMessage({type: 'warning',message: '请勾选具体的出库订单后，再操作此功能'})
+  }else{
+    //复选框中子订单编号去重
+    let params = {}
+    params.order_id = ckSelection.value;
+    params.code_ck_rq = currentDates;
+    console.log(params)
+    const ck_gettab = await getSpotTab(params);
+    if (ck_gettab.code === 0) {
+      ElMessage({type: 'success',message: '出库成功'});
+        // const getSpotToLists = await getSpotToList();
+        // add_tableData.splice(0,add_tableData.length,...getSpotToLists.data.data);//表格数据
+        add_searchInfo.value = ''
+    } else {
+      ElMessage({ type: 'error',message: '出库失败'})
+    }
+  }
 }
 
-// =========== 修改 ===========
-const dialogFormVisible = ref(false)
-const edit_formData = ref({})
-// 双击修改
-const updateCompanyFunc = async (row) => {
-	console.log(row)
-	dialogFormVisible.value = true;
-	Object.assign(edit_formData.value,row);
-};
-// 修改确认
-const edit_Dialog = async (row) => {
-	dialogFormVisible.value = false;
-};
-// 修改取消
-const edit_closeDialog = async (row) => {
-	dialogFormVisible.value = false;
-};
 // =========== 分页 ===========
 // 分页相关的响应式变量
 const page = ref(1)
@@ -483,115 +138,7 @@ const handleSizeChange = (val) => {
   _getStaffList();
 };
 
-
-//修改
-const formDataTest = ref({})
-
-
-const Attendancevalue = ref({})
-//考勤建立弹窗确定
- const AttendanceDialog = async () => {
-  _clockUpdate()
- }
- //设置法定天数
- const _clockUpdate = async ()=>{
-   const formattedData = {
-    month:Attendancevalue.value['month'],
-	number:Attendancevalue.value['day'],
-	typeA:Attendancevalue.value['typeA'],
-	typeB:Attendancevalue.value['typeB'],
-	typeC:Attendancevalue.value['typeC'],
-	sys_id:'[1010/郑梅芳]'
-   };
-   console.log(formattedData)
-   const response = await clockUpdate(formattedData);
-   if (response.code === 0) {
-    	  ElMessage({
-    	    type: 'success',
-    	    message: '成功'
-    	  })
-		 AttendanceVisible.value=false
-    }else{
-   	   ElMessage({
-   	     type: 'error',
-   	     message: '失败'
-   	   })
-    }
- }
- //获取小时数
- const getdays = () => {
-	 console.log(Attendancevalue.value['day'])
- 	if(Attendancevalue.value['day']!=''){
-		Attendancevalue.value['typeA']=Attendancevalue.value['day']*7.5
-		Attendancevalue.value['typeB']=Attendancevalue.value['day']*8
-		Attendancevalue.value['typeC']=Attendancevalue.value['day']*8
-	}else{
-		ElMessage({
-		  type: 'error',
-		  message: '请输入法定天数'
-		})
-	}
- }
-// 修改关闭弹窗
-const closeDialog = () => {dialogFormVisible.value = false,AttendanceVisible.value=false}
-
-// 弹窗确定
-const enterDialog = async () => {
-	console.log(formDataTest.value['出生日期'])
-	if(formDataTest.value['出生日期'] === '' || formDataTest.value['出生日期'] === null){
-		ElMessage({
-		  type: 'error',
-		  message: '出生日期不能为空'
-		})
-		return false;
-	}
-	if(formDataTest.value['身份证号'] === '' || formDataTest.value['身份证号'] === null){
-		ElMessage({
-		  type: 'error',
-		  message: '身份证号不能为空'
-		})
-		return false;
-	}
-  _ygjbzledit();
-}
-//修改员工资料
-const _ygjbzledit = async ()=>{
-  const formattedData = {
-    '员工编号': formDataTest.value['员工编号'],
-    '员工姓名': formDataTest.value['员工姓名'],
-    '性别': formDataTest.value['性别'],
-    '出生日期': formDataTest.value['出生日期'],
-    '身份证号': formDataTest.value['身份证号'],
-    '职称职务': formDataTest.value['职称职务'],
-    '所在部门': formDataTest.value['所在部门'],
-    '聘用日期': formDataTest.value['聘用日期'],
-    '转正日期': formDataTest.value['转正日期'],
-    '扣减司龄': formDataTest.value['扣减司龄'] ? formDataTest.value['扣减司龄'] : '0',
-    '人员类别': formDataTest.value['人员类别'],
-    '人员性质': formDataTest.value['人员性质'],
-    '班次类型': formDataTest.value['班次类型'],
-    '薪酬核算分组': formDataTest.value['薪酬核算分组'],
-    '工资表类别': formDataTest.value['工资表类别'],
-    'U8在职': formDataTest.value['U8在职'],
-    '在职状态': formDataTest.value['在职状态'],
-    '部门编码': formDataTest.value['部门编码'],
-  };
-  try {
-    const ygjbzledit_eddt = await ygjbzledit(formattedData);
-    if (ygjbzledit_eddt .code === 0) {
-      dialogFormVisible.value = false;
-      ElMessage({type: 'success',message: '更新成功'})
-    } else {
-      console.log(ygjbzledit_eddt);
-      ElMessage({ type: 'error',message: '更新失败'})
-    }
-  } catch (error) {
-    console.error(error);
-  }
-}
-
 </script>
-
 <style scoped>
 .form-container {
   display: flex;
@@ -661,6 +208,18 @@ const _ygjbzledit = async ()=>{
 .el-table .warning-row {
   background: oldlace;
 }
+/* 表格复选框大小调整 */
+:deep(.el-checkbox.el-checkbox--small .el-checkbox__inner) {
+    width: 45px; /* 复选框宽度 */
+    height: 23px; /* 复选框高度 */
+}
+:deep(.el-checkbox.el-checkbox--small.is-checked .el-checkbox__inner::after) {
+    transform: scale(1.2) rotate(45deg); /* 调整选中后的对勾大小 */
+    top: 5%; /* 调整对勾位置 */
+    left: 40%; /* 调整对勾位置 */
+    width: 5px; /* 调整对勾宽度 */
+    height: 9px; /* 调整对勾高度 */
+}
 
 /* 选中某行时的背景色 */
 :deep(.el-table__body tr.current-row) > td {

src/view/yunyin/shengchanguanli/gongdanziliao.vue

@@ -407,39 +407,39 @@
                   <div style="display: flex; gap: 0px;">
                     <el-form-item label="上传图片:" prop="image" class="mab" label-width="100px">
                       <el-upload
-  action="#"
-  list-type="picture-card"
-  :auto-upload="false">
-    <i slot="default" class="el-icon-plus"></i>
-    <div slot="file" slot-scope="{file}">
-      <img
-        class="el-upload-list__item-thumbnail"
-        :src="file.url" alt=""
-      >
-      <span class="el-upload-list__item-actions">
-        <span
-          class="el-upload-list__item-preview"
-          @click="handlePictureCardPreview(file)"
-        >
-          <i class="el-icon-zoom-in"></i>
-        </span>
-        <span
-          v-if="!disabled"
-          class="el-upload-list__item-delete"
-          @click="handleDownload(file)"
-        >
-          <i class="el-icon-download"></i>
-        </span>
-        <span
-          v-if="!disabled"
-          class="el-upload-list__item-delete"
-          @click="handleRemove(file)"
-        >
-          <i class="el-icon-delete"></i>
-        </span>
-      </span>
-    </div>
-</el-upload>
+                        action="#"
+                        list-type="picture-card"
+                        :auto-upload="false">
+                          <i slot="default" class="el-icon-plus"></i>
+                          <div slot="file" slot-scope="{file}">
+                            <img
+                              class="el-upload-list__item-thumbnail"
+                              :src="file.url" alt=""
+                            >
+                            <span class="el-upload-list__item-actions">
+                              <span
+                                class="el-upload-list__item-preview"
+                                @click="handlePictureCardPreview(file)"
+                              >
+                                <i class="el-icon-zoom-in"></i>
+                              </span>
+                              <span
+                                v-if="!disabled"
+                                class="el-upload-list__item-delete"
+                                @click="handleDownload(file)"
+                              >
+                                <i class="el-icon-download"></i>
+                              </span>
+                              <span
+                                v-if="!disabled"
+                                class="el-upload-list__item-delete"
+                                @click="handleRemove(file)"
+                              >
+                                <i class="el-icon-delete"></i>
+                              </span>
+                            </span>
+                          </div>
+                      </el-upload>
                     </el-form-item>
                   </div>
                 </el-form>
@@ -452,8 +452,8 @@
               </el-dialog>
 
               <el-dialog :visible.sync="dialogVisible">
-  <img width="100%" :src="dialogImageUrl" alt="">
-</el-dialog>
+                <img width="100%" :src="dialogImageUrl" alt="">
+              </el-dialog>
             
 			<!-- 新增工序资料-->
 			<el-dialog v-model="visible" :before-close="()=> visible = false" style="width: 20%;margin: 10% auto" :title="'新增工序资料'" destroy-on-close>
@@ -635,17 +635,7 @@ import { Layout, LayoutSider, LayoutContent } from '@arco-design/web-vue';
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { ref, reactive, computed, nextTick, watch } from 'vue'
 import { useUserStore } from '@/pinia/modules/user'
-import { DataList,WorkList, gdzl_MachineList,PrintCodeList,getProductYjList, getProductZzList,
-  U8workOrder, ProcessDetailEdit, PrintedEdit, PrintJobOrder,WorkOrderAdd,PrintDetailAdd,
-  WorkOrderEdit, ReferenceWorkOrder,getOrderProcessLeft,ClientList,ProductCodeList,
-  editGyWaste, U8DataCorrection, AccountingParameterEdit,ProcessCopy,
-  ProductInformation, TestCoefficient, capacityList,getOrderProcessRight,
-  DataCorrection, U8Trial, ProcessFlow, AccountingParameter,setProductStatus,
-  getProduct, getProductGy, ProductInformationEdit, workOrderListDetail, editProduct, getOrderProcessCount, StatusEdit,
-  PrintDetailDel, ProcessDetailDel,WorkOrderDetailCope,getGdAnnexTable,WorkOrderData,WorkOrderDel,
-  gdAnnexAdd,
-  gdAnnexDel,
-} from "@/api/yunyin/yunying";
+
 import PrintPage from './components/print.vue'
 import AddGongYi from './components/addGongYi.vue'
 defineOptions({name: 'Company'})
@@ -654,13 +644,14 @@ const userStore = useUserStore()
 const _username = ref('')
 _username.value = userStore.userInfo.userName + '/' + userStore.userInfo.nickName
 
-// =========== 左侧树侧形结构 ===========
+// =========== 左侧树侧形结构 =========== 
 const treeData = ref({})
 const tableData = reactive([])
 const _Gd_khdh = ref(null)
 const DataListdata = async () => {
   try {
-    // const data = await Datalist();
+    // const dataa = await Datalist();
+    // console.log(dataa)
     const data = 
     [{
       label : '客户编号',
@@ -708,7 +699,7 @@ const handleNodeClick = async (node) => {
   }else{
     _Gd_khdh.value = 'J0031';
     _WorkList_page();
-  }
+  } 
 };