|
|
@@ -2,18 +2,18 @@
|
|
|
<div>
|
|
|
<header>
|
|
|
<div style="height: 50px;">
|
|
|
- <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="pd_gdprintonClick" >工单打印</el-button>
|
|
|
- <el-button type="primary" size="large"class="bt" @click="gzSel" >员工工资查询</el-button>
|
|
|
- <el-button type="primary" size="large"class="bt" @click="oncomplaints" >客诉记录</el-button>
|
|
|
+ <el-button type="primary" size="large" class="bt" style="color:white;font-size: 17px;font-weight: bold;width: 80px" @click="onBZ" >班组维护</el-button>
|
|
|
+ <el-button type="primary" size="large" class="bt" style="color:white;font-size: 17px;font-weight: bold;width: 100px" @click="onchanliang" v-if="zdtreeType === true" >日产量上报</el-button>
|
|
|
+ <el-button type="primary" size="large" class="bt" style="color:white;font-size: 17px;font-weight: bold;width: 80px" @click="onOver" >完工</el-button>
|
|
|
+ <el-button type="primary" size="large" class="bt" style="color:white;font-size: 17px;font-weight: bold;width: 80px" @click="onzhicheng" >制程检验</el-button>
|
|
|
+ <el-button type="primary" size="large" class="bt" style="color:white;font-size: 17px;font-weight: bold;width: 80px" @click="ondianjian" >设备点检</el-button>
|
|
|
+ <el-button type="primary" size="large" class="bt" style="color:white;font-size: 17px;font-weight: bold;width: 80px" @click="onxuncha" >管理巡查</el-button>
|
|
|
+ <el-button type="primary" size="large" class="bt" style="color:white;font-size: 17px;font-weight: bold;width: 109px" @click="onstatus" >设置机台状态</el-button>
|
|
|
+ <el-button type="primary" size="large" class="bt" style="color:white;font-size: 17px;font-weight: bold;width: 80px" @click="onyinban">印版领退</el-button>
|
|
|
+ <el-button type="primary" size="large" class="bt" style="color:white;font-size: 17px;font-weight: bold;width: 80px" @click="onClear" >换型清场</el-button>
|
|
|
+ <el-button type="primary" size="large" class="bt" style="color:white;font-size: 17px;font-weight: bold;width: 80px" @click="pd_gdprintonClick" >工单打印</el-button>
|
|
|
+ <el-button type="primary" size="large" class="bt" style="color:white;font-size: 17px;font-weight: bold;width: 109px" @click="gzSel" >员工工资查询</el-button>
|
|
|
+ <el-button type="primary" size="large" class="bt" style="color:white;font-size: 17px;font-weight: bold;width: 80px" @click="oncomplaints" >客诉记录</el-button>
|
|
|
</div>
|
|
|
</header>
|
|
|
|
|
|
@@ -43,8 +43,8 @@
|
|
|
<!-- </el-form-item>-->
|
|
|
<el-row :gutter="20">
|
|
|
<el-col :span="7">
|
|
|
- <el-form-item label="机台号" prop="id" >
|
|
|
- <el-input v-model="formData.机台号" placeholder="" />
|
|
|
+ <el-form-item label="机台号" prop="id" class="zy-label">
|
|
|
+ <el-input v-model="formData.机台号" placeholder="" />
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="8">
|
|
|
@@ -101,7 +101,7 @@
|
|
|
row-key="ID"
|
|
|
highlight-current-row="true"
|
|
|
border
|
|
|
-
|
|
|
+
|
|
|
:row-style="{ height: '20px'}"
|
|
|
:cell-style="{ padding: '0px'}"
|
|
|
:header-row-style="{ height: '20px'}"
|
|
|
@@ -334,7 +334,7 @@
|
|
|
:header-cell-style="{ padding: '0px' }"
|
|
|
:show-overflow-tooltip="true"
|
|
|
highlight-current-row="true" @row-click="BZhandle"
|
|
|
- style="width: 100%;height: 300px;margin-top: 0px;font-weight: bold;" border tooltip-effect="dark"
|
|
|
+ style="width: 100%;height: 300px;margin-top: 0px;font-weight: bold;" border tooltip-effect="dark"
|
|
|
:data="bzData" row-key="ID" @selection-change="BZSelectionChange">
|
|
|
<!-- <el-table-column type="selection" width="55" /> -->
|
|
|
<el-table-column align="left" label="机台" prop="JTMC" width="70"/>
|
|
|
@@ -373,7 +373,7 @@
|
|
|
<el-form-item label="班组编号" prop="id">
|
|
|
<el-select v-model="BZMC" placeholder="" >
|
|
|
<el-option label="A 班" value="A 班"></el-option>
|
|
|
- <el-option label="B 班" value="B 班"></el-option>
|
|
|
+ <el-option label="B 班" value="B 班"></el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
@@ -430,7 +430,7 @@
|
|
|
|
|
|
|
|
|
<el-col :span="3">
|
|
|
- <el-input v-model="formDatas.code1" @keyup.enter.native="getbzyg($event, '1')" placeholder="" />
|
|
|
+ <el-input v-model="formDatas.code1" @keyup.enter.native="getbzyg($event, '1')" placeholder="" class="hei—input"/>
|
|
|
</el-col>
|
|
|
<el-col :span="3">
|
|
|
<el-input v-model="formDatas.code2" @keyup.enter.native="getbzyg($event, '2')" placeholder="" />
|
|
|
@@ -578,21 +578,21 @@
|
|
|
</div>
|
|
|
<div style="height: 50vh; width: 15vh;margin-top: 3vh;">
|
|
|
<el-button type="text"></el-button>
|
|
|
- <el-button style="margin-bottom: 1vh; width:15vh;background-color:cornflowerblue;font-size: 1.5vh;font-weight: bold; color: purple;" @click="addBz" >新 增</el-button>
|
|
|
- <el-button style="margin-bottom: 1vh;width:15vh;background-color:cornflowerblue;font-size: 1.5vh;font-weight: bold; color: purple;" @click="selectBz" >更新当前班组</el-button>
|
|
|
- <el-button style="margin-bottom: 1vh;width:15vh;background-color:cornflowerblue;font-size: 1.5vh;font-weight: bold; color: purple;" @click="delBz" >删除当前班组</el-button>
|
|
|
- </div>
|
|
|
+ <el-button style="margin-bottom: 1vh; width:15vh;background-color:cornflowerblue;font-size: 2.0vh;font-weight: bold; color: white;" @click="addBz" >新 增</el-button>
|
|
|
+ <el-button style="margin-bottom: 1vh;width:15vh;background-color:cornflowerblue;font-size: 2.0vh;font-weight: bold; color: white;" @click="selectBz" >更新当前班组</el-button>
|
|
|
+ <el-button style="margin-bottom: 1vh;width:15vh;background-color:cornflowerblue;font-size: 2.0vh;font-weight: bold; color: white;" @click="delBz" >删除当前班组</el-button>
|
|
|
</div>
|
|
|
</div>
|
|
|
+ </div>
|
|
|
</el-dialog>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
- <el-dialog v-model="complaintsShow"
|
|
|
+ <el-dialog v-model="complaintsShow"
|
|
|
fullscreen
|
|
|
style="font-size: 50px;font-weight: bold;"
|
|
|
- lock-scroll :before-close="closecomplaintsShow"
|
|
|
+ lock-scroll :before-close="closecomplaintsShow"
|
|
|
title="产品客诉查询" destroy-on-close>
|
|
|
<el-table ref="multipleTable"
|
|
|
:row-style="{ height: '20px' }"
|
|
|
@@ -858,7 +858,7 @@
|
|
|
:row-class-name="rowClassName"
|
|
|
>
|
|
|
<el-table-column prop="检验项目" label="检验项目" width="110" />
|
|
|
-
|
|
|
+
|
|
|
<el-table-column label="不检测" width="70">
|
|
|
<template v-slot="scope">
|
|
|
<el-radio v-model="scope.row.selected" label="不检测">
|
|
|
@@ -866,7 +866,7 @@
|
|
|
</el-radio>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
-
|
|
|
+
|
|
|
<el-table-column label="合格" width="60">
|
|
|
<template v-slot="scope">
|
|
|
<el-radio v-model="scope.row.selected" label="合格">
|
|
|
@@ -874,7 +874,7 @@
|
|
|
</el-radio>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
-
|
|
|
+
|
|
|
<el-table-column label="不合格" width="70">
|
|
|
<template v-slot="scope">
|
|
|
<el-radio v-model="scope.row.selected" label="不合格">
|
|
|
@@ -882,7 +882,7 @@
|
|
|
</el-radio>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
-
|
|
|
+
|
|
|
<el-table-column prop="检测方法" label="检测方法" width="90" />
|
|
|
<el-table-column prop="检验频率" label="检验频率" width="200" />
|
|
|
<el-table-column prop="相关标准" label="相关标准" width="600" />
|
|
|
@@ -1514,7 +1514,7 @@
|
|
|
|
|
|
<el-dialog
|
|
|
v-model="chanliangVisible"
|
|
|
- title="日产量上报"
|
|
|
+ title="日产量上报"
|
|
|
fullscreen
|
|
|
style="font-size: 2vh;font-weight: bold;"
|
|
|
>
|
|
|
@@ -1592,7 +1592,7 @@
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
</div>
|
|
|
-
|
|
|
+
|
|
|
|
|
|
|
|
|
<div style="margin-top: 20px;">
|
|
|
@@ -1626,8 +1626,8 @@
|
|
|
</el-col>
|
|
|
|
|
|
</el-row>
|
|
|
-
|
|
|
-
|
|
|
+
|
|
|
+
|
|
|
<el-row :gutter="20" style="margin-top=0px; margin-bottom: 1px;">
|
|
|
<el-col :span="1" style="margin-top=0px; margin-bottom: 1px;">
|
|
|
</el-col>
|
|
|
@@ -1657,8 +1657,8 @@
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
-
|
|
|
-
|
|
|
+
|
|
|
+
|
|
|
<el-row :gutter="20" style="margin-top=0px; margin-bottom: 1vh;">
|
|
|
<el-col :span="1" style="margin-top=0px; margin-bottom: 1px;">
|
|
|
</el-col>
|
|
|
@@ -1692,7 +1692,7 @@
|
|
|
</div>
|
|
|
<el-row :gutter="10" style="margin-top: 1vh;">
|
|
|
<el-col :span="2">
|
|
|
- <el-input v-model="formData3.sczl_bzdh" id="bzdh" @keydown="ent($event, '辅电表', 'bzdh', 'bh1')" placeholder="ZI00401" />
|
|
|
+ <el-input v-model="formData3.sczl_bzdh" id="bzdh" @keydown="ent($event, '辅电表', 'bzdh', 'bh1')" placeholder="" />
|
|
|
</el-col>
|
|
|
<el-col :span="2">
|
|
|
<el-input v-model="formData3.sczl_bh1" id="bh1" @keydown="ent($event, 'bzdh', 'bh1', 'bh2')" @keyup.enter.native="getygsubmit($event, '1')" placeholder="" />
|
|
|
@@ -1728,12 +1728,12 @@
|
|
|
<el-input v-model="formData3.sczl_bh11" id="bh11" @keydown="ent($event, 'bh10', 'bh11', 'name1')" @keyup.enter.native="getygsubmit($event, '11')" placeholder="" />
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
<el-row :gutter="10" style="margin-top: 10px;">
|
|
|
<el-col :span="2">
|
|
|
-
|
|
|
+
|
|
|
</el-col>
|
|
|
<el-col :span="2">
|
|
|
<el-input v-model="formData3.sczl_name1" id="name1" @keydown="ent($event, 'bh11', 'name1', 'name2')" placeholder="" />
|
|
|
@@ -1769,10 +1769,10 @@
|
|
|
<el-input v-model="formData3.sczl_name11" id="name11" @keydown="ent($event, 'name10', 'name11', 'rate1')" placeholder="" />
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
-
|
|
|
+
|
|
|
<el-row :gutter="10" style="margin-top: 10px;">
|
|
|
<el-col :span="2">
|
|
|
-
|
|
|
+
|
|
|
</el-col>
|
|
|
<el-col :span="2">
|
|
|
<el-input v-model="formData3.sczl_rate1" id="rate1" @keydown="ent($event, 'name11', 'rate1', 'rate2')" placeholder="" />
|
|
|
@@ -1808,7 +1808,7 @@
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
</div>
|
|
|
-
|
|
|
+
|
|
|
|
|
|
<el-table
|
|
|
tooltip-effect="dark"
|
|
|
@@ -2163,41 +2163,41 @@
|
|
|
</div>
|
|
|
</template>
|
|
|
</el-dialog>
|
|
|
-
|
|
|
- <el-dialog v-model="gzSelVisible" title="员工工资明细查询"
|
|
|
- destroy-on-close fullscreen
|
|
|
- style="font-size: 50px;font-weight: bold;"
|
|
|
- >
|
|
|
+
|
|
|
+ <el-dialog v-model="gzSelVisible" title="员工工资明细查询"
|
|
|
+ destroy-on-close fullscreen
|
|
|
+ style="font-size: 50px;font-weight: bold;"
|
|
|
+ >
|
|
|
<el-button v-for="ygbh in gz_bzbh" type="primary" @click="gz_ontable(ygbh)">{{ ygbh }}</el-button>
|
|
|
<!-- 数据展示 -->
|
|
|
- <el-table ref="gz_multipleTable" style="width: 100%;height: 40vh;padding-top: 5px;" tooltip-effect="dark" :data="gz_tableData" row-key="ID"
|
|
|
+ <el-table ref="gz_multipleTable" style="width: 100%;height: 40vh;padding-top: 5px;" tooltip-effect="dark" :data="gz_tableData" row-key="ID"
|
|
|
highlight-current-row="true" border :show-overflow-tooltip="true"
|
|
|
- :row-style="{ height: '20px' }"
|
|
|
+ :row-style="{ height: '20px' }"
|
|
|
:cell-style="{ padding: '0px' }" :header-row-style="{ height: '20px' }"
|
|
|
- :header-cell-style="{ padding: '0px' }"
|
|
|
+ :header-cell-style="{ padding: '0px' }"
|
|
|
>
|
|
|
- <el-table-column v-for="column in tableCols1"
|
|
|
- :key="column.prop" :prop="column.prop"
|
|
|
- :label="column.label" :width="column.width"
|
|
|
- show-overflow-tooltip="true" sortable
|
|
|
- />
|
|
|
+ <el-table-column v-for="column in tableCols1"
|
|
|
+ :key="column.prop" :prop="column.prop"
|
|
|
+ :label="column.label" :width="column.width"
|
|
|
+ show-overflow-tooltip="true" sortable
|
|
|
+ />
|
|
|
</el-table>
|
|
|
<!-- 数据展示 -->
|
|
|
<el-table ref="gz_multipleTable2" style="width: 100%;height: 40vh;padding-top: 30px;" tooltip-effect="dark" :data="gz_tableData2" row-key="ID"
|
|
|
- highlight-current-row="true" border
|
|
|
- :row-style="{ height: '20px' }"
|
|
|
- :cell-style="{ padding: '0px' }" :header-row-style="{ height: '20px' }"
|
|
|
- :header-cell-style="{ padding: '0px' }"
|
|
|
- :show-overflow-tooltip="true"
|
|
|
+ highlight-current-row="true" border
|
|
|
+ :row-style="{ height: '20px' }"
|
|
|
+ :cell-style="{ padding: '0px' }" :header-row-style="{ height: '20px' }"
|
|
|
+ :header-cell-style="{ padding: '0px' }"
|
|
|
+ :show-overflow-tooltip="true"
|
|
|
>
|
|
|
- <el-table-column v-for="column in tableCols2"
|
|
|
- :key="column.prop" :prop="column.prop"
|
|
|
- :label="column.label" :width="column.width"
|
|
|
- show-overflow-tooltip="true" sortable
|
|
|
+ <el-table-column v-for="column in tableCols2"
|
|
|
+ :key="column.prop" :prop="column.prop"
|
|
|
+ :label="column.label" :width="column.width"
|
|
|
+ show-overflow-tooltip="true" sortable
|
|
|
/>
|
|
|
- </el-table>
|
|
|
- </el-dialog>
|
|
|
-
|
|
|
+ </el-table>
|
|
|
+ </el-dialog>
|
|
|
+
|
|
|
<Shebeizhuangtai
|
|
|
v-if="dialogSbyxgl"
|
|
|
v-model="dialogSbyxgl"
|
|
|
@@ -2282,8 +2282,8 @@ import {
|
|
|
MachineDetailList,
|
|
|
facilityPrintGetTab,
|
|
|
facilityPrintDetail,
|
|
|
- facilityProcedure,
|
|
|
- dailysearch,
|
|
|
+ facilityProcedure,
|
|
|
+ dailysearch,
|
|
|
dailygetGzByYgbh,
|
|
|
} from '@/api/jixiaoguanli/jitairibaobiao'
|
|
|
|
|
|
@@ -2296,11 +2296,11 @@ import { getDictFunc, formatDate, formatBoolean, filterDict, ReturnArrImg, onDow
|
|
|
import { ElMessage, ElMessageBox } from 'element-plus'
|
|
|
import { ref, reactive } from 'vue'
|
|
|
import Shebeizhuangtai from '@/view/performance/09-workOrderVerification/componets/shebeizhuangtai.vue'
|
|
|
-import { useUserStore } from '@/pinia/modules/user'
|
|
|
+import { useUserStore } from '@/pinia/modules/user'
|
|
|
import PrintPage from '../yunyin/shengchanguanli/components/print.vue'
|
|
|
-
|
|
|
+
|
|
|
const printPageRef = ref()
|
|
|
-const userStore = useUserStore()
|
|
|
+const userStore = useUserStore()
|
|
|
const sys_id='['+userStore.userInfo.userName+'/'+userStore.userInfo.nickName+']'
|
|
|
const dialogSbyxgl=ref(false)
|
|
|
const zhichengstatus=ref(false)
|
|
|
@@ -2333,15 +2333,15 @@ const sbzyData = reactive([])
|
|
|
const FPData = reactive([])
|
|
|
const CLMXData = reactive([])
|
|
|
let JYData = reactive([])
|
|
|
-
|
|
|
-//工单打印
|
|
|
-const pd_gdprintonClick = () => {
|
|
|
- if(formData.value.工单编号==''){
|
|
|
- ElMessage({ type: 'warning', message: '未获取到工单' });
|
|
|
- return
|
|
|
+
|
|
|
+//工单打印
|
|
|
+const pd_gdprintonClick = () => {
|
|
|
+ if(formData.value.工单编号==''){
|
|
|
+ ElMessage({ type: 'warning', message: '未获取到工单' });
|
|
|
+ return
|
|
|
}
|
|
|
printPageRef.value.open(formData.value.工单编号)
|
|
|
-}
|
|
|
+}
|
|
|
|
|
|
//键盘 input框跳转
|
|
|
const ent = (event,id1,id2,id3) => {
|
|
|
@@ -2705,7 +2705,7 @@ const SetMachineTeams = async(row) => {
|
|
|
}
|
|
|
}
|
|
|
const clickybupdate = async (row) => {
|
|
|
-
|
|
|
+
|
|
|
ElMessageBox.confirm('确定切换当前班组人员为工作班组人员吗?', '提示', {
|
|
|
confirmButtonText: '确定',
|
|
|
cancelButtonText: '取消',
|
|
|
@@ -2732,9 +2732,9 @@ const clickybupdate = async (row) => {
|
|
|
// }
|
|
|
}
|
|
|
const setTeams = async(row) => {
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
formData.value.班组Id=row.ID
|
|
|
BZMC.value=row.班组号
|
|
|
console.log(row)
|
|
|
@@ -2751,7 +2751,7 @@ const setTeams = async(row) => {
|
|
|
sczl_namekey=`sczl_name${i+1}`
|
|
|
formData.value[sczl_bhkey] =row[i].split(' ')[0];
|
|
|
formData.value[sczl_namekey] = row[i].split(' ')[1];
|
|
|
- // console.log(formData)
|
|
|
+ // console.log(formData)
|
|
|
}
|
|
|
console.log(formData)
|
|
|
|
|
|
@@ -2860,7 +2860,7 @@ const GetYg = async (value,inputName) => {
|
|
|
console.log(Bbh)
|
|
|
formData3.value[Bname]=response.data.ygxm
|
|
|
formData3.value[Bbh]=response.data.员工编号
|
|
|
-
|
|
|
+
|
|
|
// console.log(formData.value[Bname])
|
|
|
}
|
|
|
}
|
|
|
@@ -2900,7 +2900,7 @@ const yinbantreeData=ref([])
|
|
|
const fujiaselectData=ref([])
|
|
|
const searchInfo = ref({})
|
|
|
|
|
|
-const onHxadd = () => {
|
|
|
+const onHxadd = () => {
|
|
|
huanxingstatus.value=true
|
|
|
huanxingType.value=true
|
|
|
huanxingStatus.value=1
|
|
|
@@ -3214,23 +3214,23 @@ const yinbanNodeClick = (node, check, nodeData) => {
|
|
|
}
|
|
|
};
|
|
|
const onyinban = async() => {
|
|
|
- console.log(formData.value)
|
|
|
- if(formData.value.产品代号==''){
|
|
|
- ElMessage({
|
|
|
- type: 'warning',
|
|
|
- message: '该工单没有产品编号'
|
|
|
- })
|
|
|
- return false
|
|
|
+ console.log(formData.value)
|
|
|
+ if(formData.value.产品代号==''){
|
|
|
+ ElMessage({
|
|
|
+ type: 'warning',
|
|
|
+ message: '该工单没有产品编号'
|
|
|
+ })
|
|
|
+ return false
|
|
|
}
|
|
|
const res = await facilityPrintGetTab({productCode:formData.value.产品代号})
|
|
|
// const res = await facilityPrintGetTab({productCode:'104601001'})
|
|
|
- if(res.code===0){
|
|
|
- if(res.data==null){
|
|
|
- ElMessage({
|
|
|
- type: 'warning',
|
|
|
- message: '该产品没有印版资料'
|
|
|
- })
|
|
|
- return false
|
|
|
+ if(res.code===0){
|
|
|
+ if(res.data==null){
|
|
|
+ ElMessage({
|
|
|
+ type: 'warning',
|
|
|
+ message: '该产品没有印版资料'
|
|
|
+ })
|
|
|
+ return false
|
|
|
}
|
|
|
yinbantreeData.value=[{
|
|
|
label:'产品印版库',
|
|
|
@@ -3284,7 +3284,7 @@ const onYbout = async() => {
|
|
|
})
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
}
|
|
|
const onYbback = async() => {
|
|
|
const arr=[]
|
|
|
@@ -3371,97 +3371,97 @@ function onClear() {
|
|
|
huanxingstatus.value=false
|
|
|
huanxingVisible.value=true
|
|
|
RemodelGetTab()
|
|
|
-}
|
|
|
-
|
|
|
-const gzSelVisible = ref(false)
|
|
|
+}
|
|
|
+
|
|
|
+const gzSelVisible = ref(false)
|
|
|
const gz_tableData = reactive([])
|
|
|
-const gz_tableData2 = reactive([])
|
|
|
-let gz_bzbh = [];
|
|
|
-
|
|
|
-const tableCols1 = [
|
|
|
- { label: '员工编号', prop: 'bh', width: '105' },
|
|
|
- { label: '员工姓名', prop: '员工姓名', width: '105' },
|
|
|
- { label: '日期', prop: 'sczl_rq', width: '120' },
|
|
|
- { label: '计件工资', prop: '计件工资', width: '105' },
|
|
|
- { label: '加班工资', prop: '加班工资', width: '105' },
|
|
|
- { label: '计时时数', prop: '计时时数', width: '105' },
|
|
|
- { label: '计时工资', prop: '计时工资', width: '135' },
|
|
|
- { label: '日工资合计', prop: '日工资合计', width: '135' },
|
|
|
-]
|
|
|
-const tableCols2 = [
|
|
|
- { label: '日期', prop: 'sczl_rq', width: '100' },
|
|
|
- { label: '工单编号', prop: 'sczl_gdbh', width: '105' },
|
|
|
- { label: '产品名称', prop: 'Gd_cpmc', width: '120' },
|
|
|
- { label: '印件及工序', prop: 'sczl_type', width: '120' },
|
|
|
- { label: '机台', prop: 'sczl_jtbh', width: '87' },
|
|
|
- { label: '车头产量', prop: '班组车头产量', width: '105' },
|
|
|
- { label: '计件产量', prop: '计件产量', width: '105' },
|
|
|
- { label: '补产产量', prop: '补产产量', width: '105' },
|
|
|
- { label: '核算产量', prop: '核算产量', width: '105' },
|
|
|
- { label: '达标定额', prop: '达标定额', width: '105' },
|
|
|
- { label: '千件工价', prop: '千件工价', width: '105' },
|
|
|
- { label: '计件工资', prop: '个人计件工资', width: '105' },
|
|
|
- { label: '加班工资', prop: '个人加班工资', width: '105' },
|
|
|
- { label: '装版工时', prop: '装版工时', width: '120' },
|
|
|
- { label: '保养工时', prop: '保养工时', width: '105' },
|
|
|
- { label: '打样工时', prop: '打样工时', width: '105' },
|
|
|
- { label: '异常停机', prop: '异常停机工时', width: '105' },
|
|
|
- { label: '补产标准', prop: '补产标准', width: '120' },
|
|
|
- { label: '分摊比例', prop: 'Rate', width: '105' },
|
|
|
-]
|
|
|
-
|
|
|
-//员工工资查询
|
|
|
-const gzSel = () =>{
|
|
|
- if(formData.value.班组成员.length==0){
|
|
|
- ElMessage({ type: 'warning', message: '未获取到员工' });
|
|
|
- return
|
|
|
- }
|
|
|
- for (let index in formData.value.班组成员) {
|
|
|
- gz_bzbh[index] = formData.value.班组成员[index]['编号']
|
|
|
- }
|
|
|
- gzSelVisible.value=true
|
|
|
-}
|
|
|
+const gz_tableData2 = reactive([])
|
|
|
+let gz_bzbh = [];
|
|
|
+
|
|
|
+const tableCols1 = [
|
|
|
+ { label: '员工编号', prop: 'bh', width: '105' },
|
|
|
+ { label: '员工姓名', prop: '员工姓名', width: '105' },
|
|
|
+ { label: '日期', prop: 'sczl_rq', width: '120' },
|
|
|
+ { label: '计件工资', prop: '计件工资', width: '105' },
|
|
|
+ { label: '加班工资', prop: '加班工资', width: '105' },
|
|
|
+ { label: '计时时数', prop: '计时时数', width: '105' },
|
|
|
+ { label: '计时工资', prop: '计时工资', width: '135' },
|
|
|
+ { label: '日工资合计', prop: '日工资合计', width: '135' },
|
|
|
+]
|
|
|
+const tableCols2 = [
|
|
|
+ { label: '日期', prop: 'sczl_rq', width: '100' },
|
|
|
+ { label: '工单编号', prop: 'sczl_gdbh', width: '105' },
|
|
|
+ { label: '产品名称', prop: 'Gd_cpmc', width: '120' },
|
|
|
+ { label: '印件及工序', prop: 'sczl_type', width: '120' },
|
|
|
+ { label: '机台', prop: 'sczl_jtbh', width: '87' },
|
|
|
+ { label: '车头产量', prop: '班组车头产量', width: '105' },
|
|
|
+ { label: '计件产量', prop: '计件产量', width: '105' },
|
|
|
+ { label: '补产产量', prop: '补产产量', width: '105' },
|
|
|
+ { label: '核算产量', prop: '核算产量', width: '105' },
|
|
|
+ { label: '达标定额', prop: '达标定额', width: '105' },
|
|
|
+ { label: '千件工价', prop: '千件工价', width: '105' },
|
|
|
+ { label: '计件工资', prop: '个人计件工资', width: '105' },
|
|
|
+ { label: '加班工资', prop: '个人加班工资', width: '105' },
|
|
|
+ { label: '装版工时', prop: '装版工时', width: '120' },
|
|
|
+ { label: '保养工时', prop: '保养工时', width: '105' },
|
|
|
+ { label: '打样工时', prop: '打样工时', width: '105' },
|
|
|
+ { label: '异常停机', prop: '异常停机工时', width: '105' },
|
|
|
+ { label: '补产标准', prop: '补产标准', width: '120' },
|
|
|
+ { label: '分摊比例', prop: 'Rate', width: '105' },
|
|
|
+]
|
|
|
+
|
|
|
+//员工工资查询
|
|
|
+const gzSel = () =>{
|
|
|
+ if(formData.value.班组成员.length==0){
|
|
|
+ ElMessage({ type: 'warning', message: '未获取到员工' });
|
|
|
+ return
|
|
|
+ }
|
|
|
+ for (let index in formData.value.班组成员) {
|
|
|
+ gz_bzbh[index] = formData.value.班组成员[index]['编号']
|
|
|
+ }
|
|
|
+ gzSelVisible.value=true
|
|
|
+}
|
|
|
// 查询
|
|
|
-const gz_ontable = (ygbh) => {
|
|
|
- // 创建一个Date对象
|
|
|
- var currentDate = new Date();
|
|
|
- // 获取年份
|
|
|
- var year = currentDate.getFullYear();
|
|
|
- // 获取月份(注意,月份从0开始,所以需要加1)
|
|
|
- var month = currentDate.getMonth() + 1;
|
|
|
- if (month < 10) {
|
|
|
- month = "0" + month;
|
|
|
- }
|
|
|
+const gz_ontable = (ygbh) => {
|
|
|
+ // 创建一个Date对象
|
|
|
+ var currentDate = new Date();
|
|
|
+ // 获取年份
|
|
|
+ var year = currentDate.getFullYear();
|
|
|
+ // 获取月份(注意,月份从0开始,所以需要加1)
|
|
|
+ var month = currentDate.getMonth() + 1;
|
|
|
+ if (month < 10) {
|
|
|
+ month = "0" + month;
|
|
|
+ }
|
|
|
var date = year+ "" +month
|
|
|
- const response = dailysearch({date: date, search: ygbh}).then(response=>{
|
|
|
- if (response.code === 0) {
|
|
|
- const originalData = response.data;
|
|
|
- const summaryData = generateSummaryData(originalData);
|
|
|
- // 将合计数据插入到原始数据中
|
|
|
- const combinedData = [];
|
|
|
- originalData.forEach((item, index) => {
|
|
|
- combinedData.push(item);
|
|
|
- const nextItem = originalData[index + 1];
|
|
|
- if (nextItem==undefined) {
|
|
|
- // 如果下一个员工姓名与当前不同,插入合计数据
|
|
|
- const currentSummary = summaryData.shift();
|
|
|
- combinedData.push(currentSummary);
|
|
|
-
|
|
|
- }
|
|
|
- });
|
|
|
- // 更新表格数据
|
|
|
- gz_tableData.splice(0, gz_tableData.length, ...combinedData);
|
|
|
- }
|
|
|
- });
|
|
|
-
|
|
|
- dailygetGzByYgbh({date:date,code:ygbh}).then(response=>{
|
|
|
- if(response.code==0){
|
|
|
- gz_tableData2.splice(0, gz_tableData2.length, ...response.data);
|
|
|
- }
|
|
|
+ const response = dailysearch({date: date, search: ygbh}).then(response=>{
|
|
|
+ if (response.code === 0) {
|
|
|
+ const originalData = response.data;
|
|
|
+ const summaryData = generateSummaryData(originalData);
|
|
|
+ // 将合计数据插入到原始数据中
|
|
|
+ const combinedData = [];
|
|
|
+ originalData.forEach((item, index) => {
|
|
|
+ combinedData.push(item);
|
|
|
+ const nextItem = originalData[index + 1];
|
|
|
+ if (nextItem==undefined) {
|
|
|
+ // 如果下一个员工姓名与当前不同,插入合计数据
|
|
|
+ const currentSummary = summaryData.shift();
|
|
|
+ combinedData.push(currentSummary);
|
|
|
+
|
|
|
+ }
|
|
|
+ });
|
|
|
+ // 更新表格数据
|
|
|
+ gz_tableData.splice(0, gz_tableData.length, ...combinedData);
|
|
|
+ }
|
|
|
+ });
|
|
|
+
|
|
|
+ dailygetGzByYgbh({date:date,code:ygbh}).then(response=>{
|
|
|
+ if(response.code==0){
|
|
|
+ gz_tableData2.splice(0, gz_tableData2.length, ...response.data);
|
|
|
+ }
|
|
|
})
|
|
|
-
|
|
|
-}
|
|
|
-
|
|
|
+
|
|
|
+}
|
|
|
+
|
|
|
const generateSummaryData = (data) => {
|
|
|
const summaryData = [];
|
|
|
let currentName = null;
|
|
|
@@ -3477,7 +3477,7 @@ const generateSummaryData = (data) => {
|
|
|
}
|
|
|
// 创建新的合计数据
|
|
|
currentSummary = {
|
|
|
- '员工姓名': name,
|
|
|
+ '员工姓名': name,
|
|
|
'日期': 0,
|
|
|
'计件工资': 0,
|
|
|
'加班工资': 0,
|
|
|
@@ -3488,7 +3488,7 @@ const generateSummaryData = (data) => {
|
|
|
currentName = name;
|
|
|
}
|
|
|
|
|
|
- // 更新合计数据
|
|
|
+ // 更新合计数据
|
|
|
currentSummary['日期']++;
|
|
|
currentSummary['计件工资'] += parseFloat(item['计件工资']);
|
|
|
currentSummary['加班工资'] += parseFloat(item['加班工资']);
|
|
|
@@ -3513,8 +3513,8 @@ const generateSummaryData = (data) => {
|
|
|
});
|
|
|
|
|
|
return summaryData;
|
|
|
-};
|
|
|
-
|
|
|
+};
|
|
|
+
|
|
|
|
|
|
const RemodelGetTab = async() => {
|
|
|
const response = await remodelGetTab()
|
|
|
@@ -3546,17 +3546,17 @@ const RemodelGetTab = async() => {
|
|
|
const SetMachineStatus = async (row) => {
|
|
|
let classString = '';
|
|
|
const sczl_bh_values = [formData.value.sczl_bh1, formData.value.sczl_bh2, formData.value.sczl_bh3, formData.value.sczl_bh4, formData.value.sczl_bh5, formData.value.sczl_bh6];
|
|
|
-
|
|
|
+
|
|
|
for (let i = 0; i < sczl_bh_values.length; i++) {
|
|
|
if (sczl_bh_values[i]) {
|
|
|
classString += sczl_bh_values[i] + ',';
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
// 去除最后一个逗号
|
|
|
classString = classString.slice(0, -1);
|
|
|
-
|
|
|
-
|
|
|
+
|
|
|
+
|
|
|
const response = await setMachineStatus({
|
|
|
machine: JTMC.split("#")[0],
|
|
|
order:row['工单编号|质量信息'].split('|')[0],
|
|
|
@@ -4644,7 +4644,7 @@ const selectBz = async() => {
|
|
|
}
|
|
|
}
|
|
|
const delBz = async() => {
|
|
|
-
|
|
|
+
|
|
|
const UniqId=currentBz.value.ID
|
|
|
if(currentBz.value){
|
|
|
ElMessageBox.confirm('确定要删除吗?', '提示', {
|
|
|
@@ -4662,7 +4662,7 @@ const delBz = async() => {
|
|
|
console.log(response)
|
|
|
FacilityProduction()
|
|
|
}
|
|
|
- });
|
|
|
+ });
|
|
|
})
|
|
|
currentBz.value={}
|
|
|
}
|
|
|
@@ -4762,7 +4762,7 @@ const yjupdateCompanyFunc = async(row) => {
|
|
|
const setMachineTeams = async(row) => {
|
|
|
console.log(row.UniqId)
|
|
|
console.log(row)
|
|
|
- const res = await setMachineTeam({
|
|
|
+ const res = await setMachineTeam({
|
|
|
machine: JTMC.split("#")[0],
|
|
|
order:row['工单编号|质量信息'].split('|')[0],
|
|
|
yjno:row['印件资料'].split('-')[0],
|
|
|
@@ -4775,7 +4775,7 @@ const setMachineTeams = async(row) => {
|
|
|
})
|
|
|
MachineWorkOrderEdits(row)
|
|
|
if (res.code === 0) {
|
|
|
- // EquipmentSchedulingEdits(row)
|
|
|
+ // EquipmentSchedulingEdits(row)
|
|
|
ElMessage({
|
|
|
type: 'success',
|
|
|
message: '成功'
|
|
|
@@ -5000,7 +5000,7 @@ const bzryplanUsageCellClass = ({row, column, rowIndex, columnIndex}) =>{
|
|
|
.gva-search-box{
|
|
|
font-size:1.5vh;
|
|
|
color:red;
|
|
|
- font-weight: bold;
|
|
|
+ font-weight: bold;
|
|
|
}
|
|
|
.bt {
|
|
|
margin-top: 1vh;
|
|
|
@@ -5015,12 +5015,32 @@ const bzryplanUsageCellClass = ({row, column, rowIndex, columnIndex}) =>{
|
|
|
font-size: 15px;
|
|
|
}
|
|
|
.red-input input {
|
|
|
- color: red !important;
|
|
|
+ color: red !important;
|
|
|
}
|
|
|
-/* 选中某行时的背景色*/
|
|
|
+
|
|
|
+.buleaa-input input{
|
|
|
+ color: red !important;
|
|
|
+}
|
|
|
+
|
|
|
+/* 选中某行时的背景色*/font-weight: bold;
|
|
|
:deep(.el-table__body tr.current-row)>td {
|
|
|
background: #ff80ff !important;
|
|
|
}
|
|
|
+::v-deep .el-input__inner {
|
|
|
+ color: #000000 !important;
|
|
|
+ font-weight: bold;
|
|
|
+}
|
|
|
+::v-deep .el-form-item__label {
|
|
|
+ color: #000000 !important;
|
|
|
+ font-weight: bold;
|
|
|
+}
|
|
|
+::v-deep .el-tabs__item {
|
|
|
+ /*color: #000000 !important;*/
|
|
|
+ font-weight: bold;
|
|
|
+
|
|
|
+}
|
|
|
+
|
|
|
+
|
|
|
|
|
|
|
|
|
</style>
|