From b50e7d0c574584b8ad02ad04715760c7c42a0b7d Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期六, 09 七月 2022 11:02:46 +0800
Subject: [PATCH] 1.生产开报工前端页面开发完成
---
src/views/scgl/scdd.vue | 16 --
src/views/scgl/gd.vue | 17 +-
src/views/sbgl/sbqd.vue | 1
src/views/scgl/sckbg.vue | 357 ++++++++++++++++++++++++++++++---------------------
4 files changed, 222 insertions(+), 169 deletions(-)
diff --git a/src/views/sbgl/sbqd.vue b/src/views/sbgl/sbqd.vue
index 2ac7b63..f18752f 100644
--- a/src/views/sbgl/sbqd.vue
+++ b/src/views/sbgl/sbqd.vue
@@ -1038,6 +1038,7 @@
::v-deep .el-select .el-input .el-select__caret {
display: flex;
align-items: center;
+ justify-content: center;
}
}
diff --git a/src/views/scgl/gd.vue b/src/views/scgl/gd.vue
index 9ee6dc7..353cc11 100644
--- a/src/views/scgl/gd.vue
+++ b/src/views/scgl/gd.vue
@@ -50,16 +50,10 @@
<el-input v-model="form.creatuser" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
<el-form-item label="鍒涘缓鏃堕棿" style=" display: flex;">
- <!-- <el-date-picker-->
- <!-- v-model="form.createdate"-->
- <!-- type="date"-->
- <!-- value-format="yyyy-MM-dd HH:mm:ss"-->
- <!-- style="width: 200px"-->
- <!-- placeholder="閫夋嫨鏃ユ湡"-->
- <!-- />-->
<el-date-picker
v-model="form.createdate"
type="daterange"
+ :clearable="false"
range-separator="~"
start-placeholder="寮�濮嬫棩鏈�"
end-placeholder="缁撴潫鏃ユ湡"
@@ -187,6 +181,7 @@
sortable="custom"
width="120"
/>
+
<el-table-column
prop="plan_startdate"
label="璁″垝寮�濮嬫椂闂�"
@@ -374,6 +369,7 @@
<el-date-picker
v-model="dialogForm.planstartdate"
type="date"
+ :clearable="false"
value-format="yyyy-MM-dd"
style="width: 200px"
placeholder="閫夋嫨鏃ユ湡"
@@ -383,6 +379,7 @@
<el-date-picker
v-model="dialogForm.planenddate"
type="date"
+ :clearable="false"
value-format="yyyy-MM-dd"
style="width: 200px"
placeholder="閫夋嫨鏃ユ湡"
@@ -487,6 +484,7 @@
<el-table-column
prop="wo_code"
label="宸ュ崟缂栧彿"
+ width="200"
/>
<el-table-column
prop="stepcode"
@@ -758,6 +756,9 @@
async add(operation) {
this.operation = operation
this.dialogVisible = true
+ this.dialogForm.planstartdate = handleDatetime(new Date())
+ this.dialogForm.planenddate = handleDatetime(new Date())
+ this.dialogForm.orderlev = 3
},
// 浜у搧淇℃伅鍊兼敼鍙�
@@ -796,7 +797,7 @@
this.dialogForm.partname = row.partname
this.dialogForm.mesqty = row.plan_qty
this.dialogForm.partspec = row.partspec
- this.dialogForm.routecode = row.route_code// 宸ヨ壓璺嚎浠ｇ爜
+ // this.dialogForm.routecode = row.route_code// 宸ヨ壓璺嚎浠ｇ爜
this.dialogForm.wkshopcode = row.wkshp_code// 鐢熶骇杞﹂棿浠ｇ爜
this.dialogForm.planstartdate = row.plan_startdate !== null ? row.plan_startdate : handleDatetime(new Date())
diff --git a/src/views/scgl/scdd.vue b/src/views/scgl/scdd.vue
index 0314c4e..42439ad 100644
--- a/src/views/scgl/scdd.vue
+++ b/src/views/scgl/scdd.vue
@@ -39,18 +39,12 @@
<el-input v-model="form.partspec" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
<el-form-item label="浜や粯鏃堕棿" style=" display: flex;">
- <!-- <el-date-picker-->
- <!-- v-model="form.paydate"-->
- <!-- type="date"-->
- <!-- value-format="yyyy-MM-dd HH:mm:ss"-->
- <!-- style="width: 200px"-->
- <!-- placeholder="閫夋嫨鏃ユ湡"-->
- <!-- />-->
<el-date-picker
v-model="form.paydate"
type="daterange"
range-separator="~"
size="mini"
+ :clearable="false"
start-placeholder="寮�濮嬫棩鏈�"
end-placeholder="缁撴潫鏃ユ湡"
/>
@@ -61,16 +55,10 @@
<el-input v-model="form.creatuser" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
<el-form-item label="鍒涘缓鏃堕棿" style=" display: flex;">
- <!-- <el-date-picker-->
- <!-- v-model="form.createdate"-->
- <!-- type="date"-->
- <!-- value-format="yyyy-MM-dd HH:mm:ss"-->
- <!-- style="width: 200px"-->
- <!-- placeholder="閫夋嫨鏃ユ湡"-->
- <!-- />-->
<el-date-picker
v-model="form.createdate"
type="daterange"
+ :clearable="false"
range-separator="~"
start-placeholder="寮�濮嬫棩鏈�"
end-placeholder="缁撴潫鏃ユ湡"
diff --git a/src/views/scgl/sckbg.vue b/src/views/scgl/sckbg.vue
index d68fd07..378bd37 100644
--- a/src/views/scgl/sckbg.vue
+++ b/src/views/scgl/sckbg.vue
@@ -12,6 +12,7 @@
oninput="value=value.replace(/[^0-9.]/g,'')"
name="produceCode"
style="width: 500px"
+ @keyup.enter.native="val=>enterNative(val,'produceCode')"
/>
</div>
<div style="display: flex;padding-right: 10px">
@@ -142,6 +143,7 @@
oninput="value=value.replace(/[^0-9.]/g,'')"
name="WXproduceCode"
style="width: 500px"
+ @keyup.enter.native="val=>enterNative(val,'WXproduceCode')"
/>
</div>
<div style="display: flex;padding-right: 10px">
@@ -271,7 +273,9 @@
<el-dialog
:title="dialogTitle"
:visible.sync="dialogVisible"
- width="70%"
+ width="800"
+ class="dialogVisible"
+ :top="dialogTitle==='鑷埗鎶ュ伐'?'5vh':'15vh'"
:close-on-click-modal="false"
@close="handleClose"
@closed="handleClose"
@@ -323,6 +327,121 @@
/>
</el-select>
</el-form-item>
+ <el-form-item v-if="dialogTitle==='鑷埗鎶ュ伐'" label="涓嬮亾宸ュ簭锛�">
+ <div style="width: 200px">B宸ュ簭</div>
+ </el-form-item>
+ <el-form-item v-if="dialogTitle==='鑷埗鎶ュ伐'" label="璁惧鍚嶇О锛�">
+ <el-select
+ v-model="dialogForm.OrgType"
+ style="width: 200px;"
+ placeholder="璇烽�夋嫨"
+ >
+ <el-option
+ v-for="item in options"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ />
+ </el-select>
+ </el-form-item>
+ <el-form-item v-if="dialogTitle==='鑷埗鎶ュ伐'" label="鐢熶骇鐝粍锛�">
+ <el-select
+ v-model="dialogForm.OrgType"
+ style="width: 200px;"
+ placeholder="璇烽�夋嫨"
+ >
+ <el-option
+ v-for="item in options"
+ :key="item.group_code"
+ :label="item.group_name"
+ :value="item.group_code"
+ />
+ </el-select>
+ </el-form-item>
+ <el-form-item v-if="dialogTitle==='鑷埗鎶ュ伐'" label="鎶ュ伐鏁伴噺锛�">
+ <el-input v-model="dialogForm.OrgName" oninput="value=value.replace(/[^0-9.]/g,'')" style="width: 200px;" />
+ </el-form-item>
+ <el-form-item v-if="dialogTitle==='鑷埗鎶ュ伐'" label="涓嶈壇鏁伴噺锛�">
+ <el-input v-model="dialogForm.OrgName" oninput="value=value.replace(/[^0-9.]/g,'')" style="width: 200px;" />
+ </el-form-item>
+ <el-form-item v-if="dialogTitle==='鑷埗鎶ュ伐'" label="涓嶈壇鍘熷洜锛�">
+ <el-select
+ v-model="dialogForm.OrgType"
+ style="width: 200px;"
+ placeholder="璇烽�夋嫨"
+ >
+ <el-option
+ v-for="item in options"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ />
+ </el-select>
+ </el-form-item>
+ <div v-if="dialogTitle==='鑷埗鎶ュ伐'">
+ <i class="el-icon-s-operation" style="color:#42b983;" /> 浜哄憳鍒楄〃
+ <el-button type="primary" style="margin: 10px 0" @click="userAdd">澧炶</el-button>
+ <el-table
+ :data="userTableData"
+ border
+ stripe
+ :header-cell-style="this.$headerCellStyle"
+ :cell-style="this.$cellStyle"
+ height="180"
+ highlight-current-row
+ style="width: 100%"
+ >
+ <el-table-column
+ prop="RowNum"
+ label="搴忓彿"
+ />
+ <el-table-column
+ prop="name"
+ label="浜哄憳鍚嶇О"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.isVisible===0">{{ row.name }}</div>
+ <el-input v-if="row.isVisible===1" v-model="row.name" />
+ <!-- <el-select-->
+ <!-- v-if="row.isVisible===1"-->
+ <!-- v-model="dialogForm.OrgType"-->
+ <!-- style="width: 200px;"-->
+ <!-- placeholder="璇烽�夋嫨"-->
+ <!-- >-->
+ <!-- <el-option-->
+ <!-- v-for="item in options"-->
+ <!-- :key="item.value"-->
+ <!-- :label="item.label"-->
+ <!-- :value="item.value"-->
+ <!-- />-->
+ <!-- </el-select>-->
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="RowNum"
+ label="鎿嶄綔"
+ >
+ <template slot-scope="{row}">
+ <div class="operationClass">
+ <el-button v-if="row.isVisible===0" type="text" @click="userDel(row)">鍒犻櫎</el-button>
+ <el-button v-if="row.isVisible===1" type="text" @click="userSave(row)">淇濆瓨</el-button>
+ <el-button v-if="row.isVisible===1" type="text" @click="userCancel(row)">鍙栨秷</el-button>
+ </div>
+ </template>
+ </el-table-column>
+ </el-table>
+ <!--鍒嗛〉-->
+ <pagination
+ v-show="UserTotal>0"
+ :total="UserTotal"
+ :page.sync="Userform.page"
+ :limit.sync="Userform.rows"
+ align="right"
+ layout="prev, pager, next,sizes"
+ popper-class="select_bottom"
+ @pagination="getMesOrderStepSearch"
+ />
+ </div>
<el-form-item v-if="dialogTitle==='澶栧崗鍙戞枡'" label="澶栧崗渚涙柟锛�">
<el-select
v-model="dialogForm.OrgType"
@@ -355,120 +474,6 @@
<el-form-item v-if="dialogTitle==='澶栧崗鍙戞枡'" label="鍙戞枡鏁伴噺锛�">
<el-input v-model="dialogForm.OrgName" oninput="value=value.replace(/[^0-9.]/g,'')" style="width: 200px;" />
</el-form-item>
- <el-form-item v-if="dialogTitle==='鑷埗鎶ュ伐'" label="涓嬮亾宸ュ簭锛�">
- <div style="width: 200px">B宸ュ簭</div>
- </el-form-item>
- <el-form-item v-if="dialogTitle==='鑷埗鎶ュ伐'" label="璁惧鍚嶇О锛�">
- <el-select
- v-model="dialogForm.OrgType"
- style="width: 200px;"
- placeholder="璇烽�夋嫨"
- >
- <el-option
- v-for="item in options"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- />
- </el-select>
- </el-form-item>
- <el-form-item v-if="dialogTitle==='鑷埗鎶ュ伐'" label="鐢熶骇鐝粍锛�">
- <el-select
- v-model="dialogForm.OrgType"
- style="width: 200px;"
- placeholder="璇烽�夋嫨"
- >
- <el-option
- v-for="item in options"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- />
- </el-select>
- </el-form-item>
- <el-form-item v-if="dialogTitle==='鑷埗鎶ュ伐'" label="鎶ュ伐鏁伴噺锛�">
- <el-input v-model="dialogForm.OrgName" oninput="value=value.replace(/[^0-9.]/g,'')" style="width: 200px;" />
- </el-form-item>
- <el-form-item v-if="dialogTitle==='鑷埗鎶ュ伐'" label="涓嶈壇鏁伴噺锛�">
- <el-input v-model="dialogForm.OrgName" oninput="value=value.replace(/[^0-9.]/g,'')" style="width: 200px;" />
- </el-form-item>
- <el-form-item v-if="dialogTitle==='鑷埗鎶ュ伐'" label="涓嶈壇鍘熷洜锛�">
- <el-select
- v-model="dialogForm.OrgType"
- style="width: 200px;"
- placeholder="璇烽�夋嫨"
- >
- <el-option
- v-for="item in options"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- />
- </el-select>
- </el-form-item>
- <div v-if="dialogTitle==='鑷埗鎶ュ伐'">
- <i class="el-icon-s-operation" style="color:#42b983;" /> 浜哄憳鍒楄〃
- <el-button type="primary" style="margin: 10px 0">澧炶</el-button>
- <el-table
- :data="userTableData"
- border
- stripe
- :header-cell-style="this.$headerCellStyle"
- :cell-style="this.$cellStyle"
- height="180"
- highlight-current-row
- style="width: 100%"
- >
- <el-table-column
- prop="RowNum"
- label="搴忓彿"
- />
- <el-table-column
- prop="RowNum"
- label="浜哄憳鍚嶇О"
- >
- <template slot-scope="{row}">
- <div v-if="row.isVisible===0">{{ row }}</div>
- <el-select
- v-if="row.isVisible===1"
- v-model="dialogForm.OrgType"
- style="width: 200px;"
- placeholder="璇烽�夋嫨"
- >
- <el-option
- v-for="item in options"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- />
- </el-select>
- </template>
- </el-table-column>
- <el-table-column
- prop="RowNum"
- label="鎿嶄綔"
- >
- <template slot-scope="{row}">
- <div class="operationClass">
- <el-button v-if="row.isVisible===0" type="text" @click="userDel(row)">鍒犻櫎</el-button>
- <el-button v-if="row.isVisible===1" type="text" @click="userSave(row)">淇濆瓨</el-button>
- <el-button v-if="row.isVisible===1" type="text" @click="userCancel(row)">鍙栨秷</el-button>
- </div>
- </template>
- </el-table-column>
- </el-table>
- <!--鍒嗛〉-->
- <pagination
- v-show="UserTotal>0"
- :total="UserTotal"
- :page.sync="Userform.page"
- :limit.sync="Userform.rows"
- align="right"
- layout="prev, pager, next,sizes"
- popper-class="select_bottom"
- @pagination="getMesOrderStepSearch"
- />
- </div>
<el-form-item v-if="dialogTitle==='澶栧崗鏀舵枡'" label="涓嬮亾宸ュ簭锛�">
<div style="width: 200px">B宸ュ簭</div>
</el-form-item>
@@ -527,7 +532,10 @@
<span slot="footer" class="dialog-footer">
<div class="footerButton">
<el-button @click="dialogVisibleCancel">鍙� 娑�</el-button>
- <el-button type="primary" @click="dialogVisible = false">纭� 瀹�</el-button>
+ <el-button v-if="dialogTitle==='鑷埗寮�濮�'" type="primary" @click="dialogVisibleConfirm">寮� 宸�</el-button>
+ <el-button v-if="dialogTitle==='鑷埗鎶ュ伐'" type="primary" @click="dialogVisibleConfirm">鎻愪氦/鎵撳嵃</el-button>
+ <el-button v-if="dialogTitle==='澶栧崗鍙戞枡'" type="primary" @click="dialogVisibleConfirm">鍙戞枡</el-button>
+ <el-button v-if="dialogTitle==='澶栧崗鏀舵枡'" type="primary" @click="dialogVisibleConfirm">鏀舵枡/鎵撳嵃</el-button>
</div>
</span>
</el-dialog>
@@ -539,7 +547,7 @@
import { AddUpdateOrganization, DeleteOrganization, OrganizationSearch, PrentOrganization } from '@/api/jcsz'
import { getCookie } from '@/utils/auth'
import $ from 'jquery'
-import { MesOrderStepSearch } from '@/api/scgl'
+import { MesOrderStepReportSelectUserGroup, MesOrderStepSearch, MesOrderStepStartSelectEqp } from '@/api/scgl'
const SER_HZ = /^[\u4e00-\u9fa5]+$/
export default {
@@ -591,7 +599,7 @@
WXtableData: [], // 澶栧崗琛�
dialogVisible: false,
- dialogTitle: '',
+ dialogTitle: '', // 鑷埗寮�濮嬨�佽嚜鍒舵姤宸ャ�佸鍗忓彂鏂欍�佸鍗忔敹鏂�
dialogForm: {
OrgType: '',
OrgCode: '',
@@ -599,7 +607,8 @@
SupUnit: ''// 涓婄骇鍗曚綅
},
userTableData: [
-
+ { RowNum: 1, name: '寮犱笁' },
+ { RowNum: 2, name: '鏉庡洓' }
], // 浜哄憳鍒楄〃
UserTotal: 0,
Userform: {
@@ -656,6 +665,7 @@
getCurrentRow() {
},
+ // tab鎸夐挳鍒囨崲榧犳爣鑷姩鑱氱劍
tabClick(val, d) {
console.log(val, d, 1)
if (this.$refs.elTabs.currentName === '0') {
@@ -667,6 +677,20 @@
this.$nextTick(() => {
$("input[name='WXproduceCode']")[0].focus()
})
+ }
+ },
+ async enterNative(val, belong) {
+ console.log(val, belong)
+ if (belong === 'produceCode') {
+ this.ZZreport()
+ // 鏌ユ壘璁惧
+ // const {data:res} = await MesOrderStepStartSelectEqp({ orderstepqrcode: this.produceCode })
+ // this.xxx=res
+ // 鏌ユ壘鐝粍
+ // const { data: res2 } = await MesOrderStepReportSelectUserGroup()
+ }
+ if (belong === 'WXproduceCode') {
+
}
},
// 鏌ヨ
@@ -682,6 +706,7 @@
ZZreport() {
this.dialogTitle = '鑷埗鎶ュ伐'
this.dialogVisible = true
+ this.getUserTableData()
},
// 澶栧崗鍙戞枡
WXsend() {
@@ -693,17 +718,45 @@
this.dialogTitle = '澶栧崗鏀舵枡'
this.dialogVisible = true
},
+ // 鎶ュ伐鏌ヨ鐢ㄦ埛琛�
+ async getUserTableData() {
+ // const res = await MesOrderGroupSelectUser({usergroupcode:this.})
+ this.userTableData.forEach(item => {
+ let number = Math.random() * Math.random()// 浣滀负鍒犻櫎鏃剁殑鏍囪瘑绗�
+ number = number === 0 ? (10 + Math.random()) : number
+ item.isVisible = 0
+ item.number = number
+ })
+ },
+ // 鐢ㄦ埛娣诲姞
+ userAdd() {
+ let number = Math.random() * Math.random()// 浣滀负鍒犻櫎鏃剁殑鏍囪瘑绗�
+ number = number === 0 ? (10 + Math.random()) : number
+ this.userTableData.unshift({ name: '', isVisible: 1, number: number })
+ },
// 鐢ㄦ埛鍒楄〃鍒犻櫎
- userDel() {
-
+ userDel(row) {
+ this.userTableData.forEach((item, index) => {
+ if (item.number === row.number) {
+ this.userTableData.splice(index, 1)
+ }
+ })
},
// 鐢ㄦ埛鍒楄〃淇濆瓨
- userSave() {
-
+ userSave(row) {
+ this.userTableData.forEach(item => {
+ if (item.number === row.number) {
+ item.isVisible = 0
+ }
+ })
},
// 鐢ㄦ埛鍒楄〃鍙栨秷
- userCancel() {
-
+ userCancel(row) {
+ this.userTableData.forEach((item, index) => {
+ if (item.number === row.number) {
+ this.userTableData.splice(index, 1)
+ }
+ })
},
// 閲嶇疆
reset() {
@@ -736,25 +789,27 @@
},
// 瀵硅瘽妗嗙‘璁�
dialogVisibleConfirm() {
- this.$refs.dialogForm.validate(valid => {
- if (valid) {
- const data = {
- OrganCode: this.dialogForm.OrgCode,
- OrganName: this.dialogForm.OrgName,
- Operator: getCookie('admin')
- }
- this.tabClick()
- // AddUpdateOrganization(data).then(res => {
- // if (res.code === '200') {
- // // this.$message.success(this.operation === 'add' ? '娣诲姞鎴愬姛锛�' : '淇敼鎴愬姛锛�')
- // this.dialogVisible = false
- // this.getMesOrderStepSearch()
- // } else {
- // // this.$message.error(this.operation === 'add' ? '娣诲姞澶辫触锛�' : '淇敼澶辫触锛�')
- // }
- // })
- }
- })
+ // this.$refs.dialogForm.validate(valid => {
+ // if (valid) {
+ // const data = {
+ // OrganCode: this.dialogForm.OrgCode,
+ // OrganName: this.dialogForm.OrgName,
+ // Operator: getCookie('admin')
+ // }
+ // // this.tabClick()
+ // // AddUpdateOrganization(data).then(res => {
+ // // if (res.code === '200') {
+ // // // this.$message.success(this.operation === 'add' ? '娣诲姞鎴愬姛锛�' : '淇敼鎴愬姛锛�')
+ // // this.dialogVisible = false
+ // // this.getMesOrderStepSearch()
+ // // } else {
+ // // // this.$message.error(this.operation === 'add' ? '娣诲姞澶辫触锛�' : '淇敼澶辫触锛�')
+ // // }
+ // // })
+ // }
+ // })
+ this.tabClick()
+ this.dialogVisible = false
},
// 鑾峰彇椤甸潰楂樺害
getHeight() {
@@ -816,9 +871,9 @@
color: #606266;
}
-//::v-deep .el-dialog__body {
-// padding: 20px 100px !important;
-//}
+::v-deep .el-dialog__body {
+ padding: 20px 100px !important;
+}
::v-deep .el-radio__input.is-checked .el-radio__inner {
background-color: $main_color;
@@ -931,4 +986,12 @@
border-color: $main_color;
}
+.dialogVisible{
+ ::v-deep .el-select .el-input .el-select__caret {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ }
+}
+
</style>
--
Gitblit v1.9.3