From 19452b07fc24ffea60ba08143e11d04759895fad Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期五, 01 七月 2022 17:30:46 +0800
Subject: [PATCH] 1.节拍工价(查询、新增、编辑、删除、复制工价) 功能开发
---
src/views/jcsz/zzjg.vue | 12
src/views/scgl/scdd.vue | 522 ++++++++++++++++++
src/api/zzmx.js | 8
src/views/zzmx/jpgj.vue | 983 +++++++++++++++++++++++++++++++++++
src/views/xtsz/bmgz.vue | 24
src/api/scgl.js | 78 ++
src/views/template.vue | 1
src/views/zzmx/gxdy.vue | 4
src/utils/global.js | 10
9 files changed, 1,622 insertions(+), 20 deletions(-)
diff --git a/src/api/scgl.js b/src/api/scgl.js
new file mode 100644
index 0000000..1ec4013
--- /dev/null
+++ b/src/api/scgl.js
@@ -0,0 +1,78 @@
+import request from '@/utils/request'
+
+// ERP璁㈠崟鏌ヨ
+export function ErpOrderSearch(data) {
+ return request({
+ url: 'ProductionManagement/ErpOrderSearch',
+ method: 'get',
+ params: data
+ })
+}
+
+// ERP璁㈠崟涓嬭揪
+export function MarkSaveErpOrder(data) {
+ return request({
+ url: 'ProductionManagement/MarkSaveErpOrder',
+ method: 'post',
+ data
+ })
+}
+// ERP璁㈠崟鍏抽棴
+export function ClosedErpOrder(data) {
+ return request({
+ url: 'ProductionManagement/ClosedErpOrder',
+ method: 'post',
+ params: data
+ })
+}
+// MES宸ュ崟鏌ヨ
+export function MesOrderSearch(data) {
+ return request({
+ url: 'ProductionManagement/MesOrderSearch',
+ method: 'get',
+ params: data
+ })
+}
+
+// 浜у搧缂栫爜鏌ユ壘宸ヨ壓璺嚎涓嬫媺鎺ュ彛
+export function PartSelectRoute(data) {
+ return request({
+ url: 'ProductionManagement/PartSelectRoute',
+ method: 'get',
+ params: data
+ })
+}
+
+// 浜у搧+宸ヨ壓璺嚎鏌ユ壘杞﹂棿涓嬫媺鎺ュ彛
+export function RouteSelectWkshop(data) {
+ return request({
+ url: 'ProductionManagement/RouteSelectWkshop',
+ method: 'get',
+ params: data
+ })
+}
+
+// MES宸ュ崟鏂板銆佺紪杈戞彁浜�
+export function AddUpdateMesOrder(data) {
+ return request({
+ url: 'ProductionManagement/AddUpdateMesOrder',
+ method: 'post',
+ data
+ })
+}
+// MES宸ュ崟鍒犻櫎
+export function DeleteMesOrder(data) {
+ return request({
+ url: 'ProductionManagement/DeleteMesOrder',
+ method: 'post',
+ params: data
+ })
+}
+// MES宸ュ崟鍏抽棴
+export function ClosedMesOrder(data) {
+ return request({
+ url: 'ProductionManagement/ClosedMesOrder',
+ method: 'post',
+ params: data
+ })
+}
diff --git a/src/api/zzmx.js b/src/api/zzmx.js
index 57ad744..c0dadf1 100644
--- a/src/api/zzmx.js
+++ b/src/api/zzmx.js
@@ -229,6 +229,14 @@
params: data
})
}
+// 鏍规嵁宸ュ簭绾跨紪鐮佹煡鎵惧叧鑱旇澶囧垪琛ㄩ泦鍚�
+export function StepSelectEqpList(data) {
+ return request({
+ url: 'ProductModel/StepSelectEqpList',
+ method: 'get',
+ params: data
+ })
+}
// 鑺傛媿宸ヤ环鏌ヨ
export function BeatRateSearch(data) {
return request({
diff --git a/src/utils/global.js b/src/utils/global.js
index 044a6b0..19231f3 100644
--- a/src/utils/global.js
+++ b/src/utils/global.js
@@ -1,3 +1,5 @@
+import { NewEncodingRules } from '@/api/xtsz'
+
// 鍏ㄥ眬涓昏棰滆壊
export function getGlobalColor() {
return { globalColor: `#42b983` }
@@ -26,3 +28,11 @@
const date = data.getDate() <= 9 ? '0' + data.getDate() : data.getDate()
return data.getFullYear() + '-' + month + '-' + date
}
+
+// 鑾峰彇瑙勫垯鐢熸垚鐨勭紪鐮�
+export async function getNewEncodingRules(encode) {
+ const res = await NewEncodingRules({ rightcode: encode })
+ if (res.code === '200') {
+ return { RightCode: res.data[0], numvalue: res.data[1] }
+ }
+}
diff --git a/src/views/jcsz/zzjg.vue b/src/views/jcsz/zzjg.vue
index 9ed8ac4..8168337 100644
--- a/src/views/jcsz/zzjg.vue
+++ b/src/views/jcsz/zzjg.vue
@@ -151,7 +151,7 @@
</el-radio-group>
</el-form-item>
<el-form-item label="缁勭粐缂栫爜" prop="OrgCode">
- <el-input v-model="dialogForm.OrgCode" :disabled="operation!=='add'" style="width: 220px" />
+ <el-input v-model="dialogForm.OrgCode" disabled style="width: 220px" />
</el-form-item>
<el-form-item label="缁勭粐鍚嶇О" prop="OrgName">
<el-input v-model="dialogForm.OrgName" style="width: 220px" />
@@ -187,6 +187,7 @@
import Pagination from '@/components/Pagination'
import { AddUpdateOrganization, DeleteOrganization, OrganizationSearch, PrentOrganization } from '@/api/jcsz'
import { getCookie } from '@/utils/auth'
+import { getNewEncodingRules } from '@/utils/global'
const SER_HZ = /^[\u4e00-\u9fa5]+$/
export default {
@@ -216,6 +217,7 @@
return {
mainHeight: 0,
tableHeight: 0,
+ numvalue: 0,
form: {
OrgCode: '', // 缁勭粐鏋舵瀯浠ｇ爜
OrgName: '', // 缁勭粐鏋舵瀯鍚嶇О
@@ -320,9 +322,13 @@
},
// 鏂板鎸夐挳
- add(operation) {
+ async add(operation) {
this.operation = operation
this.dialogVisible = true
+
+ const res = await getNewEncodingRules(getCookie('ruleCode'))
+ this.dialogForm.OrgCode = res.RightCode
+ this.numvalue = res.numvalue
},
// 淇敼鎸夐挳
edit(operation, row) {
@@ -383,6 +389,8 @@
OrganType: this.dialogFormOrgTypeSelected,
OrganCode: this.dialogForm.OrgCode,
OrganName: this.dialogForm.OrgName,
+ RightCode: this.operation === 'add' ? getCookie('ruleCode') : '',
+ numvalue: this.operation === 'add' ? this.numvalue : '',
SupUnit: this.dialogFormOrgTypeSelected === 'F' ? '0' : this.dialogForm.SupUnit,
OperType: this.operation === 'add' ? 'Add' : 'Update',
Operator: getCookie('admin')
diff --git a/src/views/scgl/scdd.vue b/src/views/scgl/scdd.vue
index 5d90003..77e192c 100644
--- a/src/views/scgl/scdd.vue
+++ b/src/views/scgl/scdd.vue
@@ -1,11 +1,527 @@
-<template />
+<template>
+ <div>
+ <div class="body" :style="{height:mainHeight+'px'}">
+ <div style="padding: 10px 5px 0 0">
+ <el-form
+ ref="form"
+ :model="form"
+ label-width="80px"
+ inline
+ style="display: flex;justify-content: space-between"
+ >
+ <div class="elForm">
+ <el-form-item label="璁㈠崟鐘舵��" style=" display: flex;">
+ <el-select v-model="form.erporderstus" :popper-append-to-body="false" style="width: 200px" placeholder="璇烽�夋嫨">
+ <el-option
+ v-for="item in erporderstusArr"
+ :key="item.code"
+ :label="item.name"
+ :value="item.code"
+ />
+ </el-select>
+ </el-form-item>
+ <el-form-item label="缁勭粐鍚嶇О" style=" display: flex;">
+ <el-input v-model="form.OrgName" placeholder="璇疯緭鍏�" style="width: 200px" />
+ </el-form-item>
+ <el-form-item label="缁勭粐绫诲瀷" style=" display: flex;">
+ <el-select v-model="form.OrgType" :popper-append-to-body="false" style="width: 200px" placeholder="璇烽�夋嫨">
+ <el-option
+ v-for="item in OrgTypeArr"
+ :key="item.code"
+ :label="item.name"
+ :value="item.code"
+ />
+ </el-select>
+ </el-form-item>
+ <el-form-item label="鍒涘缓浜哄憳" style=" display: flex;">
+ <el-input v-model="form.UserName" style="width: 200px" placeholder="璇疯緭鍏�" />
+ </el-form-item>
+ </div>
+ <div style="display: flex;align-items: start;margin-top: 5px;z-index: 2">
+ <el-button type="primary" icon="el-icon-search" @click="search">鏌ヨ</el-button>
+ <el-button type="info" icon="el-icon-refresh" @click="reset">閲嶇疆</el-button>
+ </div>
+ </el-form>
+ </div>
+ <el-divider />
+ <div style="margin-left: 10px;display: flex">
+ <el-button type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板</el-button>
+ <el-button type="primary" icon="el-icon-upload2" @click="upload">瀵煎叆</el-button>
+ </div>
+ <el-divider />
+ <div class="elTableDiv">
+ <el-table
+ :data="tableData"
+ :height="tableHeight"
+ border
+ stripe
+ :style="{width: 100+'%',height:tableHeight+'px',}"
+ highlight-current-row
+ :header-cell-style="this.$headerCellStyle"
+ :cell-style="this.$cellStyle"
+ @sort-change="sortChange"
+ >
+ <!-- <el-table-column-->
+ <!-- type="selection"-->
+ <!-- width="50"-->
+ <!-- />-->
+ <el-table-column
+ prop="RowNum"
+ width="50"
+ label="搴忓彿"
+ />
+ <el-table-column
+ prop="org_code"
+ label="缁勭粐缂栫爜"
+ sortable="custom"
+ />
+ <el-table-column
+ prop="org_name"
+ label="缁勭粐鍚嶇О"
+ sortable="custom"
+ />
+ <el-table-column
+ prop="description"
+ label="缁勭粐绫诲瀷"
+ sortable="custom"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.description==='F'">宸ュ巶</div>
+ <div v-if="row.description==='D'">閮ㄩ棬</div>
+ <div v-if="row.description==='W'">杞﹂棿</div>
+ <div v-if="row.description==='K'">绉戝</div>
+ <div v-if="row.description==='L'">鐢熶骇绾�</div>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="parentorg_name"
+ label="涓婄骇鍗曚綅"
+ sortable="custom"
+ />
+ <el-table-column
+ prop="lm_user"
+ label="鍒涘缓浜哄憳"
+ sortable="custom"
+ />
+ <el-table-column
+ prop="lm_date"
+ label="鍒涘缓鏃堕棿"
+ 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>
+ </div>
+ <!--鍒嗛〉-->
+ <pagination
+ v-show="total>0"
+ :total="total"
+ :page.sync="form.page"
+ :limit.sync="form.rows"
+ align="right"
+ layout="prev, pager, next,sizes"
+ popper-class="select_bottom"
+ @pagination="getErpOrderSearch"
+ />
+ </div>
+
+ <el-dialog
+ :title="operation==='add'?'鏂板':'淇敼'"
+ :visible.sync="dialogVisible"
+ width="50%"
+ top="15vh"
+ @closed="handleClose"
+ @close="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: 220px" />
+ </el-form-item>
+ <el-form-item label="缁勭粐鍚嶇О" prop="OrgName">
+ <el-input v-model="dialogForm.OrgName" style="width: 220px" />
+ </el-form-item>
+ <el-form-item prop="SupUnit" label="涓婄骇鍗曚綅">
+ <el-select
+ v-model="dialogForm.SupUnit"
+ style="width: 220px"
+ placeholder="璇烽�夋嫨"
+ :popper-append-to-body="false"
+ >
+ <el-option
+ v-for="item in SupUnitArr"
+ :key="item.code"
+ :label="item.name"
+ :value="item.code"
+ />
+ </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>
+ </div>
+ </span>
+ </el-dialog>
+ </div>
+</template>
<script>
+import Pagination from '@/components/Pagination'
+import { AddUpdateOrganization, DeleteOrganization, OrganizationSearch, PrentOrganization } from '@/api/jcsz'
+import { getCookie } from '@/utils/auth'
+import { ErpOrderSearch } from '@/api/scgl'
+
+const SER_HZ = /^[\u4e00-\u9fa5]+$/
export default {
- name: 'Scdd'
+ name: 'Zzjg',
+ components: {
+ Pagination
+ },
+ data() {
+ const validateName = (rule, value, callback) => {
+ if (!value) {
+ return callback(new Error('璇疯緭鍏ョ紪鐮�'))
+ } else {
+ if (SER_HZ.test(value)) {
+ return callback(new Error('缂栫爜涓嶈兘涓轰腑鏂�'))
+ } else {
+ callback()
+ }
+ }
+ }
+ return {
+ mainHeight: 0,
+ tableHeight: 0,
+ form: {
+ erporderstus: '', // 璁㈠崟鐘舵�佺爜
+ erpordercode: '', // 璁㈠崟缂栧彿
+ partcode: '', // 浜у搧缂栫爜
+ partname: '', // 浜у搧鍚嶇О
+ partspec: '', // 浜у搧瑙勬牸
+ paydate: '', // 浜や粯鏃堕棿
+ creatuser: '', // 鍒涘缓浜哄憳
+ createdate: '', // 鍒涘缓鏃堕棿
+ prop: 'partcode', // 鎺掑簭瀛楁
+ order: 'desc', // 鎺掑簭瀛楁
+ page: 1, // 绗嚑椤�
+ rows: 20 // 姣忛〉澶氬皯鏉�
+ },
+ erporderstusArr: [
+ { code: 'CREATING', name: '杩涜涓�' },
+ { code: 'CREATE', name: '鏈紑濮�' }
+ ],
+ total: 10,
+ tableData: [],
+ dialogVisible: false,
+ 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'] }
+ ]
+
+ }
+
+ }
+ },
+ created() {
+ this.getErpOrderSearch()
+ },
+ mounted() {
+ window.addEventListener('resize', this.getHeight)
+ this.getHeight()
+ },
+ methods: {
+ async getErpOrderSearch() {
+ const res = await ErpOrderSearch(this.form)
+ this.tableData = res.data
+ this.total = res.count
+ },
+ // 鎺掑簭鏀瑰彉鏃�
+ sortChange({ column, prop, order }) {
+ if (order === 'descending') {
+ order = 'desc'
+ } else if (order === 'ascending') {
+ order = 'asc'
+ } else {
+ order = 'desc'
+ }
+ this.form.order = order
+ this.form.prop = prop
+ this.getErpOrderSearch()
+ },
+ // 鏌ヨ
+ search() {
+ this.getErpOrderSearch()
+ },
+ upload() {
+
+ },
+ // 閲嶇疆
+ reset() {
+ this.form.OrgCode = ''
+ this.form.OrgName = ''
+ this.form.OrgType = ''
+ this.form.UserName = ''
+ this.getErpOrderSearch()
+ },
+
+ // 鏂板鎸夐挳
+ 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.getErpOrderSearch()
+ }
+ })
+ }).catch(() => {
+ this.$message.info('宸插彇娑堝垹闄�')
+ })
+ },
+ // 瀵硅瘽妗嗗叧闂簨浠�
+ handleClose() {
+ this.dialogForm.OrgType = ''
+ this.dialogForm.OrgCode = ''
+ this.dialogForm.OrgName = ''
+ this.dialogForm.SupUnit = ''
+ this.$refs.dialogForm.clearValidate()
+ },
+ // 瀵硅瘽妗嗗彇娑�
+ dialogVisibleCancel() {
+ this.dialogVisible = false
+ },
+ // 瀵硅瘽妗嗙‘璁�
+ dialogVisibleConfirm() {
+ this.$refs.dialogForm.validate(valid => {
+ if (valid) {
+ 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.getErpOrderSearch()
+ } else {
+ this.$message.error(this.operation === 'add' ? '娣诲姞澶辫触锛�' : '淇敼澶辫触锛�')
+ }
+ })
+ }
+ })
+ },
+ // 鑾峰彇椤甸潰楂樺害
+ getHeight() {
+ this.$nextTick(() => {
+ this.mainHeight = window.innerHeight - 250
+ this.tableHeight = this.mainHeight - 100
+ })
+ }
+ }
}
</script>
-<style scoped>
+<style lang="scss" scoped>
+$main_color: #42b983;
+::v-deep .el-button--primary {
+ background-color: $main_color !important;
+ height: 30px;
+ display: flex;
+ align-items: center;
+ //border: 1px solid $main_color;
+ border: none;
+ padding: 0 20px;
+}
+::v-deep .el-button--primary:hover {
+ border: none;
+}
+::v-deep .el-button--info {
+ height: 30px;
+ display: flex;
+ align-items: center;
+ padding: 0 20px;
+}
+
+::v-deep .el-pagination.is-background .el-pager li:not(.disabled).active {
+ background-color: $main_color !important;
+}
+
+::v-deep .el-dialog__footer {
+ display: flex;
+ justify-content: flex-end;
+}
+
+.footerButton {
+ display: flex;
+ justify-content: end;
+}
+
+::v-deep .el-button--default {
+ background-color: #ffffff !important;
+ height: 30px;
+ display: flex;
+ align-items: center;
+ padding: 0 20px;
+}
+
+::v-deep .el-button--default:hover {
+ color: #606266;
+}
+
+::v-deep .el-dialog__body {
+ padding: 20px 100px !important;
+}
+
+::v-deep .el-radio__input.is-checked .el-radio__inner {
+ background-color: $main_color;
+ border-color: $main_color;
+}
+
+::v-deep .el-radio__input.is-checked + .el-radio__label {
+ color: $main_color !important;
+}
+
+::v-deep .el-checkbox__input.is-checked .el-checkbox__inner {
+ border-color: $main_color;
+ background-color: $main_color;
+}
+
+::v-deep .el-input__inner {
+ height: 30px;
+ line-height: 30px;
+}
+::v-deep .el-input__inner:focus {
+ border-color: $main_color;
+}
+
+::v-deep .el-table .caret-wrapper {
+ transform: scale(0.8);
+}
+
+::v-deep .cell {
+ display: flex !important;
+ align-items: center !important;
+ justify-content: space-between !important;
+}
+
+::v-deep .el-button--text {
+ color: $main_color;
+ font-size: 14px;
+ cursor: pointer;
+}
+
+.operationClass {
+ height: 23px;
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+}
+
+.el-icon-share {
+ color: $main_color;
+ cursor: pointer;
+}
+
+.el-checkbox.is-bordered.is-checked {
+ border-color: $main_color;
+}
+
+::v-deep .el-radio__input.is-checked .el-radio__inner {
+ border-color: $main_color;
+ background: $main_color;
+}
+
+::v-deep .el-checkbox__input.is-indeterminate .el-checkbox__inner {
+ border-color: $main_color;
+ background: $main_color;
+}
+
+::v-deep .el-checkbox__input.is-checked + .el-checkbox__label {
+ color: $main_color !important;
+}
+
+::v-deep .el-checkbox.is-bordered + .el-checkbox.is-bordered {
+ margin: 10px 30px 0px 0;
+}
+
+::v-deep .el-radio__input.is-checked + .el-radio__label {
+ color: $main_color;
+}
+
+::v-deep .el-radio.is-bordered + .el-radio.is-bordered {
+ margin: 10px 30px 0px 0;
+}
+
+.body ::v-deep .el-divider {
+ border: 1px solid #eee;
+ width: 99%;
+ margin: 10px auto;
+}
+
+.body ::v-deep .el-form-item {
+ margin-bottom: 0;
+}
+
+::v-deep .el-input__inner:focus {
+ border-color: $main_color;
+}
+
+::v-deep .el-select .el-input__inner:focus{
+ border-color: $main_color;
+}
+
+::v-deep .el-select-dropdown__item.selected{
+ color: $main_color;
+}
+::v-deep .el-checkbox__inner:hover{
+ border-color: $main_color;
+}
+::v-deep .el-textarea__inner:focus{
+ border-color: $main_color;
+}
</style>
diff --git a/src/views/template.vue b/src/views/template.vue
index fc78392..2d2c1d0 100644
--- a/src/views/template.vue
+++ b/src/views/template.vue
@@ -47,6 +47,7 @@
:data="tableData"
:height="tableHeight"
border
+ stripe
:style="{width: 100+'%',height:tableHeight+'px',}"
highlight-current-row
:header-cell-style="this.$headerCellStyle"
diff --git a/src/views/xtsz/bmgz.vue b/src/views/xtsz/bmgz.vue
index 2e6270d..6888427 100644
--- a/src/views/xtsz/bmgz.vue
+++ b/src/views/xtsz/bmgz.vue
@@ -152,9 +152,13 @@
</el-form-item>
<el-form-item label="鑷浣嶆暟" prop="incbit">
<!-- @change="handleChange"-->
- <el-input-number v-model="dialogForm.incbit" :min="1" :max="100" label="鎻忚堪鏂囧瓧" />
+ <!-- <el-input-number v-model="dialogForm.incbit" :min="1" :max="100" label="鎻忚堪鏂囧瓧" />-->
- <!-- <el-input v-model="dialogForm.incbit" style="width: 220px" />-->
+ <el-input
+ v-model="dialogForm.incbit"
+ oninput="value=value.replace(/[^0-9.]/g,'')"
+ style="width: 220px"
+ />
</el-form-item>
<el-form-item label="缂栫爜棰勮">
{{ encodingPre }}
@@ -235,17 +239,17 @@
},
watch: {
dialogForm: {
- handler(newVlaue, oldValue) {
+ handler(newValue, oldValue) {
const date = new Date()
let newDate = ''
- if (newVlaue.filingdate === 'YMD') {
- newDate = date.getFullYear() + '' + (date.getMonth() + 1 + '').padStart(2, '0') + '' + (date.getDate() + '').padStart(2, '0')
- } else if (newVlaue.filingdate === 'YM') {
- newDate = date.getFullYear() + '' + (date.getMonth() + 1 + '').padStart(2, '0')
- } else if (newVlaue.filingdate === 'Y') {
- newDate = date.getFullYear() + ''
+ if (newValue.filingdate === 'YMD') {
+ newDate = date.getFullYear().toString().substring(2, 4) + '' + (date.getMonth() + 1 + '').padStart(2, '0') + '' + (date.getDate() + '').padStart(2, '0')
+ } else if (newValue.filingdate === 'YM') {
+ newDate = date.getFullYear().toString().substring(2, 4) + '' + (date.getMonth() + 1 + '').padStart(2, '0')
+ } else if (newValue.filingdate === 'Y') {
+ newDate = date.getFullYear().toString().substring(2, 4) + ''
}
- this.encodingPre = newVlaue.prefix + '' + newDate + '' + (1 + '').padStart(newVlaue.incbit, '0')
+ this.encodingPre = newValue.prefix + '' + newDate + '' + (1 + '').padStart(newValue.incbit, '0')
},
immediate: true,
deep: true
diff --git a/src/views/zzmx/gxdy.vue b/src/views/zzmx/gxdy.vue
index c1ff956..a198963 100644
--- a/src/views/zzmx/gxdy.vue
+++ b/src/views/zzmx/gxdy.vue
@@ -390,8 +390,8 @@
],
steptypeArr: [
{ code: 'Z', name: '鑷埗' },
- { code: 'W', name: '澶栧崗' },
- { code: 'Z;W', name: '鑷埗锛涘鍗�' }
+ { code: 'W', name: '澶栧崗' }
+ // { code: 'Z;W', name: '鑷埗锛涘鍗�' }
],
total: 10,
tableData: [],
diff --git a/src/views/zzmx/jpgj.vue b/src/views/zzmx/jpgj.vue
index 3b93896..736c146 100644
--- a/src/views/zzmx/jpgj.vue
+++ b/src/views/zzmx/jpgj.vue
@@ -1,11 +1,988 @@
-<template />
+<template>
+ <div>
+ <div class="body" :style="{height:mainHeight+'px'}">
+ <div style="padding: 10px 5px 0 0">
+ <el-form
+ ref="form"
+ :model="form"
+ label-width="80px"
+ inline
+ style="display: flex;justify-content: space-between"
+ >
+ <div class="elForm">
+ <el-form-item label="浜у搧鍚嶇О" style=" display: flex;">
+ <el-select
+ v-model="form.partcode"
+ :popper-append-to-body="false"
+ style="width: 200px"
+ placeholder="璇烽�夋嫨"
+ @change="partChange"
+ >
+ <el-option
+ v-for="item in partArr"
+ :key="item.partcode"
+ :label="item.partname"
+ :value="item.partcode"
+ />
+ </el-select>
+ </el-form-item>
+ <el-form-item label="宸ヨ壓璺嚎" style=" display: flex;">
+ <el-select
+ v-model="form.routecode"
+ :disabled="form.partcode===''"
+ :popper-append-to-body="false"
+ style="width: 200px"
+ placeholder="璇烽�夋嫨"
+ @change="routeChange"
+ >
+ <el-option
+ v-for="item in routeArr"
+ :key="item.route_code"
+ :label="item.route_name"
+ :value="item.route_code"
+ />
+ </el-select>
+ </el-form-item>
+ <el-form-item label="鍏宠仈宸ュ簭" style=" display: flex;">
+ <el-select
+ v-model="form.stepcode"
+ :disabled="form.routecode===''"
+ :popper-append-to-body="false"
+ style="width: 200px"
+ placeholder="璇烽�夋嫨"
+ @change="stepChange"
+ >
+ <el-option
+ v-for="item in stepArr"
+ :key="item.code"
+ :label="item.name"
+ :value="item.code"
+ />
+ </el-select>
+ </el-form-item>
+ <el-form-item label="鍏宠仈璁惧" style=" display: flex;">
+ <el-select
+ v-model="form.eqpcode"
+ :disabled="form.stepcode===''"
+ :popper-append-to-body="false"
+ style="width: 200px"
+ placeholder="璇烽�夋嫨"
+ >
+ <el-option
+ v-for="item in eqpArr"
+ :key="item.code"
+ :label="item.name"
+ :value="item.code"
+ />
+ </el-select>
+ </el-form-item>
+ </div>
+ <div style="display: flex;align-items: start;margin-top: 5px;z-index: 2">
+ <el-button type="primary" icon="el-icon-search" @click="search">鏌ヨ</el-button>
+ <el-button type="info" icon="el-icon-refresh" @click="reset">閲嶇疆</el-button>
+ </div>
+ </el-form>
+ </div>
+ <el-divider />
+ <div style="margin-left: 10px;display: flex">
+ <el-button type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板</el-button>
+ <!-- <el-button type="primary" icon="el-icon-upload2" @click="upload">瀵煎叆</el-button>-->
+ </div>
+ <el-divider />
+ <div class="elTableDiv">
+ <el-table
+ :data="tableData"
+ :height="tableHeight"
+ border
+ stripe
+ :style="{width: 100+'%',height:tableHeight+'px',}"
+ highlight-current-row
+ :header-cell-style="this.$headerCellStyle"
+ :cell-style="this.$cellStyle"
+ @sort-change="sortChange"
+ >
+ <!-- <el-table-column-->
+ <!-- type="selection"-->
+ <!-- width="50"-->
+ <!-- />-->
+ <el-table-column
+ prop="RowNum"
+ width="50"
+ label="搴忓彿"
+ />
+ <el-table-column
+ prop="partcode"
+ label="浜у搧缂栫爜"
+ sortable="custom"
+ />
+ <el-table-column
+ prop="partname"
+ label="浜у搧鍚嶇О"
+ sortable="custom"
+ />
+ <el-table-column
+ prop="partspec"
+ label="浜у搧瑙勬牸"
+ width="110"
+ sortable="custom"
+ />
+ <el-table-column
+ prop="wksp_name"
+ label="鐢熶骇杞﹂棿"
+ sortable="custom"
+ />
+ <el-table-column
+ prop="route_name"
+ label="宸ヨ壓璺嚎"
+ sortable="custom"
+ />
+ <el-table-column
+ prop="stepname"
+ label="鍔犲伐宸ュ簭"
+ sortable="custom"
+ />
+ <el-table-column
+ prop="eqp_name"
+ label="鍔犲伐璁惧"
+ sortable="custom"
+ />
+ <el-table-column
+ prop="eqp_value"
+ label="璁惧鑺傛媿"
+ width="110"
+ sortable="custom"
+ />
+ <el-table-column
+ prop="stand_value"
+ label="鐢熶骇鑺傛媿"
+ width="110"
+ sortable="custom"
+ />
+ <el-table-column
+ prop="cavity_qty"
+ label="鍨嬭厰鏁�"
+ width="110"
+ sortable="custom"
+ />
+ <el-table-column
+ prop="unprice"
+ width="110"
+ label="璁′欢鍗曚环"
+ 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>
+ </div>
+ <!--鍒嗛〉-->
+ <pagination
+ v-show="total>0"
+ :total="total"
+ :page.sync="form.page"
+ :limit.sync="form.rows"
+ align="right"
+ layout="prev, pager, next,sizes"
+ popper-class="select_bottom"
+ @pagination="getBeatRateSearch"
+ />
+ </div>
+
+ <el-dialog
+ :title="operation==='add'?'鏂板':'淇敼'"
+ :visible.sync="dialogVisible"
+ width="70%"
+ top="15vh"
+ :close-on-click-modal="false"
+ @closed="handleClose"
+ @close="handleClose"
+ >
+ <el-form ref="dialogForm" inline :rules="dialogFormRules" :model="dialogForm" label-width="80px">
+ <div style="display: flex;align-items: center">
+ <i class="el-icon-s-comment" style="color:#42b983;margin-top: -20px" />
+ <el-form-item prop="partcode" label="浜у搧鍚嶇О">
+ <el-select
+ v-show="operation==='add'"
+ v-model="dialogForm.partcode"
+ style="width: 220px"
+ placeholder="璇烽�夋嫨"
+ :popper-append-to-body="false"
+ @change="partDialogChange"
+ >
+ <el-option
+ v-for="item in partArr"
+ :key="item.partcode"
+ :label="item.partname"
+ :value="item.partcode"
+ />
+ </el-select>
+ <el-input
+ v-show="operation!=='add'"
+ v-model="editPartName"
+ disabled
+ style="width: 220px"
+ />
+ </el-form-item>
+ <el-form-item prop="routecode" label="宸ヨ壓璺嚎">
+ <el-select
+ v-show="operation==='add'"
+ v-model="dialogForm.routecode"
+ style="width: 220px"
+ :disabled="dialogForm.partcode===''"
+ placeholder="璇烽�夋嫨"
+ :popper-append-to-body="false"
+ @change="routeDialogChange"
+ >
+ <el-option
+ v-for="item in routeDialogArr"
+ :key="item.route_code"
+ :label="item.route_name"
+ :value="item.route_code"
+ />
+ </el-select>
+ <el-input
+ v-show="operation!=='add'"
+ v-model="editRouteName"
+ disabled
+ style="width: 220px"
+ />
+ </el-form-item>
+ </div>
+ </el-form>
+ <div style="display: flex;flex-direction: column;margin-bottom: 20px">
+ <div>
+ <i class="el-icon-s-operation" style="color:#42b983;margin: -20px 10px 20px 0" />宸ュ簭闆嗗悎
+ </div>
+ <div style="display: flex;background-color: #F2F6FC;padding:20px 0 20px 20px; min-height: 100px">
+ <el-radio-group v-model="dialogForm.stepcode" @change="radioChange">
+ <el-radio
+ v-for="item in stepDialogArr"
+ :key="item.code"
+ :label="item.name"
+ border
+ />
+ </el-radio-group>
+ </div>
+
+ </div>
+
+ <div style="display: flex;flex-direction: column;min-height: 300px">
+ <div>
+ <i class="el-icon-s-operation" style="color:#42b983;margin: -20px 10px 20px 0" />璁惧鍒楄〃
+ </div>
+
+ <el-table
+ :data="eqpDialogArr"
+ height="400"
+ border
+ stripe
+ highlight-current-row
+ :header-cell-style="this.$headerCellStyle"
+ :cell-style="this.$cellStyle"
+ @sort-change="dialogSortChange"
+ >
+ <el-table-column
+ width="50"
+ label="搴忓彿"
+ prop="RowNum"
+ />
+ <el-table-column
+ prop="eqpcode"
+ label="璁惧缂栫爜"
+ sortable="custom"
+ />
+ <el-table-column
+ prop="eqpname"
+ label="璁惧鍚嶇О"
+ sortable="custom"
+ />
+ <el-table-column
+ prop="wksp_name"
+ sortable="custom"
+ label="鐢熶骇杞﹂棿"
+ />
+ <el-table-column
+ sortable="custom"
+ prop="eqp_value"
+ label="璁惧鑺傛媿"
+ width="110"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.isVisible===1" style="display: flex;align-items: center">
+ <el-input
+ v-model="row.eqp_value"
+ placeholder="璇疯緭鍏�"
+ oninput="value=value.replace(/[^0-9.]/g,'')"
+ @change="val=>eqpValueChange(val,row)"
+ />
+ <div style="margin-left: 5px">绉�</div>
+ </div>
+ <div v-if="row.isVisible===0">{{ row.eqp_value + ' ' + '绉�' }}</div>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="stand_value"
+ label="鐢熶骇鑺傛媿"
+ sortable="custom"
+ width="110"
+ >
+ <template slot-scope="{row}">
+ <div>{{ row.stand_value + ' ' + '绉�' }}</div>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="cavity_qty"
+ label="鑵斿瀷鏁�"
+ sortable="custom"
+ width="110"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.isVisible===1" style="display: flex;align-items: center">
+ <el-input
+ v-model="row.cavity_qty"
+ placeholder="璇疯緭鍏�"
+ oninput="value=value.replace(/[^0-9.]/g,'')"
+ @change="val=>cavityQtyChange(val,row)"
+ />
+ <!-- <div style="margin-left: 5px"></div>-->
+ </div>
+ <div v-if="row.isVisible===0">{{ row.cavity_qty }}</div>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="unprice"
+ sortable="custom"
+ label="璁′欢鍗曚环"
+ width="110"
+ >
+ <template slot-scope="{row}">
+ <el-input
+ v-if="row.isVisible===1"
+ v-model="row.unprice"
+ oninput="value=value.replace(/[^0-9.]/g,'')"
+ placeholder="璇疯緭鍏�"
+ />
+ <div v-if="row.isVisible===0">{{ row.unprice }}</div>
+ </template>
+ </el-table-column>
+ <el-table-column
+ label="鎿嶄綔"
+ >
+ <template slot-scope="{row}">
+ <div class="operationClass">
+ <el-button v-if="row.isVisible===1" type="text" @click="saveRow(row)">淇濆瓨</el-button>
+ <el-button v-if="row.isVisible===1" type="text" @click="cancelRow(row)">鍙栨秷</el-button>
+ <el-button v-if="row.isVisible===0" type="text" @click="editRow(row)">缂栬緫</el-button>
+ <el-button v-if="row.isVisible===0" type="text" @click="copyRow(row)">澶嶅埗</el-button>
+ </div>
+ </template>
+ </el-table-column>
+ </el-table>
+ <!--鍒嗛〉-->
+ <pagination
+ v-show="eqpTableLength>0"
+ :total="eqpTableLength"
+ :page.sync="eqpTable.page"
+ :limit.sync="eqpTable.rows"
+ align="right"
+ style="padding-top: 20px"
+ layout="prev, pager, next,sizes"
+ popper-class="select_bottom"
+ @pagination="getEqpTable"
+ />
+ </div>
+
+ <span slot="footer" class="dialog-footer">
+ <div class="footerButton">
+ <el-button @click="dialogVisibleCancel">杩� 鍥�</el-button>
+ <!-- <el-button @click="dialogVisibleCancel">鍙� 娑�</el-button>-->
+ <!-- <el-button type="primary" @click="dialogVisibleConfirm">纭� 瀹�</el-button>-->
+ </div>
+ </span>
+ </el-dialog>
+ </div>
+</template>
<script>
+import Pagination from '@/components/Pagination'
+import { AddUpdateOrganization, DeleteOrganization } from '@/api/jcsz'
+import { getCookie } from '@/utils/auth'
+import {
+ BeatRateSearch, DeleteBeatRate,
+ PartSelect,
+ PartSelectRpute,
+ RouteSelectStep, SaveBeatRate,
+ StepSelectEqp,
+ StepSelectEqpList
+} from '@/api/zzmx'
+
+const SER_HZ = /^[\u4e00-\u9fa5]+$/
export default {
- name: 'Jpgj'
+ name: 'Zzjg',
+ components: {
+ Pagination
+ },
+ data() {
+ const validateName = (rule, value, callback) => {
+ if (!value) {
+ return callback(new Error('璇疯緭鍏ョ紪鐮�'))
+ } else {
+ if (SER_HZ.test(value)) {
+ return callback(new Error('缂栫爜涓嶈兘涓轰腑鏂�'))
+ } else {
+ callback()
+ }
+ }
+ }
+ const validateTypeCode = (rule, value, callback) => {
+ if (!value) {
+ return callback(new Error('璇烽�夋嫨涓婄骇'))
+ } else {
+ callback()
+ }
+ }
+ return {
+ mainHeight: 0,
+ tableHeight: 0,
+ form: {
+ partcode: '', // 浜у搧缂栫爜
+ routecode: '', // 宸ヨ壓璺嚎缂栫爜
+ stepcode: '', // 宸ュ簭缂栫爜
+ eqpcode: '', // 璁惧缂栫爜
+ prop: 'partcode', // 鎺掑簭瀛楁
+ order: 'desc', // 鎺掑簭瀛楁
+ page: 1, // 绗嚑椤�
+ rows: 20 // 姣忛〉澶氬皯鏉�
+ },
+ partArr: [], // 浜у搧闆嗗悎
+ routeArr: [], // 浜у搧闆嗗悎
+ stepArr: [], // 浜у搧闆嗗悎
+ eqpArr: [], // 浜у搧闆嗗悎
+ total: 10,
+ tableData: [],
+ dialogVisible: false,
+ dialogForm: {
+ partcode: '', // 浜у搧缂栫爜
+ routecode: '', // 宸ヨ壓璺嚎缂栫爜
+ stepcode: '', // 宸ュ簭缂栫爜
+ eqpcode: '', // 璁惧缂栫爜
+ wkshopcode: '', // 鐢熶骇杞﹂棿缂栫爜
+ eqp_value: '', // 璁惧鑺傛媿
+ stand_value: '', // 鐢熶骇鑺傛媿
+ cavity_qty: '', // 鍨嬭厰鏁�
+ unprice: ''// 璁′欢鍗曚环
+ },
+ routeDialogArr: [], // 宸ヨ壓璺嚎
+ stepDialogArr: [], // 宸ュ簭闆嗗悎
+ eqpDialogArr: [], // 璁惧鍒楄〃
+ eqpTable: {
+ partcode: '',
+ routecode: '',
+ stepcode: '',
+ page: 1,
+ rows: 10,
+ prop: 'eqpcode',
+ order: 'desc'
+ },
+ eqpTableLength: 0,
+ isEqpTableEdit: true,
+ editPartName: '', // 缂栬緫鏃朵骇鍝佸悕绉�
+ editRouteName: '', // 缂栬緫鏃跺伐鑹鸿矾绾垮悕绉�
+ editStepName: '', // 缂栬緫鏃跺姞宸ュ伐搴忓悕绉�
+ 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'] }
+ ]
+ }
+
+ }
+ },
+ created() {
+ this.getBeatRateSearch()
+ this.getPartSelect()
+ },
+ mounted() {
+ window.addEventListener('resize', this.getHeight)
+ this.getHeight()
+ },
+ methods: {
+ async getBeatRateSearch() {
+ const res = await BeatRateSearch(this.form)
+ this.tableData = res.data
+ this.total = res.count
+ },
+ // 鎺掑簭鏀瑰彉鏃�
+ sortChange({ column, prop, order }) {
+ if (order === 'descending') {
+ order = 'desc'
+ } else if (order === 'ascending') {
+ order = 'asc'
+ } else {
+ order = 'desc'
+ }
+ this.form.order = order
+ this.form.prop = prop
+ this.getBeatRateSearch()
+ },
+ // 鏌ヨ
+ search() {
+ this.getBeatRateSearch()
+ },
+ async getPartSelect() {
+ const { data: res } = await PartSelect()
+ this.partArr = res
+ },
+ async partChange(val) {
+ const { data: res } = await PartSelectRpute({ partcode: val })
+ this.routeArr = res
+ this.form.routecode = ''
+ this.form.stepcode = ''
+ this.form.eqpcode = ''
+ },
+ async routeChange(val) {
+ const { data: res } = await RouteSelectStep({ routecode: val })
+ this.stepArr = res
+ this.form.stepcode = ''
+ this.form.eqpcode = ''
+ },
+ async stepChange(val) {
+ const { data: res } = await StepSelectEqp({ stepcode: val })
+ this.eqpArr = res
+ this.form.eqpcode = ''
+ },
+ // 閲嶇疆
+ reset() {
+ this.form.partcode = ''
+ this.form.routecode = ''
+ this.form.stepcode = ''
+ this.form.eqpcode = ''
+ this.getBeatRateSearch()
+ },
+ async partDialogChange(val) {
+ const { data: res } = await PartSelectRpute({ partcode: val })
+ console.log(this.routeDialogArr = res, 888)
+ this.stepDialogArr = []
+ this.eqpDialogArr = []
+ },
+ async routeDialogChange(val) {
+ const { data: res } = await RouteSelectStep({ routecode: val })
+ this.stepDialogArr = res
+ // this.stepDialogArr = [
+ // { code: '1001', name: '娴嬭瘯宸ュ簭1' },
+ // { code: '1002', name: '娴嬭瘯宸ュ簭2' },
+ // { code: '1003', name: '娴嬭瘯宸ュ簭3' },
+ // { code: '1004', name: '娴嬭瘯宸ュ簭4' },
+ // { code: '1005', name: '娴嬭瘯宸ュ簭5' },
+ // { code: '1006', name: '娴嬭瘯宸ュ簭6' },
+ // { code: '1007', name: '娴嬭瘯宸ュ簭7' },
+ // { code: '1008', name: '娴嬭瘯宸ュ簭8' },
+ // { code: '1009', name: '娴嬭瘯宸ュ簭9' }
+ // ]
+ this.eqpDialogArr = []
+ },
+ radioChange(val) {
+ // this.dialogForm.stepcode = this.stepDialogArr.find(item => item.name === val).code
+ this.getEqpTable(val)
+ },
+ dialogSortChange({ column, prop, order }) {
+ if (order === 'descending') {
+ order = 'desc'
+ } else if (order === 'ascending') {
+ order = 'asc'
+ } else {
+ order = 'desc'
+ }
+ this.eqpTable.order = order
+ this.eqpTable.prop = prop
+ this.getEqpTable()
+ },
+ async getEqpTable(val) {
+ if (typeof val === 'string') {
+ this.eqpTable.partcode = this.dialogForm.partcode
+ this.eqpTable.routecode = this.dialogForm.routecode
+ this.eqpTable.stepcode = this.stepDialogArr.find(item => item.name === val).code
+ } else if (typeof val === 'number') {
+ this.eqpTable.partcode = this.dialogForm.partcode
+ this.eqpTable.routecode = this.dialogForm.routecode
+ this.eqpTable.stepcode = this.stepDialogArr[0].code
+ this.dialogForm.stepcode = this.stepDialogArr[0].name
+ }
+ const res = await StepSelectEqpList(this.eqpTable)
+ this.eqpDialogArr = res.data
+ this.eqpTableLength = res.count
+
+ this.eqpDialogArr.forEach(item => {
+ item.isVisible = 0
+ })
+ },
+ // 淇濆瓨琛�
+ async saveRow(row) {
+ const data = {
+ partcode: this.eqpTable.partcode, // 浜у搧缂栫爜
+ routecode: this.eqpTable.routecode, // 宸ヨ壓璺嚎缂栫爜
+ stepcode: this.eqpTable.stepcode, // 宸ュ簭缂栫爜
+ eqpcode: row.eqpcode, // 璁惧缂栫爜
+ wkshopcode: row.wksp_code, // 鐢熶骇杞﹂棿缂栫爜
+ eqp_value: row.eqp_value, // 璁惧鑺傛媿
+ stand_value: row.stand_value, // 鐢熶骇鑺傛媿
+ cavity_qty: row.cavity_qty, // 鍨嬭厰鏁�
+ unprice: row.unprice// 璁′欢鍗曚环
+ }
+ console.log(data, 7)
+ // row.isVisible = 0
+ const res = await SaveBeatRate(data)
+ if (res.code === '200') {
+ this.isEqpTableEdit = true
+ this.$message.success('淇濆瓨鎴愬姛锛�')
+ await this.getEqpTable()
+ }
+ },
+ // 鍙栨秷琛�
+ cancelRow(row) {
+ this.getEqpTable()
+ this.isEqpTableEdit = true
+ },
+ // 缂栬緫琛�
+ editRow(row) {
+ if (this.isEqpTableEdit) {
+ row.isVisible = 1
+ this.isEqpTableEdit = false
+ } else {
+ return this.$message.info('鍙兘涓�琛屼竴琛屼慨鏀癸紒')
+ }
+ },
+ // 澶嶅埗琛�
+ async copyRow(row) {
+ console.log(row)
+ let currentData = {}// 褰撳墠琛屽璞�
+ let nextData = {}// 涓嬩竴琛屽璞�
+ if (row.RowNum === this.eqpDialogArr.length) {
+ return this.$message.info('姝よ娌℃湁涓嬩竴琛岋紒')
+ } else {
+ this.eqpDialogArr.forEach((item, index) => {
+ if (item.RowNum === row.RowNum) {
+ currentData = this.eqpDialogArr[index]
+ nextData = this.eqpDialogArr[index + 1]
+ }
+ })
+ }
+ console.log(currentData, 2)
+ console.log(nextData, 3)
+ const newData = {
+ partcode: this.eqpTable.partcode, // 浜у搧缂栫爜
+ routecode: this.eqpTable.routecode, // 宸ヨ壓璺嚎缂栫爜
+ stepcode: this.eqpTable.stepcode, // 宸ュ簭缂栫爜
+ eqpcode: nextData.eqpcode, // 璁惧缂栫爜
+ wkshopcode: nextData.wksp_code, // 鐢熶骇杞﹂棿缂栫爜
+ eqp_value: currentData.eqp_value, // 璁惧鑺傛媿
+ stand_value: currentData.stand_value, // 鐢熶骇鑺傛媿
+ cavity_qty: currentData.cavity_qty, // 鍨嬭厰鏁�
+ unprice: currentData.unprice// 璁′欢鍗曚环
+ }
+ console.log(newData, 4)
+ const res = await SaveBeatRate(newData)
+ if (res.code === '200') {
+ this.$message.success('澶嶅埗鎴愬姛锛�')
+ await this.getEqpTable()
+ }
+ },
+ // 璁惧鑺傛媿鍊兼敼鍙�
+ eqpValueChange(val, row) {
+ if (parseFloat(row.cavity_qty) !== 0) {
+ row.stand_value = parseFloat((parseFloat(val) / parseFloat(row.cavity_qty)).toFixed(2))
+ } else {
+ row.stand_value = 0
+ }
+ },
+ // 鑵斿瀷鏁板�兼敼鍙�
+ cavityQtyChange(val, row) {
+ if (parseFloat(val) !== 0) {
+ row.stand_value = parseFloat((parseFloat(row.eqp_value) / parseFloat(val)).toFixed(2))
+ } else {
+ row.stand_value = 0
+ }
+ },
+ // 鏂板鎸夐挳
+ add(operation) {
+ this.operation = operation
+ this.dialogVisible = true
+ },
+ // 淇敼鎸夐挳
+ async edit(operation, row) {
+ this.operation = operation
+ this.dialogVisible = true
+ console.log(row)
+
+ this.editPartName = row.partname
+ this.editRouteName = row.route_name
+ this.editStepName = row.stepname
+
+ // this.$nextTick(() => {
+ this.dialogForm.partcode = row.partcode
+ this.dialogForm.routecode = row.route_code
+ this.dialogForm.stepcode = row.stepcode
+ // })
+ await this.partDialogChange(row.partcode)
+ await this.routeDialogChange(row.route_code)
+ await this.radioChange(0)
+ },
+ // 鍒犻櫎鎸夐挳
+ async del(row) {
+ this.$confirm('鏄惁纭鍒犻櫎?', '鎻愮ず', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning'
+ }).then(() => {
+ const data = {
+ partcode: this.eqpTable.partcode,
+ routecode: this.eqpTable.routecode,
+ stepcode: this.eqpTable.stepcode,
+ eqpcode: row.eqp_code
+ }
+ console.log(data)
+ DeleteBeatRate(data).then(res => {
+ if (res.code === '200') {
+ this.$message.success('鍒犻櫎鎴愬姛!')
+ this.getBeatRateSearch()
+ }
+ })
+ }).catch(() => {
+ this.$message.info('宸插彇娑堝垹闄�')
+ })
+ },
+ // 瀵硅瘽妗嗗叧闂簨浠�
+ handleClose() {
+ this.dialogForm.partcode = ''
+ this.dialogForm.routecode = ''
+ this.dialogForm.stepcode = ''
+ this.dialogForm.eqpcode = ''
+ this.dialogForm.wkshopcode = ''
+ this.dialogForm.eqp_value = ''
+ this.dialogForm.stand_value = ''
+ this.dialogForm.cavity_qty = ''
+ this.dialogForm.unprice = ''
+ this.routeDialogArr = []
+ this.stepDialogArr = []
+ this.eqpDialogArr = []
+ this.$refs.dialogForm.clearValidate()
+ },
+ // 瀵硅瘽妗嗗彇娑�
+ dialogVisibleCancel() {
+ this.dialogVisible = false
+ },
+ // 瀵硅瘽妗嗙‘璁�
+ // dialogVisibleConfirm() {
+ // this.$refs.dialogForm.validate(valid => {
+ // if (valid) {
+ // 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.getBeatRateSearch()
+ // } else {
+ // this.$message.error(this.operation === 'add' ? '娣诲姞澶辫触锛�' : '淇敼澶辫触锛�')
+ // }
+ // })
+ // }
+ // })
+ // },
+ // 鑾峰彇椤甸潰楂樺害
+ getHeight() {
+ this.$nextTick(() => {
+ this.mainHeight = window.innerHeight - 250
+ this.tableHeight = this.mainHeight - 100
+ })
+ }
+ }
}
</script>
-<style scoped>
+<style lang="scss" scoped>
+$main_color: #42b983;
+::v-deep .el-button--primary {
+ background-color: $main_color !important;
+ height: 30px;
+ display: flex;
+ align-items: center;
+ //border: 1px solid $main_color;
+ border: none;
+ padding: 0 20px;
+}
+
+::v-deep .el-button--primary:hover {
+ border: none;
+}
+
+::v-deep .el-button--info {
+ height: 30px;
+ display: flex;
+ align-items: center;
+ padding: 0 20px;
+}
+
+::v-deep .el-pagination.is-background .el-pager li:not(.disabled).active {
+ background-color: $main_color !important;
+}
+
+::v-deep .el-dialog__footer {
+ display: flex;
+ justify-content: flex-end;
+}
+
+.footerButton {
+ display: flex;
+ justify-content: end;
+}
+
+::v-deep .el-button--default {
+ background-color: #ffffff !important;
+ height: 30px;
+ display: flex;
+ align-items: center;
+ padding: 0 20px;
+}
+
+::v-deep .el-button--default:hover {
+ color: #606266;
+}
+
+::v-deep .el-dialog__body {
+ padding: 20px 20px !important;
+}
+
+::v-deep .el-radio__input.is-checked .el-radio__inner {
+ background-color: $main_color;
+ border-color: $main_color;
+}
+
+::v-deep .el-radio__input.is-checked + .el-radio__label {
+ color: $main_color !important;
+}
+
+::v-deep .el-checkbox__input.is-checked .el-checkbox__inner {
+ border-color: $main_color;
+ background-color: $main_color;
+}
+
+::v-deep .el-input__inner {
+ height: 30px;
+ line-height: 30px;
+}
+
+::v-deep .el-input__inner:focus {
+ border-color: $main_color;
+}
+
+::v-deep .el-table .caret-wrapper {
+ transform: scale(0.8);
+}
+
+::v-deep .cell {
+ display: flex !important;
+ align-items: center !important;
+ justify-content: space-between !important;
+}
+
+::v-deep .el-button--text {
+ color: $main_color;
+ font-size: 14px;
+ cursor: pointer;
+}
+
+.operationClass {
+ height: 23px;
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+}
+
+.el-icon-share {
+ color: $main_color;
+ cursor: pointer;
+}
+
+.el-checkbox.is-bordered.is-checked {
+ border-color: $main_color;
+}
+
+::v-deep .el-radio__input.is-checked .el-radio__inner {
+ border-color: $main_color;
+ background: $main_color;
+}
+
+::v-deep .el-checkbox__input.is-indeterminate .el-checkbox__inner {
+ border-color: $main_color;
+ background: $main_color;
+}
+
+::v-deep .el-checkbox__input.is-checked + .el-checkbox__label {
+ color: $main_color !important;
+}
+
+::v-deep .el-checkbox.is-bordered + .el-checkbox.is-bordered {
+ margin: 10px 30px 0px 0;
+}
+
+::v-deep .el-radio__input.is-checked + .el-radio__label {
+ color: $main_color;
+}
+
+::v-deep .el-radio.is-bordered + .el-radio.is-bordered {
+ margin: 10px 30px 0px 0;
+}
+
+.body ::v-deep .el-divider {
+ border: 1px solid #eee;
+ width: 99%;
+ margin: 10px auto;
+}
+
+.body ::v-deep .el-form-item {
+ margin-bottom: 0;
+}
+
+::v-deep .el-input__inner:focus {
+ border-color: $main_color;
+}
+
+::v-deep .el-select .el-input__inner:focus {
+ border-color: $main_color;
+}
+
+::v-deep .el-select-dropdown__item.selected {
+ color: $main_color;
+}
+
+::v-deep .el-checkbox__inner:hover {
+ border-color: $main_color;
+}
+
+::v-deep .el-textarea__inner:focus {
+ border-color: $main_color;
+}
</style>
--
Gitblit v1.9.3