运营管理

src/api/yunyin/yunying.js

@@ -1,4 +1,5 @@
 import service from '@/utils/request'
+
 /** 员工基本资料管理 */
 //1.获取部门列表
 export const getDepartment = (data) => {
@@ -62,7 +63,7 @@ export const getProductGy = (params) => {
 export const editGy = (data) => {
     return service({
         url: '/mes_server/product/editGy',
-        method: 'get',
+        method: 'post',
         data
     })
 }
@@ -90,6 +91,14 @@ export const getGyTotal = (data) => {
         data
     })
 }
+//8.2产品工艺复制(数据库不支持插入数据)
+// export const copyProductGy = (data) => {
+//     return service({
+//         url: '/mes_server/product/copyProductGy',
+//         method: 'post',
+//         data
+//     })
+// }
 //9.工艺方案更名
 export const editGyName = (data) => {
     return service({
@@ -122,6 +131,7 @@ export const editGyWaste = (data) => {
         data
     })
 }
+
 /** 生产管理 工单资料管理*/
 // 1.工单资料菜单列表
 export const DataList = (params) => {
@@ -173,7 +183,6 @@ export const DataCorrection = (params) => {
     })
 }
 
-
 //工单差改->修改工单信息
 export const WorkOrderEdit = (params) => {
     return service({
@@ -258,14 +267,14 @@ export const AccountingParameter = (params) => {
     })
 }
 //修正工单核算参数->参数修改
-export const AccountingParameterEditw = (params) => {
+export const AccountingParameterEdit = (params) => {
     return service({
-        url: '/mes_server/work_order/AccountingParameterEditw',
+        url: '/mes_server/work_order/AccountingParameterEdit',
         method: 'post',
         params
     })
 }
-//修正工单核算参数->参数修改
+//U8投料试算
 export const U8Trial = (params) => {
     return service({
         url: '/mes_server/work_order/U8Trial',
@@ -274,15 +283,8 @@ export const U8Trial = (params) => {
     })
 }
 
+
 /**工单生产排单(排产管理)*/
-//左侧车间机台菜单
-export const workbench = (data) => {
-    return service({
-        url: '/mes_server/manufacture/workbench',
-        method: 'get',
-        data
-    })
-}
 //计划中工单
 export const Project = (data) => {
     return service({
@@ -307,6 +309,14 @@ export const projectPrint = (params) => {
         params
     })
 }
+//左侧车间机台菜单
+export const workbench = (data) => {
+    return service({
+        url: '/mes_server/manufacture/workbench',
+        method: 'get',
+        data
+    })
+}
 //生产中工单工序接口
 export const scheduleProcess = (data) => {
     return service({
@@ -315,6 +325,80 @@ export const scheduleProcess = (data) => {
         data
     })
 }
+//查找工单
+export const WorkOrderSearch = (data) => {
+    return service({
+        url: '/mes_server/manufacture/WorkOrderSearch',
+        method: 'get',
+        data
+    })
+}
+//工序完工
+export const complete = (data) => {
+    return service({
+        url: '/mes_server/manufacture/complete',
+        method: 'get',
+        data
+    })
+}
+//加入排产
+export const ProductionSchedulingAdd = (data) => {
+    return service({
+        url: '/mes_server/manufacture/ProductionSchedulingAdd',
+        method: 'post',
+        data
+    })
+}
+//暂停排产
+export const ProductionSchedulingPause = (data) => {
+    return service({
+        url: '/mes_server/manufacture/ProductionSchedulingPause',
+        method: 'post',
+        data
+    })
+}
+//工序状态更正
+export const ProcessStatusCorrection = (data) => {
+    return service({
+        url: '/mes_server/manufacture/ProcessStatusCorrection',
+        method: 'get',
+        data
+    })
+}
+//班次选择列表
+export const ScheduleSelection = (data) => {
+    return service({
+        url: '/mes_server/manufacture/ScheduleSelection',
+        method: 'get',
+        data
+    })
+}
+//车间设备排程->数据展示
+export const EquipmentScheduling = (data) => {
+    return service({
+        url: '/mes_server/manufacture/EquipmentScheduling',
+        method: 'get',
+        data
+    })
+}
+//车间设备排程->数据编辑
+export const EquipmentSchedulingEdit = (data) => {
+    return service({
+        url: '/mes_server/manufacture/EquipmentSchedulingEdit',
+        method: 'post',
+        data
+    })
+}
+
+//工单状态设置
+export const StatusEdit = (data) => {
+    return service({
+        url: '/mes_server/manufacture/StatusEdit',
+        method: 'post',
+        data
+    })
+}
+
 
 /** 7.设备运行跟踪*/
 //左侧菜单
@@ -325,7 +409,6 @@ export const getTab = (params) => {
         params
     })
 }
-
 //当日上报产量
 export const chanLiang = (params) => {
     return service({
@@ -333,4 +416,76 @@ export const chanLiang = (params) => {
         method: 'get',
         params
     })
+}
+//当日制程检验记录
+export const Inspect = (params) => {
+    return service({
+        url: '/mes_server/facility/Inspect',
+        method: 'get',
+        params
+    })
+}
+//当前生产订单
+export const Production = (params) => {
+    return service({
+        url: '/mes_server/facility/Production',
+        method: 'get',
+        params
+    })
+}
+//设备工作清单
+export const EquipmentWorklist = (params) => {
+    return service({
+        url: '/mes_server/facility/EquipmentWorklist',
+        method: 'get',
+        params
+    })
+}
+//印件、工序、完成数量
+export const Procedure = (params) => {
+    return service({
+        url: '/mes_server/facility/Procedure',
+        method: 'get',
+        params
+    })
+}
+//班组人员及分配比例
+export const Team = (params) => {
+    return service({
+        url: '/mes_server/facility/Team',
+        method: 'get',
+        params
+    })
+}
+//当班产量明细
+export const OutputDetail = (params) => {
+    return service({
+        url: '/mes_server/facility/OutputDetail',
+        method: 'get',
+        params
+    })
+}
+//检验记录
+export const InspectionRecord = (params) => {
+    return service({
+        url: '/mes_server/facility/InspectionRecord',
+        method: 'get',
+        params
+    })
+}
+//班组维护->机台编号下拉框
+export const MachineList = (params) => {
+    return service({
+        url: '/mes_server/facility/MachineList',
+        method: 'get',
+        params
+    })
+}
+//班组维护->删除当前班组
+export const teamDel = (params) => {
+    return service({
+        url: '/mes_server/facility/teamDel',
+        method: 'get',
+        params
+    })
 }

src/view/yunyin/chanpinziliao/chanpinziliao.vue

@@ -19,27 +19,24 @@
             <el-form ref="elSearchFormRef" :inline="true"  class="demo-form-inline" :rules="searchRule" @keyup.enter="onSubmit">
               <!--          左侧查询输入框 -->
               <el-form-item>
-                <el-input v-model="searchInfo" placeholder="搜索产品编号或产品名称" clearable style="width: 200px;"></el-input>
-                <el-button type="primary" icon="search" @click="onSubmit" style="margin-left: 10px">查询</el-button>
-
-<!--                <el-button icon="refresh" @click="onReset">重置</el-button>-->
-<!--                <el-button type="primary" icon="plus" @click="openDialog">新增</el-button>-->
+                <el-input v-model="searchInfo" placeholder="搜索产品编号或产品名称" clearable style="width: 200px;margin: 5px"></el-input>
+                <el-button type="primary" icon="search" @click="onSubmit" style="margin: 5px">查询</el-button>
 
 <!--            状态设置-->
                 <el-button type="primary" icon="edit" @click="onStatusClick">状态设置</el-button>
                 <el-dialog v-model="onstatuslist" title="状态设置" width="20%" style="height: 25%; position: fixed; bottom: 35%; left: 40%">
                   <div style="display: flex; flex-direction: column; align-items: center; height: 100%;">
                     <div style="width: 100%; height: 230px; margin: 0 auto; padding: 0px">
-                      <div style="width: 100%; height: 50px;">
+                      <div style="width: 100%; height: 50px;margin-left: 50px">
                         <el-radio-group v-model="status">
                           <el-radio label="在产">在产</el-radio>
                           <el-radio label="停产">停产</el-radio>
                         </el-radio-group>
                       </div>
-                      <div style="width: 100%; display: flex; justify-content: center; align-items: flex-end; height: 35%;">
-                        <div slot="footer" class="dialog-footer" style="text-align: center;">
-                          <el-button type="primary" @click="handleConfirm">执行</el-button>
-                          <el-button @click="handleCancel">放弃</el-button>
+                      <div style="width: 100%; display: flex; justify-content: flex-end; align-items: flex-end; height: 35%;">
+                        <div slot="footer" class="dialog-footer" style="text-align: right; margin-right: 20px;">
+                          <el-button @click="handleCancel">取消</el-button>
+                          <el-button type="primary" @click="handleConfirm">确定</el-button>
                         </div>
                       </div>
                     </div>
@@ -49,15 +46,15 @@
 <!--                <el-button type="primary" disabled icon="edit" @click="" style="margin-left: 10px">工艺方案复制</el-button>-->
 
 <!--            工艺方案更名-->
-                <el-button type="primary" icon="edit" @click="gygmClick" style="margin-left: 10px">工艺方案更名</el-button>
-                <el-dialog v-model="gygmlist" title="工艺方案更名" width="40%" style="height: 40%; position: fixed; bottom: 30%; left: 30%">
+                <el-button type="primary" icon="edit" @click="gygmClick" style="margin: 5px">工艺方案更名</el-button>
+                <el-dialog v-model="gygmlist" title="工艺方案更名" width="35%" style="height: 40%; position: fixed; bottom: 30%; left: 30%">
                   <div style="display: flex; flex-direction: column;  height: 100%;">
                     <el-form-item label="产品代号:" prop="process">
                       <el-input v-model="gyformData['process']" disabled :clearable="true" placeholder="" style="width: 160px;"/>
                     </el-form-item>
                     <br>
-                    <el-form-item label=" " prop="processName">
-                      <el-input v-model="gyformData['processName']" disabled :clearable="true" placeholder="" style="width: 100%;" />
+                    <el-form-item label="产品名称" prop="processName">
+                      <el-input v-model="gyformData['processName']" disabled :clearable="true" placeholder="" style="width: 90%;" />
                     </el-form-item>
                     <br>
                     <el-form-item label="工艺方案原名:" prop="originalName">
@@ -70,16 +67,15 @@
                       <el-input v-model="gyformData['newName']" :clearable="true" placeholder="" style="width: 160px;"/>
                     </el-form-item>
 
-                    <div class="dialog-footer" style="margin-top: 15px; margin-left: 280px;">
-                      <el-button type="primary" @click="gygmhandleConfirm">执行</el-button>
-
-                      <el-button @click="gygmhandleCancel">放弃</el-button>
+                    <div class="dialog-footer" style="margin-top: 15px; text-align: right ">
+                      <el-button @click="gygmhandleCancel">取消</el-button>
+                      <el-button type="primary" @click="gygmhandleConfirm">确定</el-button>
                     </div>
                   </div>
                 </el-dialog>
 
-<!--             工艺方案附加 -->
-                <el-button type="primary"  icon="edit" @click="fjClick" style="margin-left: 10px">工艺方案附加</el-button>
+<!--            工艺方案附加 -->
+                <el-button type="primary"  icon="edit" @click="fjClick" style="margin: 5px">工艺方案附加</el-button>
                 <el-dialog v-model="fjlist" title="工艺方案附加" width="1400px" style="height: 740px;bottom: 6%;">
                   <div>
 
@@ -162,8 +158,8 @@
                   </div>
                 </el-dialog>
 
-<!--              工艺方案附加中 附加标准工序-->
-                  <el-dialog v-model="cpgylcfjxx" title="产品工艺流程附加选择" width="1400px" style="height: 740px;bottom: 6%;">
+<!--            工艺方案附加中 附加标准工序-->
+                <el-dialog v-model="cpgylcfjxx" title="产品工艺流程附加选择" width="1400px" style="height: 740px;bottom: 6%;">
                   <div>
                     <div style="width: 100%; height: 60px; padding: 0px; margin: 10px 0px 0px 0px; display: flex; align-items: center;">
                       <el-form-item label="产品代号 :" prop="currentProcess" style="margin-right: 20px; padding: 0px">
@@ -231,7 +227,7 @@
                 </el-dialog>
 
 <!--            计损色数修正-->
-                <el-button type="primary" icon="edit" @click="jsssxzClick" style="margin-left: 10px">计损色数修正</el-button>
+                <el-button type="primary" icon="edit" @click="jsssxzClick" style="margin: 5px">计损色数修正</el-button>
                   <el-dialog v-model="jsssxzlist" title="计损色数修正" width="1400px" style="height: 740px;bottom: 6%;">
                   <div style="width: 100%; height: 60px; padding: 0px; margin: 10px 0px 0px 0px; display: flex; align-items: center;">
                     <el-form-item label="关键字 :" prop="currentProcess" style="margin-right: 20px; padding: 0px">
@@ -247,10 +243,6 @@
                             :header-cell-style="{ padding: '0px' }"
                             style="width: 100%;height: 450px" border tooltip-effect="dark"
                             :data="jsssxztableData" row-key="ID" @selection-change="handleSelectionChange">
-
-<!--                    <el-table-column v-slot="_jsssxzformData" align="left" label=产品编号 width="130" >-->
-<!--                      <el-input disabled v-model="_jsssxzformData.value" :clearable="false"/>-->
-<!--                    </el-table-column>-->
                     <el-table-column v-slot="scope" align="left" label=产品名称 width="300" >
                       <el-input disabled v-model="scope.row.product_name" :clearable="false"/>
                     </el-table-column>
@@ -267,11 +259,10 @@
                       <el-input disabled v-model="scope.row.gy0_gxmc" :clearable="false"/>
                     </el-table-column>
                     <el-table-column v-slot="scope" align="left" label="原计损色数" width="100">
-<!--                      <el-input :value="scope.row.ms_coe" disabled :clearable="false"/>-->
-                      <el-input :value="jsssxztableDatas['ms_coe']" disabled :clearable="false"/>
+                      <el-input :value="scope.row.old_ms_coe" disabled :clearable="false"/>
                     </el-table-column>
                     <el-table-column v-slot="scope" align="left" label=新计损色数 width="100" >
-                      <el-input v-model="scope.row.ms_coe" :clearable="false"/>
+                      <el-input  v-model="scope.row.ms_coe" :clearable="false"/>
                     </el-table-column>
                     <el-table-column v-slot="scope" align="left" label=新开数 width="90" >
                       <el-input  v-model="scope.row.Gy0_Ks" :clearable="false"/>
@@ -292,15 +283,14 @@
                       <el-input disabled v-model="scope.row.custom_name" :clearable="false"/>
                     </el-table-column>
                   </el-table>
-                  <div class="dialog-footer"  v-if="jsssxzformData['cpdh'] && jsssxzformData['cpdh'].length > 0" style="text-align: center; margin-top: 20px;">
-                  <el-button type="primary"  @click="jsssxzConfirm">更新</el-button>
-                  <el-button type="primary" @click="jsssxzCancel">放弃</el-button>
+                  <div class="dialog-footer"  style="text-align: right; margin-top: 60px;">
+                    <el-button type="" @click="jsssxzCancel">取消</el-button>
+                    <el-button type="primary"  @click="jsssxzConfirm">确定</el-button>
                   </div>
                 </el-dialog>
 
-
 <!--            质检废品系数-->
-                <el-button type="primary" icon="edit" @click="fjfpxsClick" style="margin-left: 10px">质检废品系数</el-button>
+                <el-button type="primary" icon="edit" @click="fjfpxsClick" style="margin: 5px">质检废品系数</el-button>
                   <el-dialog v-model="fjfpxslist" title="质检废品系数" width="1400px" style="height: 740px;bottom: 6%;">
                   <div style="width: 100%; height: 60px; padding: 0px; margin: 10px 0px 0px 0px; display: flex; align-items: center;">
                     <el-form-item label="关键字 :" prop="currentProcess" style="margin-right: 20px; padding: 0px">
@@ -329,22 +319,22 @@
                       </el-table-column>
 
                       <el-table-column v-slot="scope" align="left" label=原人工正品版 width="110" >
-                        <el-input disabled v-model="scope.row.artificial_zp" :clearable="false"/>
+                        <el-input disabled v-model="scope.row.old_artificial_zp" :clearable="false"/>
                       </el-table-column>
                       <el-table-column v-slot="scope" align="left" label=原人工次品板 width="110" >
-                        <el-input disabled v-model="scope.row.artificial_cp" :clearable="false"/>
+                        <el-input disabled v-model="scope.row.old_artificial_cp" :clearable="false"/>
                       </el-table-column>
                       <el-table-column v-slot="scope" align="left" label=原人工废检 width="100" >
-                        <el-input disabled v-model="scope.row.artificial_fj" :clearable="false"/>
+                        <el-input disabled v-model="scope.row.old_artificial_fj" :clearable="false"/>
                       </el-table-column>
                       <el-table-column v-slot="scope" align="left" label=原机检正品版 width="110" >
-                        <el-input disabled v-model="scope.row.machine_zp" :clearable="false"/>
+                        <el-input disabled v-model="scope.row.old_machine_zp" :clearable="false"/>
                       </el-table-column>
                       <el-table-column v-slot="scope" align="left" label=原机检次品版 width="110" >
-                        <el-input disabled v-model="scope.row.machine_cp" :clearable="false"/>
+                        <el-input disabled v-model="scope.row.old_machine_cp" :clearable="false"/>
                       </el-table-column>
                       <el-table-column v-slot="scope" align="left" label=原机检废检 width="100" >
-                        <el-input disabled v-model="scope.row.machine_fj" :clearable="false"/>
+                        <el-input disabled v-model="scope.row.old_machine_fj" :clearable="false"/>
                       </el-table-column>
 
                       <el-table-column v-slot="scope" align="left" label=新人工正品版 width="110" >
@@ -372,21 +362,14 @@
                         <el-input disabled v-model="scope.row.custom_name" :clearable="false"/>
                       </el-table-column>
                     </el-table>
-                  <div class="dialog-footer" style="text-align: center; margin-top: 20px;">
+                  <div class="dialog-footer" style="text-align: right; margin-top: 60px;">
+                    <el-button type="" @click="fjfpxsCancel">放弃</el-button>
                     <el-button type="primary" @click="fjfpxsConfirm">更新</el-button>
-                    <el-button type="primary" @click="fjfpxsCancel">放弃</el-button>
                   </div>
                 </el-dialog>
 
-
-
-
-
-
-
-
-<!--                排产参数调整-->
-                <el-button type="primary" icon="edit" @click="pccstzClick" style="margin-left: 10px">排产参数调整</el-button>
+<!--            排产参数调整-->
+                <el-button type="primary" icon="edit" @click="pccstzClick" style="margin: 5px">排产参数调整</el-button>
                 <el-dialog v-model="pccstzlist" title="排产参数调整" width="1400px" style="height: 740px;bottom: 6%;">
                   <div style="width: 100%; height: 60px; padding: 0px; margin: 10px 0px 0px 0px; display: flex; align-items: center;">
                     <el-form-item label="关键是字 :" prop="currentProcess" style="margin-right: 20px; padding: 0px">
@@ -418,28 +401,27 @@
                     </el-table-column>
 
                     <el-table-column v-slot="scope" align="left" label=原A类产能 width="100" >
-                      <el-input disabled  v-model="scope.row.A_power" :clearable="false"/>
+                      <el-input disabled  v-model="scope.row.old_A_power" :clearable="false"/>
                     </el-table-column>
                     <el-table-column v-slot="scope" align="left" label=原损耗代号 width="170" >
-                      <el-input disabled  v-model="scope.row.Gy0_shdh" :clearable="false"/>
+                      <el-input disabled  v-model="scope.row.old_Gy0_shdh" :clearable="false"/>
                     </el-table-column>
                     <el-table-column v-slot="scope" align="left" label=原机组编号 width="100" >
-                      <el-input disabled  v-model="scope.row.Gy0_sbbh" :clearable="false"/>
+                      <el-input disabled  v-model="scope.row.old_Gy0_sbbh" :clearable="false"/>
                     </el-table-column>
 
-                    <el-table-column v-slot="scope" fixed="right" align="left" label=新A类产能 width="115" >
+                    <el-table-column v-slot="scope"  align="left" label=新A类产能 width="115" >
                       <el-input   v-model="scope.row.A_power" :clearable="false"/>
                     </el-table-column>
-                    <el-table-column v-slot="scope" fixed="right" align="left" label=新损耗代号 width="170" >
+                    <el-table-column v-slot="scope"  align="left" label=新损耗代号 width="170" >
                       <el-input   v-model="scope.row.Gy0_shdh" :clearable="false"/>
                     </el-table-column>
-                    <el-table-column v-slot="scope" fixed="right"  align="left" label=新机组编号 width="115" >
+                    <el-table-column v-slot="scope"   align="left" label=新机组编号 width="115" >
                       <el-input   v-model="scope.row.Gy0_sbbh" :clearable="false"/>
                     </el-table-column>
-
-<!--                    <el-table-column v-slot="scope" fixed="right" align="left" label=新装版开工时 width="115" >-->
-<!--                      <el-input   v-model="scope.row.difficulty_coe" :clearable="false"/>-->
-<!--                    </el-table-column>-->
+                    <el-table-column v-slot="scope"  align="left" label=新装版开工时 width="115" >
+                      <el-input   v-model="scope.row.Gy0_辅助工时" :clearable="false"/>
+                    </el-table-column>
                     <el-table-column v-slot="scope" align="left" label=开数 width="70" >
                       <el-input disabled  v-model="scope.row.Gy0_Ks" :clearable="false"/>
                     </el-table-column>
@@ -450,24 +432,20 @@
                       <el-input disabled  v-model="scope.row.Gy0_site" :clearable="false"/>
                     </el-table-column>
                     <el-table-column v-slot="scope" align="left" label=设备编号 width="100" >
-                      <el-input disabled  v-model="scope.row.Gy0_sbbh" :clearable="false"/>
+                      <el-input disabled  v-model="scope.row.olds_Gy0_sbbh" :clearable="false"/>
                     </el-table-column>
                     <el-table-column v-slot="scope" align="left" label=客户名称 width="300" >
                       <el-input disabled  v-model="scope.row.custom_name" :clearable="false"/>
                     </el-table-column>
-
-
-
                   </el-table>
-
                   <div class="dialog-footer" style="text-align: center; margin-top: 20px;">
-                    <el-button type="primary" disabled @click="pccstzConfirm">更新</el-button>
+                    <el-button type="primary"  @click="pccstzConfirm">更新</el-button>
                     <el-button type="primary" @click="pccstzCancel">放弃</el-button>
                   </div>
                 </el-dialog>
 
-<!--                核算参数调整-->
-                <el-button type="primary" icon="edit" @click="hscstzClick" style="margin-left: 10px">核算参数调整</el-button>
+<!--            核算参数调整-->
+                <el-button type="primary" icon="edit" @click="hscstzClick" style="margin: 5px;">核算参数调整</el-button>
                 <el-dialog v-model="hscstzlist" title="核算参数调整" width="1400px" style="height: 740px;bottom: 6%;">
                   <div style="width: 100%; height: 60px; padding: 0px; margin: 10px 0px 0px 0px; display: flex; align-items: center;">
                     <el-form-item label="关键是字 :" prop="currentProcess" style="margin-right: 20px; padding: 0px">
@@ -499,22 +477,22 @@
                     </el-table-column>
                     <!-- 原难度系数、原损耗系数、原计损色数-->
                     <el-table-column v-slot="scope" align="left" label=原难度系数 width="115" >
-                      <el-input disabled  v-model="scope.row.difficulty_coe" :clearable="false"/>
+                      <el-input disabled  v-model="scope.row.hscstzold_difficulty_coe" :clearable="false"/>
                     </el-table-column>
                     <el-table-column v-slot="scope" align="left" label=原损耗系数 width="115" >
-                      <el-input disabled  v-model="scope.row.loss_coe" :clearable="false"/>
+                      <el-input disabled  v-model="scope.row.hscstzold_loss_coe" :clearable="false"/>
                     </el-table-column>
                     <el-table-column v-slot="scope" align="left" label=原计损色数 width="115" >
-                      <el-input disabled  v-model="scope.row.ms_coe" :clearable="false"/>
+                      <el-input disabled  v-model="scope.row.hscstzold_ms_coe" :clearable="false"/>
                     </el-table-column>
                     <!-- 新难度系数、新损耗系数、新计损色数-->
-                    <el-table-column v-slot="scope" fixed="right" align="left" label=新难度系数 width="115" >
+                    <el-table-column v-slot="scope"  align="left" label=新难度系数 width="115" >
                       <el-input   v-model="scope.row.difficulty_coe" :clearable="false"/>
                     </el-table-column>
-                    <el-table-column v-slot="scope" fixed="right" align="left" label=新损耗系数 width="115" >
+                    <el-table-column v-slot="scope"  align="left" label=新损耗系数 width="115" >
                       <el-input   v-model="scope.row.loss_coe" :clearable="false"/>
                     </el-table-column>
-                    <el-table-column v-slot="scope" fixed="right"  align="left" label=新计损色数 width="115" >
+                    <el-table-column v-slot="scope"   align="left" label=新计损色数 width="115" >
                       <el-input   v-model="scope.row.ms_coe" :clearable="false"/>
                     </el-table-column>
 
@@ -535,18 +513,18 @@
                     </el-table-column>
                   </el-table>
                   <div class="dialog-footer" style="text-align: center; margin-top: 20px;">
-                    <el-button type="primary" disabled @click="hscstzConfirm">更新</el-button>
-                    <el-button type="primary" @click="hscstzCancel">放弃</el-button>
+                    <el-button type="" @click="hscstzCancel">放弃</el-button>
+                    <el-button type="primary"   @click="hscstzConfirm">更新</el-button>
                   </div>
                 </el-dialog>
 
-<!--                导出产品资料-->
-                <el-button type="primary" disabled icon="Download" @click="cpexportToExcel" style="margin-left: 10px">导出产品资料</el-button>
+<!--            导出产品资料-->
+                <el-button type="primary" disabled icon="Download" @click="cpexportToExcel" style="margin: 5px">导出产品资料</el-button>
                 <el-dialog v-model="cpdialogexportToExcel" title="导出产品资料" width="50%">
                 </el-dialog>
 
-<!--                导出工艺流程-->
-                <el-button type="primary" disabled icon="Download" @click="gyexportToExcel" style="margin-left: 10px;margin-top: 5px">导出工艺流程</el-button>
+<!--            导出工艺流程-->
+                <el-button type="primary" disabled icon="Download" @click="gyexportToExcel" style="margin: 5px;margin-top: 5px">导出工艺流程</el-button>
                 <el-dialog v-model="gydialogexportToExcel" title="导出工艺流程" width="50%">
                 </el-dialog>
 
@@ -561,6 +539,8 @@
 
 
 
+
+
           <!--   表格列表 -->
           <div class="gva-table-box">
             <el-table ref="multipleTable"
@@ -598,7 +578,6 @@
 <!--                             :page-size="pageSize" :page-sizes="[10, 30, 50, 100]" :total="total"-->
 <!--                             @current-change="handleCurrentChange" @size-change="handleSizeChange" />-->
 <!--            </div>-->
-
           </div>
 
           <!--   印件资料、工艺资料、印版资料、技术资料附件表格 -->
@@ -1080,14 +1059,12 @@ export default {
 </script>
 <script setup>
 // 全量引入格式化工具 请按需保留
-import {createCompany, deleteCompany, deleteCompanyByIds, updateCompany, findCompany, getCompanyList} from '@/api/company'
-import { getDictFunc, formatDate, formatBoolean, filterDict, ReturnArrImg, onDownloadFile } from '@/utils/format'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { ref, reactive } from 'vue'
 import {
-  DataList,
-  editGyName, editGyNo, editProduct,
-  getCustom,getDepartment,getProduct,getProductData,getProductGy,editGyWaste,editGyMs,getStaffList,setProductStatus} from "@/api/yunyin/yunying";
+  DataList,editGyName, editGyNo, editProduct,
+  getCustom,getDepartment,getProduct,editGy,getProductData,
+  getProductGy,editGyWaste,editGyMs,getStaffList,setProductStatus} from "@/api/yunyin/yunying";
 defineOptions({   name: 'Company'})
 
 // =========== 导出Excel表格 ===========
@@ -1148,18 +1125,20 @@ const handleConfirm = async () => {
         message: '更新成功'
       })
     }
-
 };
 handleCancel(_stacode);
 
 // =========== 工艺方案附加 ===========
 const fjlist = ref(false);
 const fjformData = reactive({
-  //↓当前产品数据
-  process: '',//当前产品
-  processName: '',//产品名称
-  processfa: [],//工艺方案
-  originalName: '', // 工艺方案默认选择的值
+  //当前产品
+  process: '',
+  //产品名称
+  processName: '',
+  //工艺方案
+  processfa: [],
+  // 工艺方案默认选择的值
+  originalName: '',
   //↓新产品数据
   dqprocess: '',
   dqprocessName: '',
@@ -1172,7 +1151,6 @@ const _originalNamev = ref(null);
 const fjClick = () => {
   if(_product_code.value == null){
     fjlist.value = false;
-    // alert('请选择分类项目，再操作此功能');
     ElMessage({
       type: 'warning',
       message: '请选择分类项目，再操作此功能'
@@ -1259,16 +1237,19 @@ const getProductGys = async (product_code,plan) => {
   fjtableData.value = getProductGydata.data;
 };
 
-
 //==========点击【附加标准工序】按钮=====弹出新页面==========
 const cpgylcfjxx = ref(false);
 //产品代号
 const _cpgyoriginalNamev = ref(null);
 const cpgyformData = reactive({
-  cpgydh: '',//当前产品代号
-  cpgymc: '',//当前产品名称
-  cpgyfan: [],//当前产品工艺方案
-  cpgyfans: '', // 当前工艺方案默认选择的值
+  //当前产品代号
+  cpgydh: '',
+  //当前产品名称
+  cpgymc: '',
+  //当前产品工艺方案
+  cpgyfan: [],
+  // 当前工艺方案默认选择的值
+  cpgyfans: '',
 });
 
 //点击【附加标准工序按钮】打开页面清空输入框数据
@@ -1296,8 +1277,10 @@ const cpgygetProductValue = () => {
 
 //3.点击工艺方案下拉框获取输入框的值
 const oncpgyfanclick = () => {
-  const product_code = cpgyformData.cpgydh; // 产品代号
-  const plan = cpgyformData.cpgyfan; // 选中的工艺方案
+  // 产品代号
+  const product_code = cpgyformData.cpgydh;
+  // 选中的工艺方案
+  const plan = cpgyformData.cpgyfan;
   getProductGyss(product_code,plan)
 }
 
@@ -1343,9 +1326,7 @@ const onfjbzgxexecute = async () => {
 }
 
 //点击【附加标准工序放弃】按钮
-const onfjbzgxcancellation = async () => {
-  cpgylcfjxx.value = false;
-}
+const onfjbzgxcancellation = async () => {cpgylcfjxx.value = false;}
 
 //点击【更新当前产品工序】按钮，更新的是表格数据
 const gxdqcpgx = async () => {
@@ -1458,9 +1439,6 @@ gygmhandleCancel(_gygmstacode);
 // =========== 计损色数修正 ===========
 const jsssxzlist = ref(false);
 const jsssxztableData = ref([]);
-const jsssxztableDatas = ref({
-  ms_coe: '',
-});
 const jsssxzformData = reactive({cpdh: '',});
 //点击【计损色数修正】按钮
 const jsssxzClick = () => {
@@ -1476,7 +1454,7 @@ const jsssxzClick = () => {
     jsssxzlist.value = true;
   }
 }
-//计损色数修正回车
+//计损色数修正【回车】
 const jsssxzgetProductValue = async () => {
   _product_code.value = '';
   _jsssxzgetProductGy();
@@ -1487,8 +1465,10 @@ const _jsssxzgetProductGy = async ()=>{
   try {
     const getProductGydata = await getProductGy({product_code:product_code});
     jsssxztableData.value = getProductGydata.data;
-    jsssxztableDatas.value = getProductGydata.data;
-    console.log(jsssxztableDatas.value)
+    const formattedData = getProductGydata.data.map(item=>{
+      item.old_ms_coe = item.ms_coe
+      return item
+    });
   } catch (error) {
     console.error(error);
   }
@@ -1512,7 +1492,6 @@ const jsssxzConfirm = async () => {
   } else {
     ElMessage({type: 'error',message: '更新失败'})
   }
-  jsssxzlist.value = false;
 };
 //计损色数修正放弃按钮
 const jsssxzCancel = () => {jsssxzlist.value = false;};
@@ -1541,8 +1520,17 @@ const fjfpxsgetProductValue = async () => {
 const _fjfpxsgetProductGy = async ()=>{
   let product_code = _product_code.value || fjfpxsformData['cpdh'];
   try {
-    const data = await getProductGy({product_code:product_code});
-    fjfpxstableData.value = data.data;
+    const getProductGydata = await getProductGy({product_code:product_code});
+    fjfpxstableData.value = getProductGydata.data;
+    const formattedData = getProductGydata.data.map(item=>{
+      item.old_artificial_zp = item.artificial_zp;
+      item.old_artificial_cp = item.artificial_cp;
+      item.old_artificial_fj = item.artificial_fj;
+      item.old_machine_zp = item.machine_zp;
+      item.old_machine_cp = item.machine_cp;
+      item.old_machine_fj = item.machine_fj;
+      return item
+    });
   } catch (error) {
     console.error(error);
   }
@@ -1550,68 +1538,51 @@ const _fjfpxsgetProductGy = async ()=>{
 //质检废品系数更新按钮
 const fjfpxsConfirm = async () => {
   const rawValueArray = fjfpxstableData._rawValue;
-  console.log(rawValueArray)
-  // const formattedData = rawValueArray.map(item => {
-  //   return {
-  //     "UniqID":item["UniqID"],
-  //     "artificial_zp":item["artificial_zp"],
-  //     "artificial_cp":item["artificial_cp"],
-  //     "artificial_fj":item["artificial_fj"],
-  //     "machine_zp":item["machine_zp"],
-  //     "machine_cp":item["machine_cp"],
-  //     "machine_fj":item["machine_fj"]
-  //   };
-  // });
-
-
+  // console.log(rawValueArray)
   const formattedData = rawValueArray.map(item => {
     return {
-      UniqID:item.UniqID,
-      artificial_zp:item.artificial_zp,
-      artificial_cp:item.artificial_cp,
-      artificial_fj:item.artificial_fj,
-      machine_zp:item.machine_zp,
-      machine_cp:item.machine_cp,
-      machine_fj:item.machine_fj
+      UniqID: item.UniqID,
+      artificial_zp: item.artificial_zp,
+      artificial_cp: item.artificial_cp,
+      artificial_fj: item.artificial_fj,
+      machine_zp: item.machine_zp,
+      machine_cp: item.machine_cp,
+      machine_fj: item.machine_fj
     };
   });
-
-  // const formatteda = [
-  //   {
-  //     "UniqID": 19207,
-  //     "artificial_zp": "0.000",
-  //     "artificial_cp": "0.000",
-  //     "artificial_fj": "0.000",
-  //     "machine_zp": "0.000",
-  //     "machine_cp": "0.000",
-  //     "machine_fj": "0.000"
-  //   },
-  //   {
-  //     "UniqID": 19208,
-  //     "artificial_zp": "0.000",
-  //     "artificial_cp": "0.000",
-  //     "artificial_fj": "0.000",
-  //     "machine_zp": "0.000",
-  //     "machine_cp": "0.000",
-  //     "machine_fj": "0.000"
-  //   }
-  // ];
-
+    // const formattedData = [
+    //   {
+    //     "UniqID": 19207,
+    //     "artificial_zp": "0.000",
+    //     "artificial_cp": "0.000",
+    //     "artificial_fj": "0.000",
+    //     "machine_zp": "0.000",
+    //     "machine_cp": "0.000",
+    //     "machine_fj": "0.000"
+    //   },
+    //   {
+    //     "UniqID": 19208,
+    //     "artificial_zp": "0.000",
+    //     "artificial_cp": "0.000",
+    //     "artificial_fj": "0.000",
+    //     "machine_zp": "0.000",
+    //     "machine_cp": "0.000",
+    //     "machine_fj": "0.000"
+    //   }
+    // ];
   console.log(formattedData);
-
   const editGyWastes = await editGyWaste(formattedData);
   console.log(editGyWastes);
-  if (editGyWastes.code === 0) {
-    ElMessage({type: 'success',message: '更新成功'})
-  } else {
-    ElMessage({type: 'error',message: '更新失败'})
-  }
+  // if (editGyWastes.code === 0) {
+  //   ElMessage({type: 'success',message: '更新成功'})
+  // } else {
+  //   ElMessage({type: 'error',message: '更新失败'})
+  // }
   // fjfpxslist.value = false;
 };
 //质检废品系数放弃按钮
 const fjfpxsCancel = () => {fjfpxslist.value = false;};
 
-
 // =========== 排产参数调整 ===========
 const pccstzlist = ref(false);
 const pccstztableData = ref([]);
@@ -1632,26 +1603,55 @@ const pccstzProductValue = async () => {
   _product_code.value = '';
   _pccstzgetProductGy();
 };
-//排产参数调整 执行
-const pccstzConfirm = () => {pccstzlist.value = false;};
-//排产参数调整 放弃
-const pccstzCancel = () => {pccstzlist.value = false;};
 //排产参数调整 获取单个工艺数据（排产参数调整）
 const _pccstzgetProductGy = async ()=>{
   let product_code = _product_code.value || pccstzformData['cpdh'];
   try {
-    const data = await getProductGy({product_code:product_code});
-    pccstztableData.value = data.data;
+    const getProductGydata = await getProductGy({product_code:product_code});
+    pccstztableData.value = getProductGydata.data;
+    const formattedData = getProductGydata.data.map(item=>{
+      //原A类产能
+      item.old_A_power = item.A_power;
+      //原损耗代号
+      item.old_Gy0_shdh = item.Gy0_shdh;
+      // 原机组编号
+      item.old_Gy0_sbbh = item.Gy0_sbbh;
+      //设备编号
+      item.olds_Gy0_sbbh = item.Gy0_sbbh;
+      return item
+    });
   } catch (error) {
     console.error(error);
   }
 }
+//排产参数调整 【执行更新按钮】
+const pccstzConfirm = async () => {
+  const rawValueArray = pccstztableData._rawValue;
+  const formattedData = rawValueArray.map(item => {
+    return {
+      UniqID: item.UniqID,
+      A_power: item.A_power,
+      shdh: item.Gy0_shdh,
+      machine: item.Gy0_sbbh,
+      time: item.Gy0_辅助工时,
+    };
+  });
+  const editGy_edit = await editGy(formattedData);
+  if (editGy_edit.code === 0) {
+    ElMessage({type: 'success',message: '更新成功'})
+  } else {
+    ElMessage({type: 'error',message: '更新失败'})
+  }
+  pccstzlist.value = false;
+};
+//排产参数调整 放弃
+const pccstzCancel = () => {pccstzlist.value = false;};
 
 // =========== 核算参数调整 ===========
 const hscstzlist = ref(false);
 const hscstztableData = ref([]);
 const hscstzformData = reactive({cpdh: '',});
-//点击【排产参数调整】按钮
+//点击【核算参数调整】按钮
 const hscstzClick = () => {
   if(_product_code.value == null){
     hscstzlist.value = false;
@@ -1667,24 +1667,46 @@ const hscstzProductValue = async () => {
   _product_code.value = '';
   _hscstzgetProductGy();
 };
-//排产参数调整 执行
-const hscstzConfirm = () => {hscstzlist.value = false;};
-//排产参数调整 放弃
-const hscstzCancel = () => {hscstzlist.value = false;};
-//排产参数调整 获取单个工艺数据（排产参数调整）
+//核算参数调整 获取单个工艺数据（排产参数调整）
 const _hscstzgetProductGy = async ()=>{
   let product_code = _product_code.value || hscstzformData['cpdh'];
   try {
-    const data = await getProductGy({product_code:product_code});
-    hscstztableData.value = data.data;
+    const hscstz_getProductGy = await getProductGy({product_code:product_code});
+    hscstztableData.value = hscstz_getProductGy.data;
+    const formattedData = hscstz_getProductGy.data.map(item=>{
+      //原难度系数
+      item.hscstzold_difficulty_coe = item.difficulty_coe;
+      //原损耗系数
+      item.hscstzold_loss_coe = item.loss_coe;
+      //原计损色数
+      item.hscstzold_ms_coe = item.ms_coe;
+      return item
+    });
   } catch (error) {
     console.error(error);
   }
 }
-
-
-
-
+//核算参数调整 【执行按钮】
+const hscstzConfirm = async () => {
+  const rawValueArray = hscstztableData._rawValue;
+  const formattedData = rawValueArray.map(item => {
+    return {
+      UniqID: item.UniqID,
+      difficulty_coe: item.difficulty_coe,
+      loss_coe: item.loss_coe,
+      ms_coe: item.ms_coe,
+    };
+  });
+  const hscstz_edit = await editGy(formattedData);
+  if (hscstz_edit.code === 0) {
+    ElMessage({type: 'success',message: '更新成功'})
+  } else {
+    ElMessage({type: 'error',message: '更新失败'})
+  }
+  hscstzlist.value = false;
+};
+//核算参数调整 放弃
+const hscstzCancel = () => {hscstzlist.value = false;};
 
 
 // =========== 左侧树侧形结构 ===========
@@ -1730,7 +1752,6 @@ const tableRowClick = async (row) => {
   ybtableData.splice(0, ybtableData.length, ...res.data.ybData);
 };
 
-
 //搜索查询
 const searchInfo = ref('')
 //点击【查询】按钮
@@ -1738,11 +1759,6 @@ const onSubmit = () => {
   _custom_code.value = '';
   _getProduct();
 };
-// 重置
-// const onReset = () => {
-//   searchInfo.value = {}
-//   getTableData()
-// }
 
 //封装获取单个产品基础数据方法
 const _getProduct = async ()=>{
@@ -1751,6 +1767,8 @@ const _getProduct = async ()=>{
   params.custom_code = _custom_code.value;
   params.limit = 999;
   params.page = 1;
+  // params.limit = page.value;
+  // params.page = pageSize.value;
   try {
     const WorkListdata = await getProduct(params);
     tableData.splice(0, tableData.length, ...WorkListdata.data.data);//表格
@@ -1770,7 +1788,7 @@ const handleCurrentChange = (val) => {
 };
 // 修改页面容量 点击多少条/页
 const handleSizeChange = (val) => {
-  page.value = 15;//默认显示十条
+  page.value = 2;//默认显示十条
   pageSize.value = val;
   _getProduct();
 };
@@ -1781,13 +1799,10 @@ const dialogFormVisible = ref(false)
 //双击修改弹窗
 const updateCompanyFunc = async (row) => {
   Object.assign(formDataTest,row);
-  // formDataTest = row;
   dialogFormVisible.value = true;
 };
 //关闭修改弹窗
 const closeDialog = () => {
-  // console.log("关闭")
-  // console.log(formDataTest)
   dialogFormVisible.value = false
 }
 //点击确定修改表格
@@ -1934,45 +1949,6 @@ const ybcloseDialog = () => {
   ybdialogFormVisible.value = false
 }
 
-
-
-
-
-
-
-//=========================
-const elFormRef = ref()
-const elSearchFormRef = ref()
-
-// 验证规则
-const rule = reactive({})
-
-const searchRule = reactive({
-  createdAt: [
-    { validator: (rule, value, callback) => {
-        if (searchInfo.value.startCreatedAt && !searchInfo.value.endCreatedAt) {
-          callback(new Error('请填写结束日期'))
-        } else if (!searchInfo.value.startCreatedAt && searchInfo.value.endCreatedAt) {
-          callback(new Error('请填写开始日期'))
-        } else if (searchInfo.value.startCreatedAt && searchInfo.value.endCreatedAt && (searchInfo.value.startCreatedAt.getTime() === searchInfo.value.endCreatedAt.getTime() || searchInfo.value.startCreatedAt.getTime() > searchInfo.value.endCreatedAt.getTime())) {
-          callback(new Error('开始日期应当早于结束日期'))
-        } else {
-          callback()
-        }
-      }, trigger: 'change' }
-  ],
-})
-
-// 获取需要的字典 可能为空 按需保留
-const setOptions = async () =>{
-}
-
-// 获取需要的字典 可能为空 按需保留
-setOptions()
-
-//行为控制标记（弹窗内部需要增还是改）
-const type = ref('')
-
 </script>
 <style>
 .JKWTree-container {

src/view/yunyin/renliziyuan/renyuanjibenziliao.vue

@@ -18,9 +18,9 @@
           <div class="gva-search-box">
             <el-form ref="elSearchFormRef" :inline="true"  class="demo-form-inline" :rules="searchRule" @keyup.enter="onSubmit">
               <el-form-item>
-                <el-input v-model="searchInfo" placeholder="搜索员工编号或员工姓名" clearable style="width: 200px;"></el-input>
-                <el-button type="primary" icon="search" @click="onSubmit" style="margin-left: 10px">查询</el-button>
-                <el-button disabled type="primary" icon="Download" @click="exportToExcel" style="float: right;">导出到Excel</el-button>
+                <el-input v-model="searchInfo" placeholder="搜索员工编号或员工姓名" clearable style="width: 200px;margin: 5px"></el-input>
+                <el-button type="primary" icon="search" @click="onSubmit" style="margin: 5px">查询</el-button>
+                <el-button disabled type="primary" icon="Download" @click="exportToExcel" style="margin: 5px;float: right;">导出到Excel</el-button>
                 <el-dialog v-model="dialogexportToExcel" disabled title="员工基本资料导出" width="50%">
                 </el-dialog>
               </el-form-item>
@@ -36,7 +36,7 @@
                       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 type="selection" width="55" />-->
               <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="性别" />
@@ -120,7 +120,7 @@
                     <el-input v-model="formDataTest['职称职务']" placeholder="" style="width: 190px;" />
                   </el-form-item>
                   <el-form-item label="部门编号:" prop="position">
-                    <el-input v-model="formDataTest['部门编号']" placeholder="" style="width: 190px;" />
+                    <el-input v-model="formDataTest['部门编码']" placeholder="" style="width: 190px;" />
                   </el-form-item>
                   <el-form-item label="转正日期:" prop="departmentId">
                     <el-input v-model="formDataTest['转正日期']" placeholder="" style="width: 190px;" />
@@ -145,26 +145,26 @@
                   </el-form-item>
                 </div>
 
-                <div style="float: left; text-align: center; margin-left: 50px;">
-                  <!-- 右侧图片 -->
-                  <div style="height: 200px; width: 160px; background-color: #eee; position: relative;">
-                    <!-- 上传按钮 -->
-                    <input type="file" style="position: absolute; top: 0; left: 0; width: 100%; height: 100%; opacity: 0; cursor: pointer;"
-                           @change="handleFileUpload">
-                    <!-- 显示上传的图片 -->
-                    <img v-if="formDataTest.imageUrl" :src="formDataTest.imageUrl" alt="Uploaded Image" style="max-width: 100%; max-height: 100%;">
-                  </div>
-                </div>
+<!--                <div style="float: left; text-align: center; margin-left: 50px;">-->
+<!--                  &lt;!&ndash; 右侧图片 &ndash;&gt;-->
+<!--                  <div style="height: 200px; width: 160px; background-color: #eee; position: relative;">-->
+<!--                    &lt;!&ndash; 上传按钮 &ndash;&gt;-->
+<!--                    <input type="file" style="position: absolute; top: 0; left: 0; width: 100%; height: 100%; opacity: 0; cursor: pointer;"-->
+<!--                           @change="handleFileUpload">-->
+<!--                    &lt;!&ndash; 显示上传的图片 &ndash;&gt;-->
+<!--                    <img v-if="formDataTest.imageUrl" :src="formDataTest.imageUrl" alt="Uploaded Image" style="max-width: 100%; max-height: 100%;">-->
+<!--                  </div>-->
+<!--                </div>-->
 
               </div>
             </el-form>
             <!-- 添加编辑页面取消确定按钮 -->
-            <template #footer>
-              <div class="dialog-footer" style="text-align: center; position: absolute; bottom: 20px; width: 90%;">
+<!--            <template #footer>-->
+              <div  style="text-align: right; position: absolute; bottom: 20px; right: 20px; width: 90%;">
                 <el-button @click="closeDialog">取消</el-button>
-                <el-button type="primary" @click="enterDialog">确定</el-button>
+                <el-button type="primary" disabled @click="enterDialog">确定</el-button>
               </div>
-            </template>
+<!--            </template>-->
           </el-dialog>