From 68eaf315b64145e487d10e66183d542ee7f94d10 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期二, 05 七月 2022 17:35:33 +0800
Subject: [PATCH] 1.生产管理完成部分功能2.自定义页面打印、二维码图形、水印显示实现了一个demo
---
src/views/scgl/scdd.vue | 427 +++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 313 insertions(+), 114 deletions(-)
diff --git a/src/views/scgl/scdd.vue b/src/views/scgl/scdd.vue
index 77e192c..0a366ff 100644
--- a/src/views/scgl/scdd.vue
+++ b/src/views/scgl/scdd.vue
@@ -11,7 +11,12 @@
>
<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-select
+ v-model="form.erporderstus"
+ :popper-append-to-body="false"
+ style="width: 200px"
+ placeholder="璇烽�夋嫨"
+ >
<el-option
v-for="item in erporderstusArr"
:key="item.code"
@@ -20,21 +25,39 @@
/>
</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 label="璁㈠崟缂栧彿" style=" display: flex;">
+ <el-input v-model="form.erpordercode" 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 label="浜у搧缂栫爜" style=" display: flex;">
+ <el-input v-model="form.partcode" style="width: 200px" placeholder="璇疯緭鍏�" />
+ </el-form-item>
+ <el-form-item label="浜у搧鍚嶇О" style=" display: flex;">
+ <el-input v-model="form.partname" style="width: 200px" placeholder="璇疯緭鍏�" />
+ </el-form-item>
+ <el-form-item label="浜у搧瑙勬牸" style=" display: flex;">
+ <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-form-item>
<el-form-item label="鍒涘缓浜哄憳" style=" display: flex;">
- <el-input v-model="form.UserName" style="width: 200px" placeholder="璇疯緭鍏�" />
+ <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-form-item>
</div>
<div style="display: flex;align-items: start;margin-top: 5px;z-index: 2">
@@ -45,8 +68,20 @@
</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>
+ <el-button
+ type="primary"
+ icon="el-icon-refresh-right"
+ @click="reset('update')"
+ >鍚屾ERP
+ </el-button>
+ <el-button
+ type="primary"
+ icon="el-icon-switch-button"
+ @click="orderClose"
+ >鍏抽棴璁㈠崟
+ </el-button>
+ <!-- <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">
@@ -66,46 +101,81 @@
<!-- 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
prop="RowNum"
width="50"
label="搴忓彿"
/>
<el-table-column
- prop="org_code"
- label="缁勭粐缂栫爜"
+ prop="status"
+ label="璁㈠崟鐘舵��"
sortable="custom"
- />
- <el-table-column
- prop="org_name"
- label="缁勭粐鍚嶇О"
- sortable="custom"
- />
- <el-table-column
- prop="description"
- label="缁勭粐绫诲瀷"
- sortable="custom"
+ width="110"
>
<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>
+ <div v-if="row.status==='NEW'">鏂拌鍗�</div>
+ <div v-if="row.status==='CREATING'">鍒涘缓涓�</div>
+ <div v-if="row.status==='CREATED'">宸插垱寤�</div>
+ <div v-if="row.status==='CLOSED'">宸插叧闂�</div>
</template>
</el-table-column>
<el-table-column
- prop="parentorg_name"
- label="涓婄骇鍗曚綅"
+ prop="wo"
+ label="璁㈠崟缂栧彿"
sortable="custom"
/>
<el-table-column
- prop="lm_user"
+ prop="partcode"
+ label="浜у搧缂栫爜"
+ sortable="custom"
+ />
+ <el-table-column
+ prop="partname"
+ label="浜у搧鍚嶇О"
+ sortable="custom"
+ />
+ <el-table-column
+ prop="partspec"
+ label="浜у搧瑙勬牸"
+ sortable="custom"
+ width="110"
+ />
+ <el-table-column
+ prop="qty"
+ label="璁㈠崟鏁伴噺"
+ sortable="custom"
+ />
+ <el-table-column
+ prop="wkshp_name"
+ label="鐢熶骇杞﹂棿"
+ sortable="custom"
+ />
+ <el-table-column
+ prop="paydate"
+ label="瑕佹眰浜や粯鏃堕棿"
+ sortable="custom"
+ width="160"
+ />
+ <el-table-column
+ prop="createuser"
label="鍒涘缓浜哄憳"
sortable="custom"
/>
<el-table-column
- prop="lm_date"
+ prop="createdate"
label="鍒涘缓鏃堕棿"
+ width="160"
sortable="custom"
/>
<el-table-column
@@ -113,8 +183,7 @@
>
<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>
+ <el-button type="text" @click="edit('edit',row)">涓嬭揪</el-button>
</div>
</template>
</el-table-column>
@@ -134,41 +203,89 @@
</div>
<el-dialog
- :title="operation==='add'?'鏂板':'淇敼'"
+ :title="operation==='add'?'鏂板':'涓嬭揪'"
:visible.sync="dialogVisible"
- width="50%"
+ width="60%"
top="15vh"
+ :close-on-click-modal="false"
@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-form ref="dialogForm" inline :rules="dialogFormRules" :model="dialogForm" label-width="80px">
+ <el-form-item label="璁㈠崟鐘舵��" prop="erporderstus">
<el-select
- v-model="dialogForm.SupUnit"
- style="width: 220px"
- placeholder="璇烽�夋嫨"
+ v-model="dialogForm.erporderstus"
+ disabled
:popper-append-to-body="false"
+ style="width: 200px"
+ placeholder="璇烽�夋嫨"
>
<el-option
- v-for="item in SupUnitArr"
+ v-for="item in erporderstusArr"
:key="item.code"
:label="item.name"
:value="item.code"
/>
</el-select>
</el-form-item>
+ <el-form-item label="璁㈠崟缂栧彿" prop="erpordercode">
+ <el-input v-model="dialogForm.erpordercode" disabled style="width: 200px" />
+ </el-form-item>
+ <el-form-item label="浜у搧缂栫爜" prop="partcode">
+ <el-input v-model="dialogForm.partcode" disabled style="width: 200px" />
+ </el-form-item>
+ <el-form-item label="浜у搧鍚嶇О" prop="partname">
+ <el-input v-model="dialogForm.partname" disabled style="width: 200px" />
+ </el-form-item>
+ <el-form-item label="璁㈠崟鏁伴噺" prop="erpqty">
+ <el-input v-model="dialogForm.erpqty" disabled style="width: 200px" />
+ </el-form-item>
+ <el-form-item label="浜у搧瑙勬牸" prop="partspec">
+ <el-input v-model="dialogForm.partspec" disabled style="width: 200px" />
+ </el-form-item>
+ <el-form-item label="鐢熶骇杞﹂棿" prop="wkshopname">
+ <el-input v-model="dialogForm.wkshopname" disabled style="width: 200px" />
+ </el-form-item>
+ <el-form-item label="鎵�灞炰粨搴�" prop="warehousename">
+ <el-input v-model="dialogForm.warehousename" disabled style="width: 200px" />
+ </el-form-item>
+ <el-form-item label="涓嬪崟鏁伴噺" prop="markqty">
+ <el-input
+ v-model="dialogForm.markqty"
+ oninput="value=value.replace(/[^0-9.]/g,'')"
+ style="width: 200px"
+ />
+ </el-form-item>
+ <el-form-item label="涓嬪崟鍗曟暟" prop="ordernum">
+ <el-input
+ v-model="dialogForm.ordernum"
+ oninput="value=value.replace(/[^0-9.]/g,'')"
+ style="width: 200px"
+ />
+ </el-form-item>
+ <el-form-item label="宸蹭笅鍗曟暟" prop="relse_qty">
+ <el-input
+ v-model="dialogForm.relse_qty"
+ disabled
+ oninput="value=value.replace(/[^0-9.]/g,'')"
+ style="width: 200px"
+ />
+ </el-form-item>
+ <!-- <el-form-item label="浜や粯鏃堕棿" prop="">-->
+ <!-- <el-date-picker-->
+ <!-- v-model="dialogForm.markqty"-->
+ <!-- type="date"-->
+ <!-- style="width: 200px"-->
+ <!-- placeholder="閫夋嫨鏃ユ湡"-->
+ <!-- />-->
+ <!-- <el-input v-model="dialogForm.OrgName" style="width: 200px" />-->
+ <!-- </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="dialogVisibleConfirm">涓� 杈�</el-button>
</div>
</span>
</el-dialog>
@@ -177,9 +294,8 @@
<script>
import Pagination from '@/components/Pagination'
-import { AddUpdateOrganization, DeleteOrganization, OrganizationSearch, PrentOrganization } from '@/api/jcsz'
-import { getCookie } from '@/utils/auth'
-import { ErpOrderSearch } from '@/api/scgl'
+import { ClosedErpOrder, ErpOrderSearch, MarkSaveErpOrder } from '@/api/scgl'
+import { handleDatatime } from '@/utils/global'
const SER_HZ = /^[\u4e00-\u9fa5]+$/
export default {
@@ -217,28 +333,46 @@
rows: 20 // 姣忛〉澶氬皯鏉�
},
erporderstusArr: [
- { code: 'CREATING', name: '杩涜涓�' },
- { code: 'CREATE', name: '鏈紑濮�' }
+ { code: 'NEW', name: '鏂拌鍗�' },
+ { code: 'CREATING', name: '鍒涘缓涓�' },
+ { code: 'CREATED', name: '宸插垱寤�' },
+ { code: 'CLOSED', name: '宸插叧闂�' }
],
total: 10,
+ radioSelected: '',
tableData: [],
dialogVisible: false,
dialogForm: {
- OrgType: '',
- OrgCode: '',
- OrgName: '',
- SupUnit: ''// 涓婄骇鍗曚綅
+ partname: '', // 浜у搧鍚嶇О
+ partspec: '', // 浜у搧瑙勬牸
+ paydate: '', // 浜や粯鏃堕棿
+ wkshopname: '', // 杞﹂棿鍚嶇О
+ warehousename: '', // 浠撳簱鍚嶇О
+
+ erporderstus: '', // 璁㈠崟鐘舵�佺爜
+ erpordercode: '', // 璁㈠崟缂栧彿
+ partcode: '', // 浜у搧缂栫爜
+ wkshopcode: '', // 杞﹂棿缂栫爜
+ warehousecode: '', // 浠撳簱缂栫爜
+
+ erpqty: '', // 璁㈠崟鏁伴噺
+ markqty: '', // 涓嬪崟鏁伴噺
+ ordernum: '', // 涓嬪崟鍗曟暟
+ relse_qty: '' // 宸蹭笅鍗曟暟閲�
},
operation: '',
dialogFormRules: {
- OrgType: [
- { required: true, message: '璇疯緭鍏ラ�夋嫨绫诲瀷', trigger: ['blur', 'change'] }
+ // OrgType: [
+ // { required: true, message: '璇疯緭鍏ラ�夋嫨绫诲瀷', trigger: ['blur', 'change'] }
+ // ],
+ // OrgCode: [
+ // { required: true, validator: validateName, trigger: ['blur', 'change'] }
+ // ],
+ markqty: [
+ { required: true, message: '璇疯緭鍏ヤ笅鍗曟暟閲�', trigger: ['blur', 'change'] }
],
- OrgCode: [
- { required: true, validator: validateName, trigger: ['blur', 'change'] }
- ],
- OrgName: [
- { required: true, message: '璇疯緭鍏ュ悕绉�', trigger: ['blur', 'change'] }
+ ordernum: [
+ { required: true, message: '璇疯緭鍏ヤ笅鍗曞崟鏁�', trigger: ['blur', 'change'] }
]
}
@@ -247,6 +381,7 @@
},
created() {
this.getErpOrderSearch()
+ // this.getPartSelect()// 鑾峰彇浜у搧缂栫爜淇℃伅
},
mounted() {
window.addEventListener('resize', this.getHeight)
@@ -275,18 +410,54 @@
search() {
this.getErpOrderSearch()
},
- upload() {
-
- },
// 閲嶇疆
- reset() {
- this.form.OrgCode = ''
- this.form.OrgName = ''
- this.form.OrgType = ''
- this.form.UserName = ''
+ reset(val) {
+ this.form.erporderstus = ''
+ this.form.erpordercode = ''
+ this.form.partcode = ''
+ this.form.partname = ''
+ this.form.partspec = ''
+ this.form.paydate = ''
+ this.form.creatuser = ''
+ this.form.createdate = ''
this.getErpOrderSearch()
+ if (val.length > 0) {
+ this.$message.success('ERP宸插悓姝ワ紒')
+ }
},
-
+ // 鍗曢�夋閫変腑鑾峰彇褰撳墠琛屼俊鎭�
+ getCurrentRow(wo) {
+ this.radioSelected = wo
+ },
+ // 璁㈠崟鍏抽棴
+ async orderClose() {
+ if (this.radioSelected.length < 1) {
+ return this.$message.info('璇峰厛閫夋嫨璁㈠崟锛�')
+ }
+ this.tableData.find(item => {
+ if (item.wo === this.radioSelected) {
+ if (item.status !== 'NEW') {
+ return this.$message.info('姝よ鍗曢潪鏂拌鍗曪紝鏃犳硶鍏抽棴锛�')
+ } else {
+ this.$confirm('鏄惁纭鍏抽棴璁㈠崟?', '鎻愮ず', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning'
+ }).then(() => {
+ ClosedErpOrder({ erpordercode: this.radioSelected }).then(res => {
+ if (res.code === '200') {
+ this.$message.success('璁㈠崟鍏抽棴鎴愬姛!')
+ this.getErpOrderSearch()
+ // this.radioSelected = ''
+ }
+ })
+ }).catch(() => {
+ this.$message.info('宸插彇娑堝叧闂紒')
+ })
+ }
+ }
+ })
+ },
// 鏂板鎸夐挳
add(operation) {
this.operation = operation
@@ -298,34 +469,38 @@
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('宸插彇娑堝垹闄�')
+ this.dialogForm.erporderstus = row.status
+ this.dialogForm.erpordercode = row.wo
+ this.dialogForm.partcode = row.partcode
+ this.dialogForm.partname = row.partname
+ this.dialogForm.partspec = row.partspec
+ this.dialogForm.wkshopcode = row.wkshp_code
+ this.dialogForm.wkshopname = row.wkshp_name
+ this.dialogForm.warehousecode = row.stck_code
+ this.dialogForm.warehousename = row.stck_name
+
+ this.dialogForm.erpqty = row.qty
+ this.dialogForm.markqty = parseFloat(row.qty) - parseFloat(row.relse_qty)
+ this.dialogForm.ordernum = 1
+ this.dialogForm.relse_qty = row.relse_qty
})
},
// 瀵硅瘽妗嗗叧闂簨浠�
handleClose() {
- this.dialogForm.OrgType = ''
- this.dialogForm.OrgCode = ''
- this.dialogForm.OrgName = ''
- this.dialogForm.SupUnit = ''
+ this.dialogForm.erporderstus = ''
+ this.dialogForm.erpordercode = ''
+ this.dialogForm.partcode = ''
+ this.dialogForm.partname = ''
+ this.dialogForm.partspec = ''
+ this.dialogForm.wkshopcode = ''
+ this.dialogForm.wkshopname = ''
+ this.dialogForm.warehousecode = ''
+ this.dialogForm.warehousename = ''
+
+ this.dialogForm.erpqty = ''
+ this.dialogForm.markqty = ''
+ this.dialogForm.ordernum = ''
+ this.dialogForm.relse_qty = ''
this.$refs.dialogForm.clearValidate()
},
// 瀵硅瘽妗嗗彇娑�
@@ -334,21 +509,34 @@
},
// 瀵硅瘽妗嗙‘璁�
dialogVisibleConfirm() {
+ if (this.dialogForm.markqty < 1 || this.dialogForm.markqty > this.dialogForm.erpqty - this.dialogForm.relse_qty) {
+ return this.$message.info('涓嬪崟鏁伴噺瓒呭嚭鍙笅鍗曟暟鐨勮寖鍥达紒')
+ }
+ if (this.dialogForm.ordernum < 1 || this.dialogForm.ordernum > this.dialogForm.markqty) {
+ return this.$message.info('涓嬪崟鍗曟暟瓒呭嚭鍙笅鍗曞崟鏁扮殑鑼冨洿锛�')
+ }
+
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')
+ 'erporderstus': this.dialogForm.erporderstus,
+ 'erpordercode': this.dialogForm.erpordercode,
+ 'partcode': this.dialogForm.partcode,
+ 'wkshopcode': this.dialogForm.wkshopcode,
+ 'warehousecode': this.dialogForm.warehousecode,
+ 'erpqty': this.dialogForm.erpqty,
+ 'markqty': this.dialogForm.markqty,
+ 'ordernum': this.dialogForm.ordernum,
+ 'relse_qty': this.dialogForm.relse_qty
}
- AddUpdateOrganization(data).then(res => {
+ console.log(data)
+ MarkSaveErpOrder(data).then(res => {
if (res.code === '200') {
- this.$message.success(this.operation === 'add' ? '娣诲姞鎴愬姛锛�' : '淇敼鎴愬姛锛�')
+ this.$message.success('涓嬭揪鎴愬姛锛�')
this.dialogVisible = false
this.getErpOrderSearch()
} else {
- this.$message.error(this.operation === 'add' ? '娣诲姞澶辫触锛�' : '淇敼澶辫触锛�')
+ this.$message.error('涓嬭揪澶辫触锛�')
}
})
}
@@ -376,9 +564,11 @@
border: none;
padding: 0 20px;
}
+
::v-deep .el-button--primary:hover {
border: none;
}
+
::v-deep .el-button--info {
height: 30px;
display: flex;
@@ -434,6 +624,7 @@
height: 30px;
line-height: 30px;
}
+
::v-deep .el-input__inner:focus {
border-color: $main_color;
}
@@ -510,18 +701,26 @@
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;
}
+.elTableDiv{
+ ::v-deep .el-radio__label{
+ display: none;
+ }
+}
+
</style>
--
Gitblit v1.9.3