zck преди 1 година
родител
ревизия
1bcd4e2150

+ 2 - 2
src/view/performance/caiqiebaogong.vue

@@ -183,7 +183,7 @@ import PrintPage from '../yunyin/shengchanguanli/components/print.vue';
 defineOptions({name: 'Company'})
 const printPageRef = ref()
 
-const add_searchInfo = ref('DC2409007-01')
+const add_searchInfo = ref('')
 //全局接口接受的物理地址
 const Machine = '70-ED-A4-26-5F-32'
 //全局获取code,接口接收code
@@ -308,7 +308,7 @@ const add_onSubmit = async ()=>{
 	console.log(getSpotLists)
 	add_tableData.value = getSpotLists.data.data;
   _UniqId.value = getSpotLists.data.list[0].UniqId
-	const keys1 = ['cm1', 'cm2', 'cm3', 'cm4','cm5','cm6','cm7','cm8','cm9','cm10','cm11',];
+	const keys1 = ['cm1', 'cm2', 'cm3', 'cm4','cm5','cm6','cm7','cm8','cm9','cm10',];
 	const keys2 = ['cmsl1', 'cmsl2', 'cmsl3', 'cmsl4','cmsl5','cmsl6','cmsl7','cmsl8','cmsl9','cmsl10','zdtotal',];
 	if(order.includes('-')){
 		for (let key of keys1) {  

+ 2 - 2
src/view/performance/chafengbaogong.vue

@@ -104,7 +104,7 @@
 					<div @contextmenu.prevent>
 						<el-table  
 							ref="multipleTableRef"  
-							style="width: 74%; height: 40vh"  
+							style="width: 80%; height: 40vh"  
 							tooltip-effect="dark"  
 							:row-style="{ height: '40px' }"  
 							:header-cell-style="{ padding: '5px', fontSize: '20px' }"  
@@ -1031,7 +1031,7 @@ const add_printxp = () => {
 	margin: 0px !important;
   }
   .gva-table-box{
-	max-width: 1050px;
+	max-width: 1400px;
 	padding: 0px !important;
 	margin-left: -10px !important;
   }

+ 3 - 3
src/view/performance/chukubaogong.vue

@@ -10,8 +10,9 @@
 								  id="searchInput" 
 				  			  style="width: 220px;height: 50px;margin-left: 10px;">
 				  			  </el-input>
-				  <el-button type="primary" icon="search" @click="add_onSubmit" style="height: 50px;">查询</el-button>
-				  <el-button type="primary" icon="" @click="Restore_onSubmit" style="height: 50px;">恢复未出库</el-button>
+				  <el-button type="primary" icon="search" @click="add_onSubmit" style="height: 50px;font-size: 20px;">查询</el-button>
+				  <el-button type="primary" icon="" @click="Restore_onSubmit" style="height: 50px;font-size: 20px;">恢复未出库</el-button>
+				  <el-button type="primary" icon="" @click="add_Dialog" style="height: 50px;font-size: 20px;">确认出库</el-button>
 			</el-row>
 		</div>
       <!-- </layout-header> -->
@@ -36,7 +37,6 @@
 			  <el-table-column  sortable  align="left" label="是否出库" prop="是否出库" width="120"/>
             </el-table>
             <div class="dialog-footer" style="text-align: left;margin-right: 60px;">
-				<el-button type="primary" @click="add_Dialog" style="width: 110px;height: 60px;font-size: 20px;display: none;">确认出库</el-button>
 			</div>
           </div>
       </layout-content>

+ 246 - 0
src/view/performance/lingliaobaogong.vue

@@ -0,0 +1,246 @@
+<template>
+    <div>
+      <layout>
+        <!-- <layout-header> -->
+          <div class="gva-table-box">
+              <h1 style="margin: 0%;margin-bottom: 6px;">领料报工</h1>
+              <el-row :gutter="24" style="margin-bottom: 6px;">
+                    <el-input v-model="add_searchInfo" placeholder="请扫描子订单编号"
+                                  @keyup.enter="add_onSubmit"
+                                  id="searchInput" 
+                                  style="width: 220px;height: 50px;margin-left: 10px;">
+                                  </el-input>
+                    <el-button type="primary" icon="search" @click="add_onSubmit" style="height: 50px;">领料报工</el-button>
+                    <el-form-item label="机台号:" prop="jitaihao" class="mab" style="font-size: 30px;margin: 10px;" label-width="116px">
+					    <el-input v-model="add_formData['机台号']" readonly style="width: 100px; height: 40px;" id="jitaihao" />
+					</el-form-item>
+					<el-form-item label="工序:" prop="gongxu" class="mab" style="font-size: 30px; margin: 10px;" label-width="81px">
+					    <el-input v-model="add_formData['工序']" readonly style="width: 100px; height: 40px;" id="gongxu" />
+					</el-form-item>
+					<el-form-item label="组别:" prop="zubie" class="mab" style="font-size: 30px; margin: 10px;" label-width="81px">
+					    <el-input v-model="add_formData['组别']" readonly style="width: 110px; height: 40px;" id="zubie" />
+					</el-form-item>
+					<el-form-item label="人员:" prop="renyuan" class="mab" style="font-size: 30px; margin: 10px;" label-width="81px">
+					    <el-input v-model="add_formData['人员']" readonly style="width: 110px; height: 40px;" id="renyuan" />
+					</el-form-item>
+              </el-row>
+          </div>
+       
+      </layout>
+    </div>
+  </template>
+  <script setup>
+  // 全量引入格式化工具 请按需保留
+  import { Layout, LayoutSider, LayoutContent } from '@arco-design/web-vue';
+  import {ref, reactive} from 'vue'
+  import {processAdd,getMachineMac} from '@/api/mes/job'
+  import {ElMessage} from "element-plus";
+  import { get } from 'scriptjs';
+  defineOptions({name: 'Company'})
+  import { useUserStore } from '@/pinia/modules/user'
+  
+  const userStore = useUserStore()
+  const _username = ref('')
+  _username.value = userStore.userInfo.userName + '/' + 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 _Machine = '68-ED-A4-26-60-84'
+  const _code = '车缝'
+  const _gx = '5'
+  const _gxmc = "车缝"
+
+  
+  const add_formData = reactive({
+	机台号: '',	
+	工序: '',
+	组别: '',
+	人员: '',	
+	尺码: '',
+	数量: '',
+	是否订单尾包: '',
+  });
+
+  //物理地址获取机台编号
+const getMachineMacdata = async () => {
+  try {
+    const data  = await getMachineMac({sys_sbID:_Machine,code:_code});
+    add_formData['机台号'] = data.data['机台号']
+    add_formData['工序'] = data.data['生产工序']
+    add_formData['组别'] = data.data['组别']
+    add_formData['人员'] = data.data['组长']
+    setTimeout(() => {
+          const inputElement = document.getElementById('searchInput');
+          if (inputElement) {
+            inputElement.focus();		
+          }
+        }, 100); // 延迟100毫秒
+  } catch (error) {
+    console.error(error)
+  }
+}
+getMachineMacdata();
+
+const add_searchInfo = ref('')//搜索
+
+//点击【查询】按钮
+const add_onSubmit = async ()=>{
+    setTimeout(() => {
+        const inputElement = document.querySelector('#searchInput');
+        if (inputElement) {
+            inputElement.focus();
+        }
+    }, 100); // 延迟100毫秒
+    
+  if(add_searchInfo.value === ''){
+    ElMessage({type: 'warning',message: '请扫描子订单编号' })
+  }else{
+    //领料
+    let llparams = {};
+    llparams.子订单编号 = add_searchInfo.value
+    llparams.班组 = add_formData['机台号']
+    llparams.订单编号 = add_searchInfo.value.split('-')[0]
+    llparams.Sys_id = _username.value
+    const processAdd_post = await processAdd(llparams);
+    console.log(processAdd_post)
+    if (processAdd_post.code === 0) {
+      add_searchInfo.value = ''
+
+      ElMessage({type: 'success',message: '领料成功'})
+    } else {
+      ElMessage({ type: 'error',message: '领料失败'})
+    }
+  }
+};
+
+  // =========== 分页 ===========
+  // 分页相关的响应式变量
+  const page = ref(1)
+  const total = ref(0)
+  const pageSize = ref(10)
+  // 分页
+  const handleCurrentChange = (val) => {
+    page.value = val;
+    _getStaffList();
+  };
+  
+  // 修改页面容量 点击多少条/页
+  const handleSizeChange = (val) => {
+    page.value = 10;//默认显示
+    pageSize.value = val;
+    _getStaffList();
+  };
+  
+  //根据出库状态文字颜色
+  const tableDataCellClass = ({row, column, rowIndex, columnIndex}) =>{
+    if(row['是否出库'] === '已出库'){
+      return 'status-plan-usage-low';
+    }
+    if(row['是否出库'] === '未出库'){
+      return 'statusy-plan-usage-low';
+    }
+  }
+  </script>
+  <style scoped>
+  /* 根据出库状态文字颜色 */
+  :deep(.status-plan-usage-low div) {
+    color: #8c939d  !important;
+  }
+  :deep(.statusy-plan-usage-low div) {
+    color: blue !important;
+  }
+  .form-container {
+    display: flex;
+    flex-wrap: wrap;
+  }
+  .form-column {
+    /*flex: 1;*/
+    margin-right: 15px; /* 调整列之间的间距 */
+  }
+  /* 左侧输入框宽度调整 */
+  .form-column .el-form-item .el-input {
+    width: 150px; /* 调整左侧输入框的宽度 */
+  }
+  /* 媒体查询,根据需要调整断点 */
+  @media screen and (max-width: 768px) {
+    .form-column {
+      flex: 1 0 100%; /* 在小屏幕下变成单列布局 */
+      margin-right: 0;
+    }
+  }
+  .JKWTree-container {
+    display: flex;
+  }
+  .JKWTree-tree {
+    /*width: 300px;*/
+    background-color: #fff;
+    padding: 10px;
+    margin-right: 20px;
+  }
+  .JKWTree-tree h3 {
+    font-size: 15px;
+    font-weight: 700;
+    margin: 10px 0;
+  }
+  .JKWTree-content {
+    flex: 1;
+  }
+  /* 表格复选框大小调整 */
+  :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 {
+    background: #ff80ff !important;
+  }
+  </style>
+  <style scoped>
+  :deep(.el-table td .cell) {
+    line-height: 20px !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;
+    margin-left: -10px !important;
+  }
+  .mab{
+    margin-bottom: 5px;
+  }
+  /* 搜索样式 */
+  ::v-deep .el-input__wrapper #searchInput {  
+    font-size: 16px; 
+  }  
+  </style>
+  

Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
src/view/yunyin/shengchanguanli/components/print.vue


+ 10 - 10
src/view/yunyin/shengchanguanli/gongdanziliao.vue

@@ -6,7 +6,7 @@
           <!--按钮部分-->
           <el-form ref="elSearchFormRef"  class="demo-form-inline"  >
             <el-form-item>
-              <el-input v-model="searchInfo"  placeholder="搜索订单号" style="width: 180px;" @keyup.enter="onSubmit()"></el-input>
+              <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" class="bt" icon="edit"  @click="jsfjClick">技术附件</el-button>
               <el-button type="primary" icon="edit"   @click="addgd_onclick"   class="bt"   title="新增工单资料">新增订单资料</el-button>
@@ -387,7 +387,7 @@
               </el-col>  
           </el-row>
 				<template #footer>
-					<div class="dialog-footer">
+					<div class="dialog-footer"style = "margin-top: 140px">
 						<el-button @click="ys_edit_closeDialog">取消</el-button>
 						<el-button type="primary" @click="ys_edit_Dialog">确认</el-button>
 					</div>
@@ -666,7 +666,7 @@
         </el-dialog>
             
         <!-- 新增工序资料-->
-        <el-dialog v-model="visible" :before-close="()=> visible = false" style="width: 20%;margin: 10% auto" :title="'新增工序资料'" destroy-on-close>
+        <el-dialog v-model="visible" :before-close="()=> visible = false" style="width: 25%;margin: 10% auto" :title="'新增工序资料'" destroy-on-close>
     <el-form>
       <div>
         <div style="display: flex; gap: 0px;">
@@ -674,43 +674,43 @@
         </div>
 
         <div style="display: flex; gap: 0px;">
-          <el-form-item label="仓库出库:"  class="mab" prop="isBanciSelected" label-width=" 100">
+          <el-form-item label="仓库出库:"  class="mab" prop="isBanciSelected" label-width="110">
         <el-checkbox v-model="form['仓库出库']"></el-checkbox>
           </el-form-item>
         </div>
 
         <div style="display: flex; gap: 0px;">
-          <el-form-item label="裁切:"  class="mab" prop="isBanciSelected" label-width=" 100">
+          <el-form-item label="裁切:"  class="mab" prop="isBanciSelected" label-width="110">
           <el-checkbox v-model="form['裁切']"></el-checkbox>
           </el-form-item>
         </div>
 
         <div style="display: flex; gap: 0px;">
-          <el-form-item label="车缝:"  class="mab" prop="isBanciSelected" label-width=" 100">
+          <el-form-item label="车缝:"  class="mab" prop="isBanciSelected" label-width="110">
           <el-checkbox v-model="form['车缝']"></el-checkbox>
           </el-form-item>
         </div>
 
         <div style="display: flex; gap: 0px;">
-          <el-form-item label="后道收样:"  class="mab" prop="isBanciSelected" label-width=" 100">
+          <el-form-item label="后道收样:"  class="mab" prop="isBanciSelected" label-width="110">
           <el-checkbox v-model="form['后道收样']"></el-checkbox>
           </el-form-item>
         </div>
 
         <div style="display: flex; gap: 0px;">
-          <el-form-item label="大烫:"  class="mab" prop="isBanciSelected" label-width=" 100">
+          <el-form-item label="大烫:"  class="mab" prop="isBanciSelected" label-width="110">
           <el-checkbox v-model="form['大烫']"></el-checkbox>
           </el-form-item>
         </div>
 
         <div style="display: flex; gap: 0px;">
-          <el-form-item label="总检:"  class="mab" prop="isBanciSelected" label-width=" 100">
+          <el-form-item label="总检:"  class="mab" prop="isBanciSelected" label-width="110">
           <el-checkbox v-model="form['总检']"></el-checkbox>
           </el-form-item>
         </div>
 
         <div style="display: flex; gap: 0px;">
-          <el-form-item label="包装:"  class="mab" prop="isBanciSelected" label-width=" 100">
+          <el-form-item label="包装:"  class="mab" prop="isBanciSelected" label-width="110">
           <el-checkbox v-model="form['包装']"></el-checkbox>
           </el-form-item>
         </div>

+ 1 - 1
src/view/yunyin/shengchanguanli/shengchanpaichan.vue

@@ -12,7 +12,7 @@
               <!-- <el-button type="primary" title="设置工单的状态--【计划中】 【生产中】 【已完成】" icon="edit" @click="onStatusClick" class="bt">工单状态设置</el-button> -->
 
               <div v-if="(currentNode == '计划中') && treeType === 'customTree'">
-                <el-button type="primary" title="排产" icon="edit" @click="ongxztgzClick" class="bt">排产</el-button>
+                <!-- <el-button type="primary" title="排产" icon="edit" @click="ongxztgzClick" class="bt">排产</el-button> -->
                 <!-- <el-button type="primary" title="修改" icon="edit" @click="pd_yysjcsonClick" class="bt">修改</el-button> -->
               </div> 
 

+ 2 - 2
src/view/yunyin/shengchanguanli/yangyipihe.vue

@@ -47,8 +47,8 @@
 						<el-table-column  sortable align="center" label="工单状态" prop="gd_statu"  width="120" />
 						<el-table-column  sortable align="center" label="船样描述" prop="船样描述"  width="200" />
 						<el-table-column  sortable align="center" label="船样合计" prop="船样合计"  width="120" />
-						<el-table-column  sortable align="center" label="要求" prop="要求"  width="120" />
-						<el-table-column  sortable align="center" label="箱唛要求" prop="箱唛要求"  width="120" />
+						<el-table-column  sortable align="center" label="要求" prop="要求"  width="420" />
+						<el-table-column  sortable align="center" label="箱唛要求" prop="箱唛要求"  width="510" />
 						<el-table-column  sortable align="center" label="粘衬" prop="粘衬"  width="120" />
 						<el-table-column  sortable align="center" label="订单数量" prop="订单数量"  width="120" />
 						<el-table-column  sortable align="center" label="单位" prop="单位"  width="120" />

Някои файлове не бяха показани, защото твърде много файлове са промени