Merge branch 'master' of https://git.7in6.com/Minong/mes-admin-backend-ui

src/api/yunyin/yunying.js

@@ -512,7 +512,7 @@ export const ProcessDetailAdd  = (data) => {
     return service({
         url: '/mes_server/work_order/ProcessDetailAdd',
         method: 'post',
-        params
+        data
     })
 }
 //新增工艺资料->印件编号获取

src/view/job/rewards/rewards.vue

@@ -59,6 +59,11 @@
                   icon="search"
                   @click="onSubmit"
                 >查询</el-button>
+				<el-button
+				 icon="refresh"
+				 type="primary"
+				 @click="onReset"
+				>切换显示方式</el-button>
 				<el-button
 				  type="primary"
 				  icon="search"
@@ -69,10 +74,7 @@
 				  icon="search"
 				  @click="onDel"
 				>删除</el-button>
-                <el-button
-                  icon="refresh"
-                  @click="onReset"
-                >切换显示方式</el-button>
+                
               </el-form-item>
             </el-form>
           </div>
@@ -1378,8 +1380,10 @@ const closeDialog = () => {
 const enterDialog = async() => {
 	if (type.value === 'update') {
 		  SubmitDailyProduction()
+		  
 	} else if (type.value === 'create') {
 		  add()   
+		  
 	}
 	// SubmitDailyProduction()
   // elFormRef.value?.validate(async(valid) => {
@@ -1483,8 +1487,8 @@ const enterDialog = async() => {
  	    type: 'success',
  	    message: '成功'
  	  })
-   }
-   detailShow.value = false
+	  dialogFormVisible.value = false
+   } 
    getTableData()
  }
  const add = async () => {
@@ -1560,8 +1564,9 @@ const enterDialog = async() => {
  	 	    type: 'success',
  	 	    message: '成功'
  	 	  })
+		  dialogFormVisible.value = false
  	}
- 	detailShow.value = false
+ 	
  	getTableData()
  }
 //键盘 input框跳转

src/view/layout/index.vue

@@ -16,13 +16,13 @@
           <img
             alt
             class="w-9 h-9 p-1 bg-white rounded-full"
-            :src="$GIN_VUE_ADMIN.appLogo"
+            :src="`/src/assets/logotx.png`"
           >
           <div
             v-if="isSider"
-            class="inline-flex font-bold text-2xl"
+            class="inline-flex font-bold text-1xl"
             :style="{color:textColor}"
-          >{{ $GIN_VUE_ADMIN.appName }}</div>
+          >翌星Mes生产管理智造系统</div>
         </div>
         <Aside class="aside" />
       </el-aside>
@@ -283,7 +283,7 @@ onMounted(() => {
   }
 })
 
-const userStore = useUserStore() 
+const userStore = useUserStore()
 // console.log(userStore.userInfo.authority.authorityName )
 // console.log(userStore.userInfo.nickName )
 const asideWidth = () => {

src/view/login/index.vue

@@ -1,3 +1,58 @@
+<!--修改登录页面样式-->
+<!--<template>-->
+<!--  <div id="userLayout" class="w-full h-full relative">-->
+
+<!--    &lt;!&ndash;    <div class="rounded-lg  items-center justify-evenly w-full h-full md:w-screen md:h-screen "&ndash;&gt;-->
+<!--    &lt;!&ndash;         style="background-image: url('/src/assets/yxlogo.png');">&ndash;&gt;-->
+
+<!--    <div class="rounded-lg  items-center justify-evenly w-full h-full md:w-screen md:h-screen md:bg-[#194bfb]">-->
+
+<!--      <div class="md:w-3/5 w-10/12 h-full flex items-center justify-evenly">-->
+<!--        &lt;!&ndash; 分割斜块 &ndash;&gt;-->
+<!--        <div class="z-[999] pt-12 pb-10 md:w-96 w-full rounded-lg flex flex-col justify-between box-border" >-->
+<!--          <div>-->
+<!--            &lt;!&ndash;LOGO&ndash;&gt;-->
+<!--            <div class="flex items-center justify-center" >-->
+<!--              <img class="w-48 h-16" :src="`/src/assets/yxlogo.png`" alt />-->
+<!--            </div>-->
+<!--            <div class="mb-9">-->
+<!--              <p class="text-center text-3xl font-bold">-->
+<!--                翌星Mes生产管理智造系统-->
+<!--              </p>-->
+<!--            </div>-->
+
+<!--            <el-form ref="loginForm" :model="loginFormData" :rules="rules"  :validate-on-rule-change="false" @keyup.enter="submitForm" >-->
+<!--              <el-form-item prop="username" class="mb-6">-->
+<!--                <el-input v-model="loginFormData.username" size="large" placeholder="请输入用户名" suffix-icon="user" />-->
+<!--              </el-form-item>-->
+<!--              <el-form-item prop="password" class="mb-6">-->
+<!--                <el-input v-model="loginFormData.password" show-password size="large" type="password" placeholder="请输入密码" />-->
+<!--              </el-form-item>-->
+<!--              <el-form-item v-if="loginFormData.openCaptcha" prop="captcha" class="mb-6" >-->
+<!--                <div class="flex w-full justify-between">-->
+<!--                  <el-input v-model="loginFormData.captcha" placeholder="请输入验证码" size="large" class="flex-1 mr-5" />-->
+<!--                  <div class="w-1/3 h-11 bg-[#c3d4f2] rounded">-->
+<!--                    <img v-if="picPath" class="w-full h-full" :src="picPath" alt="请输入验证码" @click="loginVerify()" />-->
+<!--                  </div>-->
+<!--                </div>-->
+<!--              </el-form-item>-->
+<!--              <el-form-item class="mb-6">-->
+<!--                <el-button class="shadow shadow-blue-600 h-11 w-full" type="primary" size="large" @click="submitForm" >登 录</el-button >-->
+<!--              </el-form-item>-->
+<!--            </el-form>-->
+
+<!--          </div>-->
+<!--        </div>-->
+<!--      </div>-->
+<!--      &lt;!&ndash;      <div class="hidden md:block w-1/2 h-full float-right bg-[#194bfb]">&ndash;&gt;-->
+<!--      &lt;!&ndash;                      <img class="h-full" src="@/assets/login_right_banner.jpg" alt="banner"/>&ndash;&gt;-->
+<!--      &lt;!&ndash;      </div>&ndash;&gt;-->
+<!--    </div>-->
+
+<!--  </div>-->
+<!--</template>-->
+
+
 <template>
   <div id="userLayout" class="w-full h-full relative">
     <div
@@ -12,15 +67,13 @@
           class="z-[999] pt-12 pb-10 md:w-96 w-full rounded-lg flex flex-col justify-between box-border"
         >
           <div>
-            <div class="flex items-center justify-center">
-              <img class="w-24" :src="$GIN_VUE_ADMIN.appLogo" alt />
+            <!--LOGO-->
+            <div class="flex items-center justify-center" >
+              <img class="w-48 h-16" :src="`/src/assets/yxlogo.png`" alt />
             </div>
             <div class="mb-9">
-              <p class="text-center text-4xl font-bold">
-                {{ $GIN_VUE_ADMIN.appName }}
-              </p>
-              <p class="text-center text-sm font-normal text-gray-500 mt-2.5">
-                A management platform using Golang and Vue
+              <p class="text-center text-3xl font-bold">
+                翌星Mes生产管理智造系统
               </p>
             </div>
             <el-form
@@ -244,7 +297,7 @@ const GetAddr = () => {
         }
         result += res.macAddress[i];
       }
-	   
+
     }
   };
   // 打开一个连接
@@ -259,7 +312,7 @@ const GetAddr = () => {
 // const GetMachineMac = async (addr) => {
 // 	const response = await getMachineMac({ addr: '68-ED-A4-26-5F-37' });
 // 	console.log(response)
-// 	if (response.code === 0) {	
+// 	if (response.code === 0) {
 // 		cosole.log(response.data['设备编号'])
 // 		// userStore.LoginIn2({
 // 		//   username: response.data['设备编号'],
@@ -279,8 +332,8 @@ userStore.LoginIn2({
 	   password: "123456",
 	   captcha: "443188",
 	   captchaId: "0FZfnUtAOrdXvTETkJRc",
-	   openCaptcha: false,	   
-	 }); 	
+	   openCaptcha: false,
+	 });
 </script>
 
 

src/view/performance/09-workOrderVerification/index.vue

@@ -73,12 +73,12 @@
               >新增
               </el-button>
               <div style="margin-left: auto;">
-                <el-button
+                <!-- <el-button
                   type="primary"
                   :icon="Download"
 				  class="bt"
                   @click="exportExcel"
-                >导出到Excel</el-button>
+                >导出到Excel</el-button> -->
               </div>
             </div>
             <!-- 数据展示 -->

src/view/performance/14-overTimePayVerification/index.vue

@@ -53,18 +53,18 @@
                 @click="onSearch"
               >搜索
               </el-button>
-              <el-button
+              <!-- <el-button
                 type="primary"
                 :icon="Refresh"
               >重置
-              </el-button>
+              </el-button> -->
               <div style="margin-left: auto;">
-                <el-button
+                <!-- <el-button
                   type="primary"
                   :icon="Download"
                   @click="exportExcel"
                 >导出到Excel
-                </el-button>
+                </el-button> -->
               </div>
             </div>
             <!-- 上半数据展示 -->

src/view/performance/Manualdocuments.vue

@@ -38,7 +38,7 @@
               <el-input v-model="positionvalue" placeholder="输入工单编号或产品名称" style="width: 180px;" />
               <el-button type="primary" class="search" icon="search" @click="onSearch"></el-button>
 			  <el-button type="primary" class="bt" icon="plus" @click="onAdd">新增</el-button>
-			  <el-button type="primary" class="bt" icon="copy-document"  @click="onCountByGdbh">切换显示方式</el-button>
+			  <!-- <el-button type="primary" class="bt" icon="copy-document"  @click="onCountByGdbh">切换显示方式</el-button> -->
               <el-button type="primary" class="bt" icon="refresh"  @click="onRefresh">刷新质检系数</el-button>
               <el-button type="primary" class="bt" icon="delete" @click="onDel">删除</el-button>
               <div style="margin-left: auto;">
@@ -1722,7 +1722,13 @@ function doubleClick(row, column, event) {
 }
 // 单击表格操作
 function Click(row, column, event) {
-    lastCellValue= row['UniqId'];
+    lastCellValue= row['UniqId'];
+	console.log(row)
+	const parts = row['sczl_yjgx'].split('-')
+	ScrapFactor.yjno=parts[0]
+	ScrapFactor.gdbh=row['sczl_gdbh']
+	ScrapFactor.type=row['sczl_检验类别']
+	ScrapFactor.gxh=parts[1]
    console.log(lastCellValue)
 
 }

src/view/performance/Packagingoutput.vue

@@ -36,8 +36,7 @@
               <el-input v-model="positionvalue" placeholder="输入工单编号或产品名称" style="width: 180px;" />
               <el-button type="primary" class="search" icon="search" @click="onSearch"></el-button>
               <el-button type="primary" class="bt" icon="plus" @click="onAdd">新增</el-button>
-              <el-button type="primary" class="bt" icon="search" @click="positioningVisible">定位</el-button>
-              <el-button type="primary" class="bt" icon="refresh">重置</el-button>
+              <!-- <el-button type="primary" class="bt" icon="search" @click="positioningVisible">定位</el-button> -->
 			  <el-button type="primary" class="bt" icon="delete" @click="Del">删除</el-button>
               <div style="margin-left: auto;">
                 <el-button type="primary" :icon="Download" @click="exportExcel">导出到Excel</el-button>

src/view/performance/chejianbaogong.vue

@@ -2,16 +2,16 @@
   <div>
 	<header>
 		<div style="height: 50px;">
-			<el-button type="primary" size="large" @click="onBZ" >班组维护</el-button>
-			<el-button type="primary" size="large" @click="onchanliang"  v-if="zdtreeType === true" >日产量上报</el-button>
-			<el-button type="primary" size="large" @click="onOver" >完工</el-button>
-			<el-button type="primary" size="large" @click="onzhicheng"  >制程检验</el-button>
-			<el-button type="primary" size="large" @click="ondianjian"  >设备点检</el-button>
-			<el-button type="primary" size="large" @click="onxuncha" >管理巡查</el-button>
-			<el-button type="primary" size="large" @click="onstatus" >设置机台状态</el-button>
-			<el-button type="primary" size="large" @click="onyinban">印版领退</el-button>
-			<el-button type="primary" size="large" @click="onClear" >换型清场</el-button>
-			<el-button type="primary" size="large" @click="oncomplaints" >客诉记录</el-button>
+			<el-button type="primary" size="large"class="bt" @click="onBZ" >班组维护</el-button>
+			<el-button type="primary" size="large"class="bt" @click="onchanliang"  v-if="zdtreeType === true" >日产量上报</el-button>
+			<el-button type="primary" size="large"class="bt" @click="onOver" >完工</el-button>
+			<el-button type="primary" size="large"class="bt" @click="onzhicheng"  >制程检验</el-button>
+			<el-button type="primary" size="large"class="bt" @click="ondianjian"  >设备点检</el-button>
+			<el-button type="primary" size="large"class="bt" @click="onxuncha" >管理巡查</el-button>
+			<el-button type="primary" size="large"class="bt" @click="onstatus" >设置机台状态</el-button>
+			<el-button type="primary" size="large"class="bt" @click="onyinban">印版领退</el-button>
+			<el-button type="primary" size="large"class="bt" @click="onClear" >换型清场</el-button>
+			<el-button type="primary" size="large"class="bt" @click="oncomplaints" >客诉记录</el-button>
 
 		</div>
 		</header>
@@ -59,7 +59,7 @@
               </el-row>
 						  <el-row :gutter="20">
 							<el-col :span="6">
-							 <el-form-item label="印件编号" prop="id">
+							 <el-form-item label="印件编号" style="font-size: 1.5vh;" prop="id">
 							   <el-input v-model="formData.印件号"  placeholder="" />
 							 </el-form-item>
 							</el-col>
@@ -100,9 +100,10 @@
 	   row-key="ID"
 	   highlight-current-row="true"
 	   border
-     :row-style="{ height: '20px' }"
+	
+     :row-style="{ height: '20px'}"
      :cell-style="{ padding: '0px' }" :header-row-style="{ height: '20px' }"
-	   style="width:100%;height: 30vh;"
+	   style="width:100%;height: 30vh; "
 	   @row-dblclick="handleSelectClick"
 	 >
 	   <el-table-column
@@ -121,31 +122,30 @@
 </div>
           <div class="gva-table-box">
             <el-tabs v-model="activName" type="card" @tab-click="duohandleClick"   >
-                        <el-tab-pane label="设备作业清单"  @click="showTable('印件资料')"   name="first">
-<!--                          highlight-current-row="true"-->
-                          <el-table ref="multipleTable"
-                                    :show-overflow-tooltip="true"
-                                    :row-style="{ height: '20px' }"
-                                    :cell-style="{ padding: '0px' }" :header-row-style="{ height: '20px' }"
-                                    :header-cell-style="{ padding: '0px' }"
-                                    @row-click="yjupdateCompanyFunc"
-                                    :cell-class-name="sbzyqdplanUsageCellClass"
-                                    style="width: 100%;height: 330px" border tooltip-effect="dark" :data="sbzyData" row-key="ID" @selection-change="handleSelectionChange">
-            <!--                <el-table-column type="selection" width="55" />-->
-                            <el-table-column align="left" label="选择" prop="yj_yjno"  width="80"/>
-                            <el-table-column align="left" label="工单编号|质量信息" prop="工单编号|质量信息" width="180" />
-							<el-table-column align="left" label="印件资料" prop="印件资料" width="240" />
-                            <el-table-column align="left" label="工序名称" prop="工序名称" width="100" />
-                            <el-table-column align="left" label="计划产量/已完成" prop="计划产量/已完成" width="180"/>
-                            <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="100"/>
-                            <el-table-column align="left" label="计划生产时段" prop="计划生产时段" width="240" />
-                            <el-table-column align="left" label="排产备注" prop="排产备注" width="100" />
-                            <el-table-column align="left" label="产品名称" prop="产品名称" width="240" />
-                          </el-table>
+                        <el-tab-pane label="设备作业清单" @click="showTable('印件资料')" name="first" style="font-size: 14px;">
+                            <el-table ref="multipleTable"
+                                      :show-overflow-tooltip="true"
+                                      :row-style="{ height: '20px' }"
+                                      :cell-style="{ padding: '0px' }" :header-row-style="{ height: '20px' }"
+                                      :header-cell-style="{ padding: '0px' }"
+                                      @row-click="yjupdateCompanyFunc"
+                                      :cell-class-name="sbzyqdplanUsageCellClass"
+                                      style="width: 100%; height: 330px; font-size: 14px;" border tooltip-effect="dark" :data="sbzyData" row-key="ID" @selection-change="handleSelectionChange">
+                                <el-table-column align="left" label="选择" prop="yj_yjno" width="80"/>
+                                <el-table-column align="left" label="工单编号|质量信息" prop="工单编号|质量信息" width="180" />
+                                <el-table-column align="left" label="印件资料" prop="印件资料" width="240" />
+                                <el-table-column align="left" label="工序名称" prop="工序名称" width="100" />
+                                <el-table-column align="left" label="计划产量/已完成" prop="计划产量/已完成" width="180"/>
+                                <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="100"/>
+                                <el-table-column align="left" label="计划生产时段" prop="计划生产时段" width="240" />
+                                <el-table-column align="left" label="排产备注" prop="排产备注" width="100" />
+                                <el-table-column align="left" label="产品名称" prop="产品名称" width="240" />
+                            </el-table>
                         </el-tab-pane>
 
+
                         <el-tab-pane label="班组人员及分配比例" @click="showTable('工艺资料')" name="second">
                           <el-table ref="multipleTable"
                                     :show-overflow-tooltip="true"
@@ -321,7 +321,9 @@
           </el-tabs>
           </el-dialog>
 
-          <el-dialog v-model="detailShow" style="width: 105vh" lock-scroll :before-close="closeDetailShow" title="机台班组维护" destroy-on-close>
+          <el-dialog v-model="detailShow"
+		   fullscreen
+		   style="font-size: 50px;font-weight: bold;" lock-scroll :before-close="closeDetailShow" title="机台班组维护" destroy-on-close>
             <el-table ref="multipleTable"
                         :row-style="{ height: '20px' }"
                         :cell-style="{ padding: '0px' }" :header-row-style="{ height: '20px' }"
@@ -569,8 +571,8 @@
 			</div>
 			<div style="height: 17vh; width: 15vh;margin-top: 5vh;">
 				<el-button type="text"></el-button>
-				 <el-button style="margin-bottom: 1vh; width:10vh" @click="addBz" >新         增</el-button>
-				 <el-button  style="margin-bottom: 1vh;width:10vh" @click="selectBz" >更新当前班组</el-button>
+				 <el-button style="margin-bottom: 1vh; width:15vh;background-color:cornflowerblue;" @click="addBz" >新         增</el-button>
+				 <el-button  style="margin-bottom: 1vh;width:15vh;background-color:cornflowerblue;" @click="selectBz" >更新当前班组</el-button>
 <!--				 <el-button style="margin-bottom: 1vh;" @click="delBz" >删除当前班组</el-button>-->
 			</div>
 			</div>
@@ -579,7 +581,11 @@
 
 
 
-		<el-dialog v-model="complaintsShow" style="width: 100vh; height:78vh;" lock-scroll :before-close="closecomplaintsShow" title="产品客诉查询" destroy-on-close>
+		<el-dialog v-model="complaintsShow" 
+		fullscreen
+		style="font-size: 50px;font-weight: bold;"
+		lock-scroll :before-close="closecomplaintsShow" 
+		title="产品客诉查询" destroy-on-close>
 		  <el-table ref="multipleTable"
 		           :row-style="{ height: '20px' }"
 		           :cell-style="{ padding: '0px' }" :header-row-style="{ height: '20px' }"
@@ -686,8 +692,8 @@
 		  v-model="dianjianVisible"
 		  title="设备点检记录"
 		  destroy-on-close
-		  width="150vh"
-		  style="width: 100vh; height:78vh;"
+		  fullscreen
+		  style="font-size: 50px;font-weight: bold;"
 		>
 		  <el-row :gutter="24" style="margin-bottom: 0px;margin-top: 0px;">
 		    <el-col :span="4" style="margin-bottom: 0px;margin-top: 0px;">
@@ -721,7 +727,7 @@
 		        highlight-current-row="true"
 				:show-overflow-tooltip="true"
 		        border  @row-click="dianjianhandle"
-		        style="width:70vh; height:45vh; margin-top: 5px;"
+		        style="width:119vh; height:45vh; margin-top: 5px;"
 		        @row-dblclick="handleSelectClick"
 		        :row-class-name="rowClassName"
 		      >
@@ -767,7 +773,7 @@
 		        </el-table-column>
 		      </el-table>
 			  <el-row :gutter="24">
-			    <el-col :span="24">
+			    <el-col :span="17">
 			        <el-input v-model="pandingfangfa" style="margin-top=0px; height: 40px; margin-bottom: 0px;"   />
 			    </el-col>
 			  </el-row>
@@ -785,8 +791,8 @@
 		  v-model="zhichengVisible"
 		  title="制程检验记录"
 		  destroy-on-close
-		  width="160vh"
-		  style="width: 100vh; height:78vh;"
+		 fullscreen
+		 style="font-size: 50px;font-weight: bold;"
 		>
 		  <el-row :gutter="24" style="margin-top=0px; margin-bottom: 1px;">
 		    <el-col :span="5" style="margin-top=0px; margin-bottom: 0px;">
@@ -921,8 +927,8 @@
 		  v-model="huanxingVisible"
 		  title="换型清场"
 		  destroy-on-close
-		  width="145vh"
-		  style="width: 100vh; height:78vh;"
+		  fullscreen
+		  style="font-size: 50px;font-weight: bold;"
 		>
       <header>
         <div style="height: 50px;margin-left: 1vh;">
@@ -1220,8 +1226,8 @@
 		  v-model="yinbanVisible"
 		  title="印版领退"
 		  destroy-on-close
-		  width="130vh"
-		  style="width: 120vh; height:78vh;"
+		 fullscreen
+		 style="font-size: 50px;font-weight: bold;"
 		>
       <header>
         <div style="height: 50px;margin-left: 1vh;">
@@ -1262,9 +1268,9 @@
 		        :data="yinbanselectData"
 		        row-key="ID"
 		        highlight-current-row="true"
-				    :show-overflow-tooltip="true"
+				:show-overflow-tooltip="true"
 		        border  @row-click="dianjianhandle"
-		        style="width:90vh; height:50vh;"
+		        style="width:150vh; height:50vh;"
 		        @row-dblclick="handleSelectClick"
 		        :row-class-name="rowClassName"
             @selection-change="handleybSelectionChange"
@@ -1343,8 +1349,8 @@
 		  v-model="xunchaVisible"
 		  title="管理人员现场巡查记录"
 		  destroy-on-close
-		  width="162vh"
-		  style="width: 120vh; height:78vh;"
+		  fullscreen
+		  style="font-size: 50px;font-weight: bold;"
 		>
 		  <el-row :gutter="24" style="margin-top=0px; margin-bottom: 1px;">
 		    <el-col :span="4" style="margin-top=0px; margin-bottom: 0px;">
@@ -1420,10 +1426,10 @@
 		        row-key="ID"
 		        highlight-current-row="true"
 		        border  @row-click="dianjianhandle"
-		        style="width:90vh; height:42vh;"
+		        style="width:170vh; height:42vh;"
 		        @row-dblclick="handleSelectClick"
 		        :row-class-name="rowClassName"
-			    	:show-overflow-tooltip="true"
+			    :show-overflow-tooltip="true"
 		      >
 		        <el-table-column
 		          prop="工单编号"
@@ -1500,10 +1506,9 @@
 
 		<el-dialog
 		  v-model="chanliangVisible"
-		  title="日产量上报"
-		  destroy-on-close
-		  width="130vh"
-		  style="height: 110vh;"
+		  title="日产量上报"		  
+		  fullscreen
+		  style="font-size: 2vh;font-weight: bold;"
 		>
 		  <el-row :gutter="24" style="margin-top=0px; margin-bottom: 1px;">
 		          <el-col :span="4" style="margin-top=0px; margin-bottom: 1px;">
@@ -3136,6 +3141,7 @@ const yinbanNodeClick = (node, check, nodeData) => {
 };
 const onyinban = async() => {
 	const res = await facilityPrintGetTab({productCode:formData.value.productCode})
+	// const res = await facilityPrintGetTab({productCode:'104601001'})
 	if(res.code===0){
 		yinbantreeData.value=[{
 			label:'产品印版库',
@@ -3232,8 +3238,8 @@ function oncomplaints() {
 const Complaints = async() => {
 	complaintsData.value=[]
 	selectedRowData.value={}
-    // const res = await ComplaintRecord({productCode :formData.value.productCode})
-	const res = await ComplaintRecord({productCode :100601011})
+    const res = await ComplaintRecord({productCode :formData.value.productCode})
+	// const res = await ComplaintRecord({productCode :100601011})
     if (res.msg === '成功') {
 		complaintsData.value=res.data;
 		selectedRowData.value=complaintsData.value[0]
@@ -3599,7 +3605,7 @@ const ReportInfo = async () => {
       上机时间:formData.value.上机时间,
       装版总时长:0,
       定额代号:formData.value.定额代号,
-      sczl_jtbh: classInfo.sczl_jtbh.split('#')[0],
+      sczl_jtbh: JTMC,
       sczl_bzdh: classInfo.sczl_bzdh,
       sys_id: classInfo.sys_id,
       sys_rq: classInfo.sys_rq,
@@ -4718,6 +4724,14 @@ const bzryplanUsageCellClass = ({row, column, rowIndex, columnIndex}) =>{
      width:150px;
      text-align:center;
      background-color:white}
+	 .bt {
+	   height: 5vh;
+	   width: 14vh;
+	   font-size:2vh;
+	 }
+	  .gva-table-box{
+	   font-size: 15px;
+	}
 /* 选中某行时的背景色*/
 :deep(.el-table__body tr.current-row)>td {
   background: #ff80ff !important;

src/view/performance/jjgzzhys.vue

@@ -92,23 +92,51 @@ const jgzzhysProductValue = () => {
 };
 
 //考勤年月按钮 继续
+const kqny = ref('')
 const jjgzzhysclick = async () => {
+  // console.log(jjgzzhysformData.date)
+  var date = jjgzzhysformData.date;
+  var year = date.slice(0, 4);
+  var month = date.slice(4);
+
+  if (month < 1 || month > 12) {
+    ElMessage({type: 'warning',message: '月份必须在1到12月之间'})
+    return false;
+  } else {
+    if (month.length === 1) {
+      month = '0' + month;
+    }
+     kqny.value = year+month;
+  }
   // console.log(jjgzzhysformData.start_date)
   function formatDate(dateString) {
     if (dateString === null || dateString === '') {
       return '';
     }
-
     const formattedDate = new Date(dateString);
     const year = formattedDate.getFullYear();
     const month = String(formattedDate.getMonth() + 1).padStart(2, '0');
     const day = String(formattedDate.getDate()).padStart(2, '0');
-
     return `${year}-${month}-${day}`;
   }
+  var dateMonth = kqny.value.slice(-2); //获取月份
+  if (formatDate(jjgzzhysformData.start_date).slice(5, 7) !== dateMonth && formatDate(jjgzzhysformData.end_date).slice(5, 7) !== dateMonth) {
+    ElMessage({type: 'warning',message: '考勤月份和开始日期和结束日期的月份不一致'})
+    return false;
+  }
+  if (jjgzzhysformData.vacation_one_start && formatDate(jjgzzhysformData.vacation_one_start).slice(5, 7) !== dateMonth && jjgzzhysformData.vacation_one_end && formatDate(jjgzzhysformData.vacation_one_end).slice(5, 7) !== dateMonth) {
+    ElMessage({ type: 'warning', message: '考勤月份和法定假日1的月份不一致' });
+    return false;
+  }
+
+  if (jjgzzhysformData.vacation_two_start && formatDate(jjgzzhysformData.vacation_two_start).slice(5, 7) !== dateMonth && jjgzzhysformData.vacation_two_end && formatDate(jjgzzhysformData.vacation_two_end).slice(5, 7) !== dateMonth) {
+    ElMessage({ type: 'warning', message: '考勤月份和开法定假日2的月份不一致' });
+    return false;
+  }
+
   const formattedData = {
     sys_id: _username.value,
-    date: jjgzzhysformData.date,
+    date: kqny.value,
     start_date: formatDate(jjgzzhysformData.start_date),
     end_date: formatDate(jjgzzhysformData.end_date),
     vacation_one_start: formatDate(jjgzzhysformData.vacation_one_start),
@@ -116,8 +144,7 @@ const jjgzzhysclick = async () => {
     vacation_two_start: formatDate(jjgzzhysformData.vacation_two_start),
     vacation_two_end: formatDate(jjgzzhysformData.vacation_two_end)
   };
-  console.log(formattedData)
-  //目前没有接口，先不用调用
+  console.log(formattedData);
   const staffSalaryCount_add = await staffSalaryCount(formattedData);
   if (staffSalaryCount_add.code === 0) {
     ElMessage({type: 'success',message: '更新成功'})

src/view/yunyin/chanpinziliao/chanpinziliao.vue

@@ -620,12 +620,20 @@
               <el-table-column   sortable align="left" label="更新日期" prop="Mod_rq" width="160" />
             </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>-->
               <el-pagination
                   @size-change="handleSizeChange"
                   @current-change="handleCurrentChange"
                   :current-page="page"
                   :page-sizes="[10, 30, 50, 100]"
-                  :page-size="30"
                   layout="total, sizes, prev, pager, next, jumper"
                   :total="total">
               </el-pagination>
@@ -2497,6 +2505,7 @@ const _getProduct = async ()=>{
   params.custom_code = _custom_code.value;
   params.limit = pageSize.value;
   params.page = page.value;
+  console.log(params)
   try {
     const WorkListdata = await getProduct(params);
     console.log(WorkListdata.data.data)
@@ -2523,6 +2532,7 @@ const handleCurrentChange = (val) => {
 
 // 修改页面容量 点击多少条/页
 const handleSizeChange = (val) => {
+
   pageSize.value = val;
   _getProduct();
 };

src/view/yunyin/renliziyuan/renyuanjibenziliao.vue

@@ -46,9 +46,9 @@
                       highlight-current-row="true" @row-dblclick="updateCompanyFunc"
                       @row-click="tableRowClick" :show-overflow-tooltip="true"
                       @selection-change="handleSelectionChange">
-              <el-table-column  sortable align="center" label="员工编号" prop="员工编号"  width="80" />
-              <el-table-column  sortable align="left" label="员工姓名" prop="员工姓名"  width="80"/>
-              <el-table-column  sortable  align="center" label="性别" prop="性别" width="45"/>
+              <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="center" label="性别" prop="性别" width="120"/>
               <el-table-column  sortable  align="left" label="聘用日期" prop="聘用日期" width="110" />
               <el-table-column  sortable  align="left" label="转正日期" prop="转正日期" width="110" />
               <el-table-column  sortable  align="left" label="所在部门" prop="所在部门" width="110"  />
@@ -56,13 +56,13 @@
               <el-table-column  sortable  align="left" label="身份证号" prop="身份证号" width="160" />
               <el-table-column  sortable  align="left" label="出生日期" prop="出生日期" width="110" />
               <el-table-column  sortable  align="left" label="人员性质" prop="人员性质" width="110" />
-              <el-table-column  sortable  align="left" label="人员类别" prop="人员类别" width="90" />
+              <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="160" />
-              <el-table-column  sortable  align="left" label="薪酬核算分组" prop="薪酬核算分组" width="110" />
-              <el-table-column  sortable  align="left" label="MES在职" prop="在职状态" width="80" />
-              <el-table-column  sortable  align="left" label="U8在职" prop="U8在职" width="80" />
-              <el-table-column  sortable  align="left" label="U8离职日期" prop="U8离职日期" width="110" />
+              <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="MES在职" prop="在职状态" width="120" />
+              <el-table-column  sortable  align="left" label="U8在职" prop="U8在职" width="120" />
+              <el-table-column  sortable  align="left" label="U8离职日期" prop="U8离职日期" width="120" />
               <el-table-column  sortable  align="left" label="创建用户" prop="sys_id" width="110" />
               <el-table-column  sortable  align="left" label="创建时间" prop="sys_rq" width="110" />
               <el-table-column  sortable  align="left" label="修改时间" prop="mod_rq" width="110" />

src/view/yunyin/shengchanguanli/components/addGongYi.vue

@@ -95,7 +95,7 @@
       <template #footer>
         <div class="dialog-footer" style="text-align: right;top: auto;">
           <el-button @click="add_gdgycloseDialog">取 消</el-button>
-          <el-button type="primary" disabled @click="add_gdgyenterDialog">确 定</el-button>
+          <el-button type="primary"  @click="add_gdgyenterDialog">确 定</el-button>
         </div>
       </template>
     </el-dialog>
@@ -137,7 +137,7 @@
 
 <script setup>
 import {ref, reactive} from 'vue'
-import {gdzl_MachineList, PrintDetailList, WastageList,getDepartName, capacityList,
+import {gdzl_MachineList, PrintDetailList, WastageList,getDepartName, capacityList,ProcessDetailAdd,
 } from "@/api/yunyin/yunying";
 import { ElMessage } from 'element-plus'
 
@@ -158,7 +158,10 @@ const cjList = ref([
   }
 ])
 const gdzl_MachineList_address = ref()
-
+import { useUserStore } from '@/pinia/modules/user'
+const userStore = useUserStore()
+const _username = ref('')
+_username.value = userStore.userInfo.userName + '/' + userStore.userInfo.nickName
 //新增工艺资料弹窗 键盘 input框跳转
 const add_gyzlent = async (event,id1,id2,id3) => {
   if (id2==='印件编号' && event.key==='Tab' || id2 === '印件编号' && event.key=== 'Enter') {
@@ -340,33 +343,43 @@ const add_gdgyenterDialog = async () => {
   if(!form['设备编号']){
     ElMessage({ type: 'warning', message: '设备编号不能为空' });return;
   }
-  console.log(form)
+  // console.log(form)
   sbbh.value = form['设备编号'].join(' ');
   const formattedData = {
     Gy0_gdbh: id.value,
+    Gy0_方案: 'A',
     Gy0_yjno: form['yjno'] ? form['yjno'] : "",
     Gy0_gxh: form['工序'] ? form['工序'] : "",
+    Gy0_gxmc:form['工艺名称'] ? form['工艺名称'] : "",
+    Add_gxmc:form['工序名称'] ? form['工序名称'] : "",
     重点工序: form['重点工序'] ? form['重点工序'] : "",
-    备选工序: form['备选工序'] ? form['备选工序'] : "",
+    备选工序: form['备选工序'] ? "1" : "0",
+    Gy0_sbbh: sbbh.value ? sbbh.value : "",
+    Gy0_sbmc: "",
+    Gy0_SITE: form['车间名称'] ? form['车间名称'] : "",
     Gy0_ks: form['开数'] ? form['开数'] : "",
     Gy0_ls: form['联数'] ? form['联数'] : "",
-    车间名称: form['车间名称'] ? form['车间名称'] : "",
-    工艺名称: form['工艺名称'] ? form['工艺名称'] : "",
-    工序名称: form['工序名称'] ? form['工序名称'] : "",
-    计损色数: form['计损色数'] ? form['计损色数'] : "",
-    设备编号: sbbh.value ? sbbh.value : "",
-    工序损耗: form['shdh'] ? form['shdh'] : "",
-    工序损耗名称: form['工序损耗名称'] ? form['工序损耗名称'] : "",
-    装版工时: form['装版工时'] ? form['装版工时'] : "",
-    小时产能: form['小时产能'] ? form['小时产能'] : "",
-    备注: form['备注'] ? form['备注'] : "",
+    Gy0_ms: form['计损色数'] ? form['计损色数'] : 0,
+    Sys_id  : _username.value,
+    工价系数: form['难度系数'] ? form['难度系数'] : 0,
+    损耗系数: form['损耗系数'] ? form['损耗系数'] : 0,
+    Gy0_shdh: form['shdh'] ? form['shdh'] : "",
+    Gy0_Rate1: "",
+    Gy0_辅助工时: form['装版工时'] ? form['装版工时'] : "",
+    Gy0_小时产能: form['小时产能'] ? form['小时产能'] : "",
+    工序备注: form['备注'] ? form['备注'] : "",
     质量要求: form['质量要求'] ? form['质量要求'] : "",
     质量隐患: form['质量隐患'] ? form['质量隐患'] : "",
   };
   console.log(formattedData)
-  // const ProcessDetailAdd_add = await ProcessDetailAdd(formattedData);
-  // console.log(ProcessDetailAdd_add)
-  // add_gdgydialogFormVisible.value = false
+  const ProcessDetailAdd_add = await ProcessDetailAdd(formattedData);
+  console.log(ProcessDetailAdd_add)
+  if (ProcessDetailAdd_add.code === 0) {
+    ElMessage({type: 'success', message: '新增成功'})
+    add_gdgydialogFormVisible.value = false
+  } else {
+    ElMessage({type: 'error',message: '新增失败'})
+  }
 }
 // 新增工艺资料取消
 const add_gdgycloseDialog = () => {

src/view/yunyin/shengchanguanli/gongdanziliao.vue

@@ -1241,8 +1241,9 @@
                 </div>
               </template>
             </el-dialog>
-		<!-- 技术附件 -->
-          <el-dialog v-model="jsfjdialogFormVisible" :before-close="jsfjcloseDialog" :title="产品技术附件资料" style="margin-top: 40px" height="500px" width="800px" destroy-on-close>
+
+            <!-- 技术附件 -->
+            <el-dialog v-model="jsfjdialogFormVisible" :before-close="jsfjcloseDialog" :title="产品技术附件资料" style="margin-top: 40px" height="500px" width="800px" destroy-on-close>
 			  <el-form :model="jsfjformdata" label-position="right" ref="elFormRef" :rules="rule" label-width="75px">
 				<el-row :gutter="24">
 					<el-col :span="6">
@@ -2905,7 +2906,8 @@ const _ProductInformationEdit = async ()=>{
     return false;
   }
   let params = {}
-  params.workorder = yycpzlformData['gdbh'];
+  // params.workorder = yycpzlformData['gdbh'];
+  params.workorder = _Gd_gdbh.value;
   params.productCode = yycpzlformData['cpdh'];
   params.option = yycpzlformData['fangan'];
   console.log(params)
@@ -2914,9 +2916,10 @@ const _ProductInformationEdit = async ()=>{
     if (ProductInformationEditdata.code === 0) {
       ElMessage({type: 'success', message: '更新成功'})
       onyycpzllist.value = false;
-    } else {
-      ElMessage({type: 'error',message: '更新失败'})
     }
+    // else {
+    //   ElMessage({type: 'error',message: '更新失败'})
+    // }
   } catch (error) {
     console.error(error);
   }
@@ -3002,13 +3005,27 @@ const _cha_WorkList = async (node) => {
     return false;
   }
   const search = searchInfo.value;
+  var regex = /^[a-zA-Z0-9]+$/;
   try {
-    const WorkListdata = await WorkList({ search:search,limit:1,page:1});//接口调用函数
-    if(WorkListdata.data.total === 0){
-      ElMessage({type: 'warning',message: '未搜索具体查询条件'})
+    if (regex.test(search)) {
+      // 符合条件，执行搜索操作
+      console.log('搜索内容为纯数字加字母');
+      const WorkListdata = await WorkList({search:search,limit:1,page:1});//接口调用函数
+      if(WorkListdata.data.total === 0){
+        ElMessage({type: 'warning',message: '未搜索具体查询条件'})
+      }
+      tableData.splice(0,tableData.length,...WorkListdata.data.data);//表格数据
+      total.value = WorkListdata.data.total;//共多少条
+    } else {
+      // 不符合条件，给出提示
+      console.log('搜索内容包含非字母和数字的字符');
+      const WorkListdata = await WorkList({Gd_khdh:'',search:search,limit:100,page:1});//接口调用函数
+      if(WorkListdata.data.total === 0){
+        ElMessage({type: 'warning',message: '未搜索具体查询条件'})
+      }
+      tableData.splice(0,tableData.length,...WorkListdata.data.data);//表格数据
+      total.value = WorkListdata.data.total;//共多少条
     }
-    tableData.splice(0,tableData.length,...WorkListdata.data.data);//表格数据
-    total.value = WorkListdata.data.total;//共多少条
   } catch (error) {
     console.error(error);
   }