From bed893abbebac6a1e43478b693e1f862a6b6c8fe Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期六, 09 七月 2022 17:25:20 +0800
Subject: [PATCH] 1.生产开报工实现部分2.修改bug
---
src/views/scgl/sckbg.vue | 263 ++++++++++++++++++++++++++++++++-------------------
1 files changed, 164 insertions(+), 99 deletions(-)
diff --git a/src/views/scgl/sckbg.vue b/src/views/scgl/sckbg.vue
index 378bd37..9c3ac1c 100644
--- a/src/views/scgl/sckbg.vue
+++ b/src/views/scgl/sckbg.vue
@@ -9,7 +9,7 @@
<div style="width: 70px">宸ュ簭鐮侊細</div>
<el-input
v-model="produceCode"
- oninput="value=value.replace(/[^0-9.]/g,'')"
+ oninput="value=value.replace(/[^0-9a-zA-Z;]/g,'')"
name="produceCode"
style="width: 500px"
@keyup.enter.native="val=>enterNative(val,'produceCode')"
@@ -39,87 +39,103 @@
:cell-style="this.$cellStyle"
@sort-change="sortChange"
>
- <!-- <el-table-column-->
- <!-- type="selection"-->
- <!-- width="50"-->
- <!-- />-->
- <el-table-column
- width="50"
- >
- <template slot-scope="{row}">
- <!-- <el-radio-->
- <!-- v-model="radioSelected"-->
- <!-- :label="row.wo"-->
- <!-- style="color: #fff;padding-left: 10px; margin-right: -25px;"-->
- <!-- @change.native="getCurrentRow(row.wo)"-->
- <!-- />-->
- </template>
- </el-table-column>
+ <!-- <el-table-column-->
+ <!-- width="50"-->
+ <!-- >-->
+ <!-- <template slot-scope="{row}">-->
+ <!-- <!– <el-radio–>-->
+ <!-- <!– v-model="radioSelected"–>-->
+ <!-- <!– :label="row.wo"–>-->
+ <!-- <!– style="color: #fff;padding-left: 10px; margin-right: -25px;"–>-->
+ <!-- <!– @change.native="getCurrentRow(row.wo)"–>-->
+ <!-- <!– />–>-->
+ <!-- </template>-->
+ <!-- </el-table-column>-->
<el-table-column
prop="RowNum"
width="50"
label="搴忓彿"
/>
<el-table-column
- prop="org_code"
+ prop="status"
label="鐘舵��"
sortable="custom"
- />
+ width="110"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.status==='NEW'">鏂拌鍗�</div>
+ <div v-if="row.status==='ALLO'">宸叉淳鍙�</div>
+ <div v-if="row.status==='START'">寮�宸�</div>
+ <div v-if="row.status==='CLOSED'">瀹屽伐</div>
+ </template>
+ </el-table-column>
<el-table-column
- prop="org_name"
+ prop="wo_code"
label="宸ュ崟鍙�"
sortable="custom"
+ width="160"
/>
<el-table-column
- prop="description"
+ prop="partcode"
label="浜у搧缂栫爜"
sortable="custom"
+ width="150"
/>
<el-table-column
- prop="parentorg_name"
+ prop="partname"
label="浜у搧鍚嶇О"
sortable="custom"
+ width="150"
/>
<el-table-column
- prop="parentorg_name"
+ prop="seq"
+ width="80"
label="宸ュ簭"
sortable="custom"
/>
<el-table-column
- prop="parentorg_name"
+ prop="descr"
label="宸ュ簭鎻忚堪"
+ width="150"
sortable="custom"
/>
<el-table-column
- prop="parentorg_name"
+ prop="plan_qty"
label="浠诲姟鏁伴噺"
+ width="150"
sortable="custom"
/>
<el-table-column
- prop="parentorg_name"
+ prop="good_qty"
label="宸叉姤宸ユ暟閲�"
sortable="custom"
+ width="150"
/>
<el-table-column
- prop="lm_user"
+ prop="ng_qty"
label="涓嶈壇鏁伴噺"
+ width="150"
+
sortable="custom"
/>
<el-table-column
- prop="lm_date"
+ prop="plan_startdate"
label="璁″垝寮�宸ユ棩鏈�"
+ width="185"
sortable="custom"
/>
- <el-table-column
- label="鎿嶄綔"
- >
- <template slot-scope="{row}">
- <div class="operationClass">
- <el-button type="text" @click="edit('edit',row)">缂栬緫</el-button>
- <el-button type="text" @click="del(row)">鍒犻櫎</el-button>
- </div>
- </template>
- </el-table-column>
+ <!-- <el-table-column-->
+ <!-- label="鎿嶄綔"-->
+ <!-- width="150"-->
+ <!-- fixed="right"-->
+ <!-- >-->
+ <!-- <template slot-scope="{row}">-->
+ <!-- <div class="operationClass">-->
+ <!-- <el-button type="text" @click="edit('edit',row)">缂栬緫</el-button>-->
+ <!-- <el-button type="text" @click="del(row)">鍒犻櫎</el-button>-->
+ <!-- </div>-->
+ <!-- </template>-->
+ <!-- </el-table-column>-->
</el-table>
</div>
<!--鍒嗛〉-->
@@ -140,7 +156,7 @@
<div style="width: 70px">宸ュ簭鐮侊細</div>
<el-input
v-model="WXproduceCode"
- oninput="value=value.replace(/[^0-9.]/g,'')"
+ oninput="value=value.replace(/[^0-9a-zA-Z;]/g,'')"
name="WXproduceCode"
style="width: 500px"
@keyup.enter.native="val=>enterNative(val,'WXproduceCode')"
@@ -170,87 +186,103 @@
:cell-style="this.$cellStyle"
@sort-change="sortChange"
>
- <!-- <el-table-column-->
- <!-- type="selection"-->
- <!-- width="50"-->
- <!-- />-->
- <el-table-column
- width="50"
- >
- <template slot-scope="{row}">
- <!-- <el-radio-->
- <!-- v-model="radioSelected"-->
- <!-- :label="row.wo"-->
- <!-- style="color: #fff;padding-left: 10px; margin-right: -25px;"-->
- <!-- @change.native="getCurrentRow(row.wo)"-->
- <!-- />-->
- </template>
- </el-table-column>
+ <!-- <el-table-column-->
+ <!-- width="50"-->
+ <!-- >-->
+ <!-- <template slot-scope="{row}">-->
+ <!-- <!– <el-radio–>-->
+ <!-- <!– v-model="radioSelected"–>-->
+ <!-- <!– :label="row.wo"–>-->
+ <!-- <!– style="color: #fff;padding-left: 10px; margin-right: -25px;"–>-->
+ <!-- <!– @change.native="getCurrentRow(row.wo)"–>-->
+ <!-- <!– />–>-->
+ <!-- </template>-->
+ <!-- </el-table-column>-->
<el-table-column
prop="RowNum"
width="50"
label="搴忓彿"
/>
<el-table-column
- prop="org_code"
+ prop="status"
label="鐘舵��"
sortable="custom"
- />
+ width="110"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.status==='NEW'">鏂拌鍗�</div>
+ <div v-if="row.status==='ALLO'">宸叉淳鍙�</div>
+ <div v-if="row.status==='START'">寮�宸�</div>
+ <div v-if="row.status==='CLOSED'">瀹屽伐</div>
+ </template>
+ </el-table-column>
<el-table-column
- prop="org_name"
+ prop="wo_code"
label="宸ュ崟鍙�"
sortable="custom"
+ width="160"
/>
<el-table-column
- prop="description"
+ prop="partcode"
label="浜у搧缂栫爜"
sortable="custom"
+ width="150"
/>
<el-table-column
- prop="parentorg_name"
+ prop="partname"
label="浜у搧鍚嶇О"
sortable="custom"
+ width="150"
/>
<el-table-column
- prop="parentorg_name"
+ prop="seq"
+ width="80"
label="宸ュ簭"
sortable="custom"
/>
<el-table-column
- prop="parentorg_name"
+ prop="descr"
label="宸ュ簭鎻忚堪"
+ width="150"
sortable="custom"
/>
<el-table-column
- prop="parentorg_name"
+ prop="plan_qty"
label="浠诲姟鏁伴噺"
+ width="150"
sortable="custom"
/>
<el-table-column
- prop="parentorg_name"
+ prop="good_qty"
label="宸叉姤宸ユ暟閲�"
sortable="custom"
+ width="150"
/>
<el-table-column
- prop="lm_user"
+ prop="ng_qty"
label="涓嶈壇鏁伴噺"
+ width="150"
+
sortable="custom"
/>
<el-table-column
- prop="lm_date"
+ prop="plan_startdate"
label="璁″垝寮�宸ユ棩鏈�"
+ width="185"
sortable="custom"
/>
- <el-table-column
- label="鎿嶄綔"
- >
- <template slot-scope="{row}">
- <div class="operationClass">
- <el-button type="text" @click="edit('edit',row)">缂栬緫</el-button>
- <el-button type="text" @click="del(row)">鍒犻櫎</el-button>
- </div>
- </template>
- </el-table-column>
+ <!-- <el-table-column-->
+ <!-- label="鎿嶄綔"-->
+ <!-- width="150"-->
+ <!-- fixed="right"-->
+ <!-- >-->
+ <!-- <template slot-scope="{row}">-->
+ <!-- <div class="operationClass">-->
+ <!-- <el-button type="text" @click="edit('edit',row)">缂栬緫</el-button>-->
+ <!-- <el-button type="text" @click="del(row)">鍒犻櫎</el-button>-->
+ <!-- </div>-->
+ <!-- </template>-->
+ <!-- </el-table-column>-->
</el-table>
</div>
<!--鍒嗛〉-->
@@ -282,8 +314,7 @@
>
<el-form ref="dialogForm" inline :model="dialogForm" label-width="110px">
<el-form-item label="宸ュ崟缂栧彿锛�">
- <!-- <el-input v-model="dialogForm.name"></el-input>-->
- <div style="width: 200px">PO2022050500001</div>
+ <div style="width: 200px">{{ dialogForm.wo_code }}</div>
</el-form-item>
<el-form-item label="浜у搧缂栫爜锛�">
<div style="width: 200px">427100</div>
@@ -310,6 +341,7 @@
<el-form-item label="鏈姤/宸叉姤锛�">
<div style="width: 200px">900/100</div>
</el-form-item>
+
<el-form-item v-if="dialogTitle==='鑷埗寮�濮�'" label="寮�宸ユ暟閲忥細">
<div style="width: 200px">1000</div>
</el-form-item>
@@ -547,11 +579,17 @@
import { AddUpdateOrganization, DeleteOrganization, OrganizationSearch, PrentOrganization } from '@/api/jcsz'
import { getCookie } from '@/utils/auth'
import $ from 'jquery'
-import { MesOrderStepReportSelectUserGroup, MesOrderStepSearch, MesOrderStepStartSelectEqp } from '@/api/scgl'
+import {
+ MesOrderGroupSelectUser,
+ MesOrderStepReportSelectUserGroup,
+ MesOrderStepSearch,
+ MesOrderStepStartSelectEqp,
+ MesOrderWxStepSearch
+} from '@/api/scgl'
const SER_HZ = /^[\u4e00-\u9fa5]+$/
export default {
- name: 'Zzjg',
+ name: 'SCKBG',
components: {
Pagination
},
@@ -580,18 +618,18 @@
produceCode: '', // 宸ュ簭鐮�
WXproduceCode: '', // 澶栧崗宸ュ簭鐮�
form: {
- orderstepqrcode: '', // 鎵弿鐨勪簩缁寸爜淇℃伅
- prop: 'lm_date', // 鎺掑簭瀛楁
- order: 'desc', // 鎺掑簭瀛楁
+ orderstepqrcode: 'PO202206280001_4;Step01', // 鎵弿鐨勪簩缁寸爜淇℃伅
+ prop: 'wo', // 鎺掑簭瀛楁
+ order: 'asc', // 鎺掑簭瀛楁
page: 1, // 绗嚑椤�
rows: 20 // 姣忛〉澶氬皯鏉�
},
total: 10,
tableData: [],
WXform: { // 澶栧崗琛ㄥ崟
- orderstepqrcode: '', // 鎵弿鐨勪簩缁寸爜淇℃伅
- prop: 'lm_date', // 鎺掑簭瀛楁
- order: 'desc', // 鎺掑簭瀛楁
+ orderstepqrcode: 'PO202206280001_4;Step01', // 鎵弿鐨勪簩缁寸爜淇℃伅
+ prop: 'wo_code', // 鎺掑簭瀛楁
+ order: 'asc', // 鎺掑簭瀛楁
page: 1, // 绗嚑椤�
rows: 20 // 姣忛〉澶氬皯鏉�
},
@@ -601,10 +639,17 @@
dialogVisible: false,
dialogTitle: '', // 鑷埗寮�濮嬨�佽嚜鍒舵姤宸ャ�佸鍗忓彂鏂欍�佸鍗忔敹鏂�
dialogForm: {
- OrgType: '',
- OrgCode: '',
- OrgName: '',
- SupUnit: ''// 涓婄骇鍗曚綅
+ wo_code: '', // 宸ュ崟缂栧彿
+ partcode: '', // 浜у搧缂栫爜
+ partname: '', // 浜у搧鍚嶇О
+ partspec: '', // 浜у搧瑙勬牸
+ currentstep: '', // 褰撳墠宸ュ簭
+ nextstep: '', // 涓嬩竴閬撳伐搴�
+ desr: '', // 宸ュ簭鎻忚堪
+ plan_qty: '', // 浠诲姟鏁伴噺
+ report_qty: '', // 宸叉姤鏁伴噺
+ noreport_qty: '' // 鏈姤鏁伴噺
+
},
userTableData: [
{ RowNum: 1, name: '寮犱笁' },
@@ -645,9 +690,14 @@
},
methods: {
async getMesOrderStepSearch() {
- // const res = await MesOrderStepSearch(this.form)
- // this.tableData = res.data
- // this.total = res.count
+ const res = await MesOrderStepSearch(this.form)
+ this.tableData = res.data
+ this.total = res.count
+ },
+ async MesOrderWxStepSearch() {
+ const res = await MesOrderWxStepSearch(this.WXform)
+ this.WXtableData = res.data
+ this.WXtotal = res.count
},
// 鎺掑簭鏀瑰彉鏃�
sortChange({ column, prop, order }) {
@@ -669,11 +719,13 @@
tabClick(val, d) {
console.log(val, d, 1)
if (this.$refs.elTabs.currentName === '0') {
+ this.getMesOrderStepSearch()
this.$nextTick(() => {
$("input[name='produceCode']")[0].focus()
})
}
if (this.$refs.elTabs.currentName === '1') {
+ this.MesOrderWxStepSearch()
this.$nextTick(() => {
$("input[name='WXproduceCode']")[0].focus()
})
@@ -698,29 +750,42 @@
this.getMesOrderStepSearch()
},
// 鑷埗寮�濮�
- ZZstart() {
+ async ZZstart() {
this.dialogTitle = '鑷埗寮�濮�'
- this.dialogVisible = true
+ // this.dialogVisible = true
+ this.dialogVisibleTrue()
+
+ const res = await MesOrderStepStartSelectEqp({ orderstepqrcode: produceCode })
},
// 鑷埗鎶ュ伐
ZZreport() {
this.dialogTitle = '鑷埗鎶ュ伐'
- this.dialogVisible = true
+ // this.dialogVisible = true
+ this.dialogVisibleTrue()
this.getUserTableData()
},
// 澶栧崗鍙戞枡
- WXsend() {
+ async WXsend() {
this.dialogTitle = '澶栧崗鍙戞枡'
- this.dialogVisible = true
+ this.dialogVisibleTrue()
+ // this.dialogVisible = true
+
+ // const { data: res } = await MesOrderStepReportSelectUserGroup()
+ // this.xx = res
},
// 澶栧崗鏀舵枡
WXback() {
this.dialogTitle = '澶栧崗鏀舵枡'
+ this.dialogVisibleTrue()
+ // this.dialogVisible = true
+ },
+ dialogVisibleTrue() {
this.dialogVisible = true
+ // this.dialogForm.wo_code=
},
// 鎶ュ伐鏌ヨ鐢ㄦ埛琛�
async getUserTableData() {
- // const res = await MesOrderGroupSelectUser({usergroupcode:this.})
+ // const { data: res } = await MesOrderGroupSelectUser({ usergroupcode: 'SC01' })
this.userTableData.forEach(item => {
let number = Math.random() * Math.random()// 浣滀负鍒犻櫎鏃剁殑鏍囪瘑绗�
number = number === 0 ? (10 + Math.random()) : number
--
Gitblit v1.9.3