From f791db88d83a7ed851b9412d9797ed16b345fe79 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期四, 07 七月 2022 18:39:18 +0800
Subject: [PATCH] 1.项目页面修改2.生产管理工单页面开发
---
src/views/scgl/sckbg.vue | 474 ++++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 375 insertions(+), 99 deletions(-)
diff --git a/src/views/scgl/sckbg.vue b/src/views/scgl/sckbg.vue
index 2068f1a..d68fd07 100644
--- a/src/views/scgl/sckbg.vue
+++ b/src/views/scgl/sckbg.vue
@@ -2,7 +2,7 @@
<div>
<div class="body" style="padding: 0;height: 100%" :style="{height:mainHeight+'px'}">
- <el-tabs type="border-card">
+ <el-tabs ref="elTabs" type="border-card" @tab-click="tabClick">
<el-tab-pane label="鐢熶骇鍒楄〃">
<div style="margin-left: 10px;margin-top:10px;display: flex;justify-content: space-between">
<div style="display: flex;align-items: center">
@@ -15,8 +15,14 @@
/>
</div>
<div style="display: flex;padding-right: 10px">
- <el-button><svg-icon icon-class="start_time" style="margin-right: 2px" />寮�濮�</el-button>
- <el-button><svg-icon icon-class="report_work" style="margin-right: 2px" />鎶ュ伐</el-button>
+ <el-button @click="ZZstart">
+ <svg-icon icon-class="start_time" style="margin-right: 2px" />
+ 寮�濮�
+ </el-button>
+ <el-button @click="ZZreport">
+ <svg-icon icon-class="report_work" style="margin-right: 2px" />
+ 鎶ュ伐
+ </el-button>
</div>
</div>
<el-divider />
@@ -132,21 +138,27 @@
<div style="display: flex;align-items: center">
<div style="width: 70px">宸ュ簭鐮侊細</div>
<el-input
- v-model="produceCode"
+ v-model="WXproduceCode"
oninput="value=value.replace(/[^0-9.]/g,'')"
- name="produceCode"
+ name="WXproduceCode"
style="width: 500px"
/>
</div>
<div style="display: flex;padding-right: 10px">
- <el-button><svg-icon icon-class="start_time" style="margin-right: 2px" />鍙戞枡</el-button>
- <el-button><svg-icon icon-class="report_work" style="margin-right: 2px" />鏀舵枡</el-button>
+ <el-button @click="WXsend">
+ <svg-icon icon-class="start_time" style="margin-right: 2px" />
+ 鍙戞枡
+ </el-button>
+ <el-button @click="WXback">
+ <svg-icon icon-class="report_work" style="margin-right: 2px" />
+ 鏀舵枡
+ </el-button>
</div>
</div>
<el-divider />
<div class="elTableDiv">
<el-table
- :data="tableData"
+ :data="WXtableData"
:height="tableHeight"
border
stripe
@@ -241,10 +253,10 @@
</div>
<!--鍒嗛〉-->
<pagination
- v-show="total>0"
- :total="total"
- :page.sync="form.page"
- :limit.sync="form.rows"
+ v-show="WXtotal>0"
+ :total="WXtotal"
+ :page.sync="WXform.page"
+ :limit.sync="WXform.rows"
align="right"
layout="prev, pager, next,sizes"
popper-class="select_bottom"
@@ -257,41 +269,265 @@
</div>
<el-dialog
- :title="operation==='add'?'鏂板':'缂栬緫'"
+ :title="dialogTitle"
:visible.sync="dialogVisible"
- width="60%"
- top="15vh"
- @closed="handleClose"
+ width="70%"
+ :close-on-click-modal="false"
@close="handleClose"
+ @closed="handleClose"
>
- <el-form ref="dialogForm" :rules="dialogFormRules" :model="dialogForm" label-width="80px">
- <el-form-item label="缁勭粐绫诲瀷" prop="OrgType" />
- <el-form-item label="缁勭粐缂栫爜" prop="OrgCode">
- <el-input v-model="dialogForm.OrgCode" :disabled="operation!=='add'" style="width: 200px" />
+ <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>
</el-form-item>
- <el-form-item label="缁勭粐鍚嶇О" prop="OrgName">
- <el-input v-model="dialogForm.OrgName" style="width: 200px" />
+ <el-form-item label="浜у搧缂栫爜锛�">
+ <div style="width: 200px">427100</div>
</el-form-item>
- <el-form-item prop="SupUnit" label="涓婄骇鍗曚綅">
+ <el-form-item label="浜у搧鍚嶇О锛�">
+ <div style="width: 200px">鏈虹鏉垮簳</div>
+ </el-form-item>
+ <el-form-item label="浜у搧瑙勬牸锛�">
+ <div style="width: 200px">鏈虹搴曟澘&1</div>
+ </el-form-item>
+ <el-form-item label="褰撳墠宸ュ簭锛�">
+ <div style="width: 200px">婵�鍏夊垏鍓�</div>
+ </el-form-item>
+ <el-form-item label="宸ュ簭鎻忚堪锛�">
+ <el-tooltip class="item" effect="dark" content="鍘熸潗鏂欏垏鎸夋潗鏂欏垏鎸夋潗鏂欏垏鎸夋椂鎵撳崱鏁版嵁鐨勫崱" placement="top-start">
+ <div style="width: 200px;white-space: nowrap;text-overflow: ellipsis;overflow: hidden;">
+ 鍘熸潗鏂欏垏鎸夋潗鏂欏垏鎸夋潗鏂欏垏鎸夋椂鎵撳崱鏁版嵁鐨勫崱
+ </div>
+ </el-tooltip>
+ </el-form-item>
+ <el-form-item label="浠诲姟鏁伴噺锛�">
+ <div style="width: 200px">1000</div>
+ </el-form-item>
+ <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>
+ <el-form-item v-if="dialogTitle==='鑷埗寮�濮�'" label="鐢熶骇璁惧锛�">
<el-select
- v-model="dialogForm.SupUnit"
- style="width: 200px"
+ v-model="dialogForm.OrgType"
+ style="width: 200px;"
placeholder="璇烽�夋嫨"
- :popper-append-to-body="false"
>
<el-option
- v-for="item in SupUnitArr"
- :key="item.code"
- :label="item.name"
- :value="item.code"
+ 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-select
+ v-model="dialogForm.OrgType"
+ style="width: 200px;"
+ placeholder="璇烽�夋嫨"
+ multiple
+ >
+ <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="涓嬮亾宸ュ簭锛�">
+ <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>
+ <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="璇烽�夋嫨"
+ multiple
+ >
+ <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"
+ style="width: 200px"
+ oninput="value=value.replace(/[^0-9.]/g,'')"
+ />
+ </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>
<span slot="footer" class="dialog-footer">
<div class="footerButton">
<el-button @click="dialogVisibleCancel">鍙� 娑�</el-button>
- <el-button type="primary" @click="dialogVisibleConfirm">纭� 瀹�</el-button>
+ <el-button type="primary" @click="dialogVisible = false">纭� 瀹�</el-button>
</div>
</span>
</el-dialog>
@@ -334,6 +570,7 @@
mainHeight: 0,
tableHeight: 0,
produceCode: '', // 宸ュ簭鐮�
+ WXproduceCode: '', // 澶栧崗宸ュ簭鐮�
form: {
orderstepqrcode: '', // 鎵弿鐨勪簩缁寸爜淇℃伅
prop: 'lm_date', // 鎺掑簭瀛楁
@@ -341,31 +578,48 @@
page: 1, // 绗嚑椤�
rows: 20 // 姣忛〉澶氬皯鏉�
},
-
total: 10,
tableData: [],
+ WXform: { // 澶栧崗琛ㄥ崟
+ orderstepqrcode: '', // 鎵弿鐨勪簩缁寸爜淇℃伅
+ prop: 'lm_date', // 鎺掑簭瀛楁
+ order: 'desc', // 鎺掑簭瀛楁
+ page: 1, // 绗嚑椤�
+ rows: 20 // 姣忛〉澶氬皯鏉�
+ },
+ WXtotal: 10, // 澶栧崗琛ㄥ崟鎬绘暟
+ WXtableData: [], // 澶栧崗琛�
+
dialogVisible: false,
+ dialogTitle: '',
dialogForm: {
OrgType: '',
OrgCode: '',
OrgName: '',
SupUnit: ''// 涓婄骇鍗曚綅
},
- operation: '',
- dialogFormRules: {
- OrgType: [
- { required: true, message: '璇疯緭鍏ラ�夋嫨绫诲瀷', trigger: ['blur', 'change'] }
- ],
- OrgCode: [
- { required: true, validator: validateName, trigger: ['blur', 'change'] }
- ],
- OrgName: [
- { required: true, message: '璇疯緭鍏ュ悕绉�', trigger: ['blur', 'change'] }
- ],
- SupUnit: [
- { required: true, validator: validateTypeCode, trigger: ['blur', 'change'] }
- ]
+ userTableData: [
+
+ ], // 浜哄憳鍒楄〃
+ UserTotal: 0,
+ Userform: {
+
}
+ // operation: '',
+ // dialogFormRules: {
+ // OrgType: [
+ // { required: true, message: '璇疯緭鍏ラ�夋嫨绫诲瀷', trigger: ['blur', 'change'] }
+ // ],
+ // OrgCode: [
+ // { required: true, validator: validateName, trigger: ['blur', 'change'] }
+ // ],
+ // OrgName: [
+ // { required: true, message: '璇疯緭鍏ュ悕绉�', trigger: ['blur', 'change'] }
+ // ],
+ // SupUnit: [
+ // { required: true, validator: validateTypeCode, trigger: ['blur', 'change'] }
+ // ]
+ // }
}
},
@@ -377,7 +631,7 @@
this.getHeight()
this.$nextTick(() => {
- $("input[name='produceCode']").focus()
+ $("input[name='produceCode']")[0].focus()
})
},
methods: {
@@ -402,15 +656,58 @@
getCurrentRow() {
},
+ tabClick(val, d) {
+ console.log(val, d, 1)
+ if (this.$refs.elTabs.currentName === '0') {
+ this.$nextTick(() => {
+ $("input[name='produceCode']")[0].focus()
+ })
+ }
+ if (this.$refs.elTabs.currentName === '1') {
+ this.$nextTick(() => {
+ $("input[name='WXproduceCode']")[0].focus()
+ })
+ }
+ },
// 鏌ヨ
search() {
this.getMesOrderStepSearch()
},
- upload() {
+ // 鑷埗寮�濮�
+ ZZstart() {
+ this.dialogTitle = '鑷埗寮�濮�'
+ this.dialogVisible = true
+ },
+ // 鑷埗鎶ュ伐
+ ZZreport() {
+ this.dialogTitle = '鑷埗鎶ュ伐'
+ this.dialogVisible = true
+ },
+ // 澶栧崗鍙戞枡
+ WXsend() {
+ this.dialogTitle = '澶栧崗鍙戞枡'
+ this.dialogVisible = true
+ },
+ // 澶栧崗鏀舵枡
+ WXback() {
+ this.dialogTitle = '澶栧崗鏀舵枡'
+ this.dialogVisible = true
+ },
+ // 鐢ㄦ埛鍒楄〃鍒犻櫎
+ userDel() {
+
+ },
+ // 鐢ㄦ埛鍒楄〃淇濆瓨
+ userSave() {
+
+ },
+ // 鐢ㄦ埛鍒楄〃鍙栨秷
+ userCancel() {
},
// 閲嶇疆
reset() {
+ this.dialogTitle = ''
this.form.OrgCode = ''
this.form.OrgName = ''
this.form.OrgType = ''
@@ -418,39 +715,6 @@
this.getMesOrderStepSearch()
},
- // 鏂板鎸夐挳
- add(operation) {
- this.operation = operation
- this.dialogVisible = true
- },
- // 淇敼鎸夐挳
- edit(operation, row) {
- this.operation = operation
- this.dialogVisible = true
-
- this.$nextTick(() => {
- this.dialogForm.OrgCode = row.org_code
- this.dialogForm.OrgName = row.org_name
- this.dialogForm.SupUnit = row.parent_id
- })
- },
- // 鍒犻櫎鎸夐挳
- async del(row) {
- this.$confirm('鏄惁纭鍒犻櫎?', '鎻愮ず', {
- confirmButtonText: '纭畾',
- cancelButtonText: '鍙栨秷',
- type: 'warning'
- }).then(() => {
- DeleteOrganization({ orgid: row.code }).then(res => {
- if (res.code === '200') {
- this.$message.success('鍒犻櫎鎴愬姛!')
- this.getMesOrderStepSearch()
- }
- })
- }).catch(() => {
- this.$message.info('宸插彇娑堝垹闄�')
- })
- },
// 瀵硅瘽妗嗗叧闂簨浠�
handleClose() {
this.dialogForm.OrgType = ''
@@ -462,6 +726,13 @@
// 瀵硅瘽妗嗗彇娑�
dialogVisibleCancel() {
this.dialogVisible = false
+ // if (this.dialogTitle === '鑷埗寮�濮�'||this.dialogTitle === '鑷埗鎶ュ伐') {
+ // this.tabClick('0')
+ // }
+ // if (this.dialogTitle === '澶栧崗鍙戞枡'||this.dialogTitle === '澶栧崗鏀舵枡') {
+ // this.tabClick('1')
+ // }
+ this.tabClick()
},
// 瀵硅瘽妗嗙‘璁�
dialogVisibleConfirm() {
@@ -470,18 +741,18 @@
const data = {
OrganCode: this.dialogForm.OrgCode,
OrganName: this.dialogForm.OrgName,
- OperType: this.operation === 'add' ? 'Add' : 'Update',
Operator: getCookie('admin')
}
- 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()
+ // 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' ? '娣诲姞澶辫触锛�' : '淇敼澶辫触锛�')
+ // }
+ // })
}
})
},
@@ -489,7 +760,7 @@
getHeight() {
this.$nextTick(() => {
this.mainHeight = window.innerHeight - 250
- this.tableHeight = this.mainHeight - 100
+ this.tableHeight = this.mainHeight - 80
})
}
}
@@ -507,9 +778,11 @@
border: none;
padding: 0 20px;
}
+
::v-deep .el-button--primary:hover {
border: none;
}
+
::v-deep .el-button--info {
height: 30px;
display: flex;
@@ -543,9 +816,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;
@@ -565,6 +838,7 @@
height: 30px;
line-height: 30px;
}
+
::v-deep .el-input__inner:focus {
border-color: $main_color;
}
@@ -641,17 +915,19 @@
border-color: $main_color;
}
-::v-deep .el-select .el-input__inner:focus{
+::v-deep .el-select .el-input__inner:focus {
border-color: $main_color;
}
-::v-deep .el-select-dropdown__item.selected{
+::v-deep .el-select-dropdown__item.selected {
color: $main_color;
}
-::v-deep .el-checkbox__inner:hover{
+
+::v-deep .el-checkbox__inner:hover {
border-color: $main_color;
}
-::v-deep .el-textarea__inner:focus{
+
+::v-deep .el-textarea__inner:focus {
border-color: $main_color;
}
--
Gitblit v1.9.3