first commit

src/api/mes_api_gty/myapi.js

@@ -1,110 +1,125 @@
 import service from '@/utils/request'
 
-// 包装计件单据维护
-// 侧边栏
-export const getPackingSideTable = (data) => {
-  return service({
-    url: '/mes_server/packaging_count_document/getTab',
-    method: 'get',
-    data
-  })
-}
-
-// 列表
-export const getPackingTable = (params) => {
-  return service({
-    url: '/mes_server/packaging_count_document/getList',
-    method: 'get',
-    params
-  })
-}
-
-// 定位
-export const getLocate = (params) => {
-  return service({
-    url: '/mes_server/packaging_count_document/locate',
-    method: 'get',
-    params
-  })
-}
-
-// 获取详细信息
-export const getInfo = (params) => {
-  return service({
-    url: '/mes_server/packaging_count_document/getInfo',
-    method: 'get',
-    params
-  })
-}
-
-// 查询印件工序及产品名称
-export const getGxMc = (params) => {
-  return service({
-    url: '/mes_server/packaging_count_document/getGxMc',
-    method: 'get',
-    params
-  })
-}
-
-// 查询员工名称
-export const getYg = (params) => {
-  return service({
-    url: '/mes_server/packaging_count_document/getYg',
-    method: 'get',
-    params
-  })
-}
-
-// 新增
-export const addPackingTable = (data) => {
-  return service({
-    url: '/mes_server/packaging_count_document/add',
-    method: 'post',
-    data
-  })
-}
-
-// 修改数据数据
-export const updatePackingTable = (data) => {
-  return service({
-    url: '/mes_server/packaging_count_document/edit',
-    method: 'post',
-    data
-  })
-}
-
-// 删除
-export const DeletePackingTable = (data) => {
-  return service({
-    url: '/mes_server/packaging_count_document/del',
-    method: 'post',
-    data
-  })
-}
-
-// 工单核验单侧边栏
-export const getOrderVerificationSideTable = (data) => {
-  return service({
-    url: '/mes_server/work_order_verification/getTab',
-    method: 'get',
-    data
-  })
-}
-
-// 工单核验单列表
-export const getOrderVerificationTable = (params) => {
-  return service({
-    url: '/mes_server/work_order_verification/getList',
-    method: 'get',
-    params
-  })
-}
-//定额代号
-export const  getDedh= (params) => {
-  return service({
-    url:'/mes_server/packaging_count_document/getDedh',
-    method: 'get',
-    params
-  })
-}
+//裁剪次品质量维护接口
+
+
+
+
+//服装半成品返工报工维护接口
+
+
+
+
+//服装按月质量超节损接口
+
+
+
+
+// // 包装计件单据维护
+// // 侧边栏
+// export const getPackingSideTable = (data) => {
+//   return service({
+//     url: '/mes_server/packaging_count_document/getTab',
+//     method: 'get',
+//     data
+//   })
+// }
+
+// // 列表
+// export const getPackingTable = (params) => {
+//   return service({
+//     url: '/mes_server/packaging_count_document/getList',
+//     method: 'get',
+//     params
+//   })
+// }
+
+// // 定位
+// export const getLocate = (params) => {
+//   return service({
+//     url: '/mes_server/packaging_count_document/locate',
+//     method: 'get',
+//     params
+//   })
+// }
+
+// // 获取详细信息
+// export const getInfo = (params) => {
+//   return service({
+//     url: '/mes_server/packaging_count_document/getInfo',
+//     method: 'get',
+//     params
+//   })
+// }
+
+// // 查询印件工序及产品名称
+// export const getGxMc = (params) => {
+//   return service({
+//     url: '/mes_server/packaging_count_document/getGxMc',
+//     method: 'get',
+//     params
+//   })
+// }
+
+// // 查询员工名称
+// export const getYg = (params) => {
+//   return service({
+//     url: '/mes_server/packaging_count_document/getYg',
+//     method: 'get',
+//     params
+//   })
+// }
+
+// // 新增
+// export const addPackingTable = (data) => {
+//   return service({
+//     url: '/mes_server/packaging_count_document/add',
+//     method: 'post',
+//     data
+//   })
+// }
+
+// // 修改数据数据
+// export const updatePackingTable = (data) => {
+//   return service({
+//     url: '/mes_server/packaging_count_document/edit',
+//     method: 'post',
+//     data
+//   })
+// }
+
+// // 删除
+// export const DeletePackingTable = (data) => {
+//   return service({
+//     url: '/mes_server/packaging_count_document/del',
+//     method: 'post',
+//     data
+//   })
+// }
+
+// // 工单核验单侧边栏
+// export const getOrderVerificationSideTable = (data) => {
+//   return service({
+//     url: '/mes_server/work_order_verification/getTab',
+//     method: 'get',
+//     data
+//   })
+// }
+
+// // 工单核验单列表
+// export const getOrderVerificationTable = (params) => {
+//   return service({
+//     url: '/mes_server/work_order_verification/getList',
+//     method: 'get',
+//     params
+//   })
+// }
+// //定额代号
+// export const  getDedh= (params) => {
+//   return service({
+//     url:'/mes_server/packaging_count_document/getDedh',
+//     method: 'get',
+//     params
+//   })
+// }
 

src/view/performance/QualityAssessment/excessive.vue

@@ -0,0 +1,228 @@
+<template>
+	<div>
+		<!--左侧树侧形结构-->
+		<el-container>
+			<layout-sider :resize-directions="['right']" :width="220" style="margin-right: 10px;">
+				<div class="JKWTree-tree" style="height: 70vh;">
+					<h3>服装按月质量超节损</h3>
+					<el-tree :data="treeData" highlight-current @node-click="handleNodeClick" />
+				</div>
+			</layout-sider>
+			<el-container>
+				
+				
+				<el-main>
+					<div class="gva-table-box">
+						<el-form>
+							<el-form-item>
+								<el-input v-model="searchInfo" placeholder="搜索" clearable style="width: 180px;" />
+								<el-button type="primary" icon="search" @click="onSubmit" title="搜索">查询</el-button>
+							<!-- 	<el-button type="primary" icon="edit" class="bt" @click="handleShowDetail">查改</el-button>
+								<el-button type="primary" icon="edit" class="bt" @click="handleShowAdd">新增</el-button>
+								<el-button type="primary" icon="delete" class="bt" @click="handleDelete">删除</el-button> -->
+							</el-form-item>
+						</el-form>
+						<el-table ref="multipleTable" style="width: 100%;height: 65vh"
+							:row-style="{ height: '20px' }" :header-cell-style="{ padding: '0px' }"
+							:cell-style="{ padding: '0px' }" :header-row-style="{ height: '20px' }"
+							border tooltip-effect="dark" :data="tableData" row-key="ID"
+							highlight-current-row="true"
+							:cell-class-name="tableDataCellClass"
+							@row-click="Clickonthetable" @row-dblclick="Doubleclickonthetable"
+							@selection-change="cjsSelectionChange" :show-overflow-tooltip="true">
+							<el-table-column align="center" type="selection" width="30"/>
+							<el-table-column align="left" sortable label="订单编号"  prop="订单编号" 	width="105" />
+							
+						  </el-table>
+						  <!-- 分页 -->
+						  <div class="gva-pagination">
+						  <el-pagination @size-change="handleSizeChange"  @current-change="handleCurrentChange"
+							  :current-page="page"
+							  :page-sizes="[10, 30, 50, 100]"
+							  :page-size="pageSize"
+							  layout="total, sizes, prev, pager, next, jumper" :total="total">
+						  </el-pagination>
+						</div>
+					</div>
+				</el-main>
+			</el-container>
+		</el-container>
+		
+		
+		<!-- 弹窗部分 -->
+		
+	</div>
+</template>
+
+<script>
+	
+</script>
+<script setup>
+import {Layout,LayoutContent,LayoutHeader,LayoutSider} from '@arco-design/web-vue'
+import {ElMessage,ElMessageBox,dayjs} from 'element-plus'
+import {reactive,ref,nextTick,onMounted} from 'vue'
+// import {} from '@/api/mes_api_gty/myapi'
+import {useUserStore} from '@/pinia/modules/user'
+defineOptions({name: '06PackingDocuments'})
+
+//获取登录用户信息
+const userStore = useUserStore()
+const _username = ref('')
+_username.value = userStore.userInfo.userName + '/' + userStore.userInfo.nickName
+console.log('用户名称：',userStore.userInfo.nickName)
+
+//全局获取当前日期
+const today = new Date();
+const year = today.getFullYear();
+const month = String(today.getMonth() + 1).padStart(2, '0'); // 月份从 0 开始，需要补零
+const day = String(today.getDate()).padStart(2, '0');
+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 treeData = ref([])
+// const defaultProps = {  
+//       children: 'children',  
+//       label: 'label'  
+//     }; 
+	 
+const Datalistdata = async () => {
+  try {
+    // const Datalists = await Datalist();
+	
+  } catch (error) {
+    console.error(error);
+  }
+};
+Datalistdata();
+
+//=========== 点击左侧树形获取数据 =========== 
+const handleNodeClick = async (node) => {
+	console.log(node)
+}
+
+//搜索框
+const searchInfo = ref('')
+
+//搜索按钮
+const onSubmit = async (row) => {
+	console.log("搜索按钮")
+}
+
+//表格
+const tableData = reactive([])
+
+//单击表格行
+const Clickonthetable = async (row) => {
+	console.log(row)
+}
+
+//双击表格行
+const Doubleclickonthetable = async (row) => {
+	console.log(row)
+}
+
+//复选框 表格
+const cjsSelectionChange = async (row) => {
+	console.log(row)
+}
+
+
+	
+//分页
+const total = ref(0)
+const page = ref(1)
+const limit = ref(10)
+const handleCurrentChange = (val) => {
+  page.value = val;
+  //调用接口↓↓↓↓
+  
+};
+
+// 修改页面容量 点击多少条/页
+const handleSizeChange = (val) => {
+  pageSize.value = val;
+  //调用接口↓↓↓↓
+  
+};
+
+	
+</script>
+
+<style scoped>
+:deep(.plan-usage-low div) {
+	color: red !important;
+}
+
+.JKWTree-container {
+	display: flex;
+}
+
+.JKWTree-tree {
+	width: 100%;
+	background-color: #fff;
+	/*background-color: rgba(241, 224, 224, 0.99);*/
+	padding: 10px;
+	margin-right: 20px;
+}
+
+.JKWTree-tree h3 {
+	font-size: 15px;
+	font-weight: 700;
+	margin: 10px 0;
+}
+
+.JKWTree-content {
+	flex: 1;
+}
+
+:deep(.el-table__body .warning-row) {
+	background: #FFFF80 !important;
+}
+
+/* 选中某行时的背景色 */
+:deep(.el-table__body tr.current-row)>td {
+	background: #ff80ff !important;
+}
+
+:deep(.el-table .bg-yellow) {
+	background: yellow;
+}
+</style>
+<style scoped>
+:deep(.el-table td .cell) {
+	line-height: 25px !important;
+}
+
+:deep(.el-tabs__header) {
+	margin-bottom: 0;
+}
+
+.search {
+	margin-left: 0px !important;
+	margin-right: 10px !important;
+}
+
+.bt {
+	margin-left: 2px !important;
+	padding: 3px !important;
+	font-size: 12px;
+
+}
+
+.el-tabs__header {
+	margin: 0px !important;
+}
+
+.gva-table-box {
+	padding: 0px !important;
+}
+
+.mab {
+	margin-bottom: 5px;
+}
+</style>

src/view/yunyin/shengchanguanli/gongdanziliao.vue

@@ -196,10 +196,10 @@
                   <el-table-column align="left" label="订单编号" prop="订单编号"  width="105"/>
                   <el-table-column align="left" label="物料名称" prop="物料名称"  width="170"/>
                   <el-table-column align="left" label="计划用料" prop="计划用料"  width="100" />
+                  <el-table-column align="left" label="计划门幅" prop="计划门幅"  width="100"/>
                   <el-table-column align="left" label="定额用料" prop="定额用料"  width="90"/>
-				  <el-table-column align="left" label="计划门幅" prop="计划门幅"  width="100"/>
-				  <el-table-column align="left" label="定额门幅" prop="定额门幅"  width="100"/>
-				  <el-table-column align="left" label="门封" prop="门封"  width="80"/>
+                  <el-table-column align="left" label="定额门幅" prop="定额门幅"  width="100"/>
+                  <el-table-column align="left" label="实际门幅" prop="实际门幅"  width="100"/>
 				  <el-table-column align="left" label="单位" prop="投料单位"  width="60"/>
 				  <el-table-column align="left" label="备注" prop="备注"  width="180"/>
 				  <el-table-column align="left" label="更新用户" prop="ID"  width="160"/>
@@ -221,12 +221,15 @@
                           style="width: 100%;height: 36vh" border tooltip-effect="dark" :data="mltableData" row-key="ID" @selection-change="handleSelectionChange">
 <!--                  <el-table-column type="selection" width="30" />-->
 				  <el-table-column type="selection" width="30" />
-                  <el-table-column align="left" label="订单编号" prop="订单编号"  width="105"/>
+                  <el-table-column align="left" label="物料编号" prop="物料编号"  width="105"/>
+				  <el-table-column align="left" label="材料分类" prop="材料分类"  width="100"/>
                   <el-table-column align="left" label="物料名称" prop="物料名称"  width="170"/>
+				  <el-table-column align="left" label="颜色" prop="颜色"  width="100"/>
                   <el-table-column align="left" label="计划用料" prop="计划用料"  width="100" />
-                  <el-table-column align="left" label="定额用料" prop="定额用料"  width="90"/>
 				  <el-table-column align="left" label="计划门幅" prop="计划门幅"  width="100"/>
+                  <el-table-column align="left" label="定额用料" prop="定额用料"  width="90"/>
 				  <el-table-column align="left" label="定额门幅" prop="定额门幅"  width="100"/>
+				  <el-table-column align="left" label="实际门幅" prop="实际门幅"  width="100"/>
                   <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="140"/>
@@ -354,9 +357,7 @@
       
 			
 			<!-- 新增订单资料弹窗 -->
-		<el-dialog v-model="add_gddialogFormVisible" :before-close="add_gdcloseDialog"
-		          title="新增订单资料" width="70%" top="3%" destroy-on-close>
-		  
+		<el-dialog v-model="add_gddialogFormVisible" :before-close="add_gdcloseDialog" title="新增订单资料" width="70%" top="2%" destroy-on-close>
 		  <div style="display: flex; justify-content: space-between;">
 		    <div style="flex: 2;">
 		      <el-form :model="add_gdscgdformData">
@@ -366,16 +367,12 @@
 		              <el-input v-model="add_gdscgdformData.订单编号" disabled />
 		            </el-form-item>
 		            <el-form-item label="生产款号" label-width="100px">
-		              <el-input
-		                v-model="add_gdscgdformData['生产款号']" id="生产款号"
-		                @keydown="add_gdzlent($event, '粘衬', '生产款号', '订单数量')" 
-		              />
+		              <el-input v-model="add_gdscgdformData['生产款号']" id="生产款号"
+		                @keydown="add_gdzlent($event, '粘衬', '生产款号', '订单数量')" />
 		            </el-form-item>
 		            <el-form-item label="款式" label-width="100px">
-		              <el-input
-		                v-model="add_gdscgdformData['款式']" id="款式"
-		                @keydown="add_gdzlent($event, '订单数量', '款式', '落货日期')"
-		              />
+		              <el-input v-model="add_gdscgdformData['款式']" id="款式"
+		                @keydown="add_gdzlent($event, '订单数量', '款式', '落货日期')" />
 		            </el-form-item>
 		          </div>
 		          <div style="flex: 1;">
@@ -384,15 +381,11 @@
 		            </el-form-item>
 		            <el-form-item label="订单数量" label-width="100px">
 		              <el-input v-model="add_gdscgdformData.订单数量" id="订单数量"
-		               @keydown="add_gdzlent($event, '生产款号', '订单数量', '款式')" 
-		              />
+		               @keydown="add_gdzlent($event, '生产款号', '订单数量', '款式')" />
 		            </el-form-item>
 		            <el-form-item label="落货日期" label-width="100px">
-		              <el-date-picker
-		                v-model="add_gdscgdformData['落货日期']" id="落货日期"
-		                type="date"
-		                @keydown="add_gdzlent($event, '款式', '落货日期', '面料')"
-		              />
+		              <el-date-picker  v-model="add_gdscgdformData['落货日期']" id="落货日期"
+		                type="date" @keydown="add_gdzlent($event, '款式', '落货日期', '面料')" />
 		            </el-form-item>
 		          </div>
 		        </div>
@@ -407,6 +400,37 @@
 		            @keydown="add_gdzlent($event, '落货日期', '面料', '箱唛要求')" 
 		          />
 		        </el-form-item>
+				
+				<el-form-item label="里料" label-width="100px">
+				  <el-input
+				    type="textarea"
+				    v-model="add_gdscgdformData['里料']" id="里料"
+				    rows="2"
+				    resize="none"
+				    @keydown="add_gdzlent($event, '', '里料', '')" 
+				  />
+				</el-form-item>
+				
+				<el-form-item label="袋布" label-width="100px">
+				  <el-input
+				    type="textarea"
+				    v-model="add_gdscgdformData['袋布']" id="袋布"
+				    rows="2"
+				    resize="none"
+				    @keydown="add_gdzlent($event, '', '袋布', '')" 
+				  />
+				</el-form-item>
+				
+				<el-form-item label="其他" label-width="100px">
+				  <el-input
+				    type="textarea"
+				    v-model="add_gdscgdformData['其他']" id="其他"
+				    rows="2"
+				    resize="none"
+				    @keydown="add_gdzlent($event, '', '其他', '')" 
+				  />
+				</el-form-item>
+				
 		
 		        <!-- 箱唛要求 -->
 		        <el-form-item label="箱唛要求" label-width="100px">
@@ -569,7 +593,7 @@
 		</el-dialog>
 		
 		<!-- 批量修改BOM资料弹窗 -->
-		<el-dialog v-model="res_bomdialogFormVisible" :before-close="res_bomcloseDialog" title="批量修改BOM资料" width="70%" top="1%" destroy-on-close>
+		<el-dialog v-model="res_bomdialogFormVisible" :before-close="res_bomcloseDialog" title="批量修改BOM资料" width="80%" top="1%" destroy-on-close>
 		  
 		   <el-descriptions class="margin-top" :column="4"  :size="size" border>
 			<el-descriptions-item label="订单编号" class="ddh">{{ ddhformData['ddh'] }}</el-descriptions-item>
@@ -2089,11 +2113,12 @@ const ddhformData = reactive({
 });
 const resbom_tableColumns = ref(
     [
-      { label: '物料名称', prop: '物料名称', width: '170' },
+      { label: '物料名称', prop: '物料名称', width: '130' },
       { label: '计划用料', prop: '计划用料', width: '130' },
+	  { label: '计划门幅', prop: '计划门幅', width: '130' },
 	  { label: '定额用料', prop: '定额用料', width: '130' },
-	  { label: '计划门幅', prop: '计划门幅', width: '170' },
-	  { label: '定额门幅', prop: '定额门幅', width: '170' },
+	  { label: '定额门幅', prop: '定额门幅', width: '130' },
+	  { label: '实际门幅', prop: '实际门幅', width: '130' },
 	  { label: '裁床实际用料', prop: '裁床实际用料', width: '130' },
 	  { label: '裁床领用面料', prop: '裁床领用面料', width: '130' },
 	  { label: '裁床退回仓库面料', prop: '裁床退回仓库面料', width: '170' },