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

src/api/yunyin/yunying.js

@@ -864,3 +864,12 @@ export const gdAnnexDel= (params) => {
         params
     })
 }
+
+//计算员工计件工资
+export const staffSalaryCount= (data) => {
+    return service({
+        url:'/mes_server/staff_salary/staffSalaryCount',
+        method: 'post',
+        data
+    })
+}

src/view/performance/jjgzzhys.vue

@@ -0,0 +1,28 @@
+<template>
+  <div style="border: 1px red solid; width: 50%; height: 50%; position: absolute; top: 50%; left: 50%; transform: translate(-50%, -50%);">
+
+
+    <el-button type="" style="background-color: #aaaaaa;color: #1b1b19"  @click="">继 续</el-button>
+  </div>
+</template>
+
+<script>
+import { reactive, ref } from 'vue'
+export default { name: 'jjgzzhys', }
+import {
+  staffSalaryCount,
+} from "@/api/yunyin/yunying";
+const jjgzzhysformData = reactive({
+  year: '',
+  cong: '',
+  dao: '',
+  cong1: '',
+  cong2: '',
+  dao1: '',
+  dao2: '',
+});
+</script>
+
+<style scoped>
+
+</style>

src/view/yunyin/shengchanguanli/gongdanshengchan.vue

@@ -350,6 +350,7 @@
                         :header-cell-style="{ padding: '0px' }" :highlight-current-row="true"  @row-click="chejianRowClick"
                         style="width: 100%;height: 25vh" border tooltip-effect="dark" :data="chejianData" row-key="ID" @selection-change="PC_handleChange"
               >
+                <!-- 排程列表-->
                 <el-table-column type="selection" width="30" />
                 <template v-for="item in [
                   { align:'left', title: '工单编号', prop: '工单编号', width: 85  },
@@ -366,13 +367,14 @@
                   { align:'left', title: '工序名称', prop: '工序名称', width: 120  },
                   { align:'left', title: '机组', prop: '机组', width: 90  },
                   { align:'left', title: '设备编号', prop: '设备编号', width: 90  },
-                  { align:'left', title: 'UNIQID', prop: 'UNIQID', width: 90  },
-                  { align:'left', title: '印件号', prop: '印件号', width: 90  },
-                  { align:'left', title: '工序号', prop: '工序号', width: 90  },
+                  { align:'left', title: 'GYUID', prop: 'GYUID', width: 90  },
+                  { align:'left', title: '印件号', prop: 'yjno', width: 90  },
+                  { align:'left', title: '工序号', prop: 'gxh', width: 90  },
               ]">
                   <el-table-column :align="item.align" :label="item.title" :prop="item.prop" :width="item.width" />
                 </template>
               </el-table>
+              <!-- 制程列表-->
               <el-table ref="chejianfuRef"
                         :show-overflow-tooltip="true" :row-style="{ height: '20px' }"
                         :cell-style="{ padding: '0px' }" :header-row-style="{ height: '20px' }"
@@ -405,8 +407,8 @@
                   { align:'left', title: '设备编号', prop: '设备编号', width: 90  },
                   { align:'left', title: '车间名称', prop: '车间名称', width: 90  },
                   { align:'left', title: 'GYUID', prop: 'GYUID', width: 90  },
-                  { align:'left', title: '印件号', prop: '印件号', width: 90  },
-                  { align:'left', title: '工序号', prop: '工序号', width: 90  },
+                  { align:'left', title: '印件号', prop: 'yjno', width: 90  },
+                  { align:'left', title: '工序号', prop: 'gxh', width: 90  },
               ]">
                   <el-table-column :align="item.align" :label="item.title" :prop="item.prop" :width="item.width" />
                 </template>
@@ -707,6 +709,7 @@ const handleNodeClick = async (node) => {
     // }
     console.log('机台' + _machine.value)
     const zhubiao = await MachineWorkOrderList({ machine:_machine.value})
+    console.log(zhubiao)
     chejianData.value = zhubiao.data['排程'];
     chejianfuData.value = zhubiao.data['制程'];
   }

src/view/yunyin/shengchanguanli/gongdanziliao.vue

@@ -129,39 +129,43 @@
               <el-form-item label="创建选择" class="mab" >
                 <el-checkbox disabled v-model="yycpzlformData['yjzl']">获取印件资料</el-checkbox>
                 <el-checkbox disabled v-model="yycpzlformData['gyap']">获取工艺安排</el-checkbox>
+                <el-form-item label="" prop="processName" class="mab" label-width="100" >
+                  <el-input v-model="yycpzlformData['fa']"/>
+                </el-form-item>
               </el-form-item>
+
             </div>
             <div slot="footer" class="dialog-footer" style="text-align: right;margin-left: 25%">
               <el-button @click="yycpzlhandleCancel">放弃</el-button>
               <el-button type="primary" @click="yycpzlhandleConfirm">执行</el-button>
             </div>
 
-            <el-table ref="multipleTable"
-                      :show-overflow-tooltip="true"
-                      :row-style="{ height: '0px' }"
-                      :cell-style="{ padding: '0px' }"
-                      :header-row-style="{ height: '0px' }"
-                      :header-cell-style="{ padding: '0px' }"
-                      @row-click="yyzltableRowClick"
-                      highlight-current-row="true"
-                      style="width: 100%;height: 30vh;" border tooltip-effect="dark"
-                      :data="yyzltableData" row-key="ID">
-              <el-table-column align="left" label="工单编号" width="100">
-                <template v-slot="{ row }"><span>{{ row.工单编号 }}</span></template>
-              </el-table-column>
-              <el-table-column align="left" label="客户编号" width="100">
-                <template v-slot="{ row }"><span>{{ row.客户编号 }}</span></template>
-              </el-table-column>
-              <el-table-column align="left" label="客户名称" width="120">
-                <template v-slot="{ row }"><span>{{ row.客户名称 }}</span></template>
-              </el-table-column>
-              <el-table-column align="left" label="产品编号" width="100">
-                <template v-slot="{ row }"><span>{{ row.产品编号 }}</span></template>
-              </el-table-column>
-              <el-table-column align="left" label="产品名称">
-                <template v-slot="{ row }"><span>{{ row.产品名称 }}</span></template>
-              </el-table-column>
-            </el-table>
+<!--            <el-table ref="multipleTable"-->
+<!--                      :show-overflow-tooltip="true"-->
+<!--                      :row-style="{ height: '0px' }"-->
+<!--                      :cell-style="{ padding: '0px' }"-->
+<!--                      :header-row-style="{ height: '0px' }"-->
+<!--                      :header-cell-style="{ padding: '0px' }"-->
+<!--                      @row-click="yyzltableRowClick"-->
+<!--                      highlight-current-row="true"-->
+<!--                      style="width: 100%;height: 30vh;" border tooltip-effect="dark"-->
+<!--                      :data="yyzltableData" row-key="ID">-->
+<!--              <el-table-column align="left" label="工单编号" width="100">-->
+<!--                <template v-slot="{ row }"><span>{{ row.工单编号 }}</span></template>-->
+<!--              </el-table-column>-->
+<!--              <el-table-column align="left" label="客户编号" width="100">-->
+<!--                <template v-slot="{ row }"><span>{{ row.客户编号 }}</span></template>-->
+<!--              </el-table-column>-->
+<!--              <el-table-column align="left" label="客户名称" width="120">-->
+<!--                <template v-slot="{ row }"><span>{{ row.客户名称 }}</span></template>-->
+<!--              </el-table-column>-->
+<!--              <el-table-column align="left" label="产品编号" width="100">-->
+<!--                <template v-slot="{ row }"><span>{{ row.产品编号 }}</span></template>-->
+<!--              </el-table-column>-->
+<!--              <el-table-column align="left" label="产品名称">-->
+<!--                <template v-slot="{ row }"><span>{{ row.产品名称 }}</span></template>-->
+<!--              </el-table-column>-->
+<!--            </el-table>-->
           </el-dialog>
 
           <!--工序产量核算-->
@@ -2711,6 +2715,7 @@ const yycpzlformData = reactive({
   yjzl:true,
   gyap: true,
   gyfa: '',
+  fa: 'A',
 });
 const onyycpzllist = ref(false);
 //引用产品资料【按钮】
@@ -2736,32 +2741,38 @@ const yyzltableData = ref([]);
 //引用产品资料->获取产品资料 2403114
 const _WorkOrderDetailCopedata = async ()=>{
   let search = yycpzlformData['gdbh'];
-  // const WorkOrderDetailCopes = await ProductInformation({workOrder:search});
-  const WorkOrderDetailCopes = await WorkOrderDetailCope({search:search});
-  // console.log(WorkOrderDetailCopes);
-  yyzltableData.value = WorkOrderDetailCopes.data
-  // if(WorkOrderDetailCopes.msg === '未找到工单信息'){
-  //   yycpzlformData['khdh'] = '';
-  //   yycpzlformData['khmc'] = '';
-  //   yycpzlformData['cpdh'] = '';
-  //   yycpzlformData['cpmc'] =  '';
-  //   ElMessage({type: 'warning',message: '未找到工单信息'})
-  //   return false;
-  // }else{
-  //   yycpzlformData['gdbh'] = WorkOrderDetailCopes.data['工单编号'];
-  //   yycpzlformData['khdh'] = WorkOrderDetailCopes.data['客户代号'];
-  //   yycpzlformData['khmc'] = WorkOrderDetailCopes.data['客户名称'];
-  //   yycpzlformData['cpdh'] = WorkOrderDetailCopes.data['产品代号'];
-  //   yycpzlformData['cpmc'] = WorkOrderDetailCopes.data['产品名称'];
-  // }
-}
-const yyzltableRowClick = async (row) => {
-  yycpzlformData['gdbh'] = row['工单编号'];
-  yycpzlformData['khdh'] = row['客户编号'];
-  yycpzlformData['khmc'] = row['客户名称'];
-  yycpzlformData['cpdh'] = row['产品编号'];
-  yycpzlformData['cpmc'] = row['产品名称'];
-};
+  const WorkOrderDetailCopes = await ProductInformation({workOrder:search});
+  // const WorkOrderDetailCopes = await WorkOrderDetailCope({search:search});
+  console.log(WorkOrderDetailCopes);
+  // yyzltableData.value = WorkOrderDetailCopes.data
+  // yycpzlformData['gdbh'] = WorkOrderDetailCopes.data[0]['工单编号'];
+  // yycpzlformData['khdh'] = WorkOrderDetailCopes.data[0]['客户编号'];
+  // yycpzlformData['khmc'] = WorkOrderDetailCopes.data[0]['客户名称'];
+  // yycpzlformData['cpdh'] = WorkOrderDetailCopes.data[0]['产品编号'];
+  // yycpzlformData['cpmc'] = WorkOrderDetailCopes.data[0]['产品名称'];
+  if(WorkOrderDetailCopes.msg === '未找到工单信息'){
+    yycpzlformData['khdh'] = '';
+    yycpzlformData['khmc'] = '';
+    yycpzlformData['cpdh'] = '';
+    yycpzlformData['cpmc'] =  '';
+    ElMessage({type: 'warning',message: '未找到工单信息'})
+    return false;
+  }else{
+    yycpzlformData['gdbh'] = WorkOrderDetailCopes.data['工单编号'];
+    yycpzlformData['khdh'] = WorkOrderDetailCopes.data['客户代号'];
+    yycpzlformData['khmc'] = WorkOrderDetailCopes.data['客户名称'];
+    yycpzlformData['cpdh'] = WorkOrderDetailCopes.data['产品代号'];
+    yycpzlformData['cpmc'] = WorkOrderDetailCopes.data['产品名称'];
+  }
+}
+//点击获取工单资料展示数据
+// const yyzltableRowClick = async (row) => {
+//   yycpzlformData['gdbh'] = row['工单编号'];
+//   yycpzlformData['khdh'] = row['客户编号'];
+//   yycpzlformData['khmc'] = row['客户名称'];
+//   yycpzlformData['cpdh'] = row['产品编号'];
+//   yycpzlformData['cpmc'] = row['产品名称'];
+// };
 //引用产品资料【执行】
 const yycpzlhandleConfirm = async () => {
   _ProductInformationEdit();