Browse Source

生产管理

liuhairui 1 year ago
parent
commit
6f16ed2eb0

+ 1 - 1
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
     })
 }
 //新增工艺资料->印件编号获取

+ 64 - 11
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>
 
 

+ 1 - 1
src/view/performance/jjgzzhys.vue

@@ -144,7 +144,7 @@ const jjgzzhysclick = async () => {
     vacation_two_start: formatDate(jjgzzhysformData.vacation_two_start),
     vacation_two_end: formatDate(jjgzzhysformData.vacation_two_end)
   };
-
+  console.log(formattedData);
   const staffSalaryCount_add = await staffSalaryCount(formattedData);
   if (staffSalaryCount_add.code === 0) {
     ElMessage({type: 'success',message: '更新成功'})

+ 11 - 1
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();
 };

+ 31 - 18
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 = () => {

+ 5 - 3
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;
   params.productCode = yycpzlformData['cpdh'];
   params.option = yycpzlformData['fangan'];
   console.log(params)