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 | 433 ++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 295 insertions(+), 138 deletions(-)
diff --git a/src/views/scgl/scdd.vue b/src/views/scgl/scdd.vue
index dd8303e..42439ad 100644
--- a/src/views/scgl/scdd.vue
+++ b/src/views/scgl/scdd.vue
@@ -31,15 +31,6 @@
<el-form-item label="浜у搧缂栫爜" style=" display: flex;">
<el-input v-model="form.partcode" style="width: 200px" placeholder="璇疯緭鍏�" />
-
- <!-- <el-select v-model="form.partcode" :popper-append-to-body="false" style="width: 200px" placeholder="璇烽�夋嫨">-->
- <!-- <el-option-->
- <!-- v-for="item in partArr"-->
- <!-- :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.partname" style="width: 200px" placeholder="璇疯緭鍏�" />
@@ -50,10 +41,15 @@
<el-form-item label="浜や粯鏃堕棿" style=" display: flex;">
<el-date-picker
v-model="form.paydate"
- type="date"
- style="width: 200px"
- placeholder="閫夋嫨鏃ユ湡"
+ type="daterange"
+ range-separator="~"
+ size="mini"
+ :clearable="false"
+ start-placeholder="寮�濮嬫棩鏈�"
+ end-placeholder="缁撴潫鏃ユ湡"
/>
+ <!-- :picker-options="expireTimeOption"-->
+
</el-form-item>
<el-form-item label="鍒涘缓浜哄憳" style=" display: flex;">
<el-input v-model="form.creatuser" style="width: 200px" placeholder="璇疯緭鍏�" />
@@ -61,15 +57,51 @@
<el-form-item label="鍒涘缓鏃堕棿" style=" display: flex;">
<el-date-picker
v-model="form.createdate"
- type="date"
- style="width: 200px"
- placeholder="閫夋嫨鏃ユ湡"
+ type="daterange"
+ :clearable="false"
+ range-separator="~"
+ start-placeholder="寮�濮嬫棩鏈�"
+ end-placeholder="缁撴潫鏃ユ湡"
+ size="mini"
/>
+ <!-- :picker-options="expireTimeOption"-->
+
</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 style="min-height: 100px">
+ <div style="display: flex;align-items: start;margin-top: 5px;z-index: 2;justify-content: end">
+ <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>
+ <!-- <div v-if="!isFullscreen" style="display: flex;align-items: start; margin-top: 15px;z-index: 2">-->
+ <!-- <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>-->
+ <!-- </div>-->
+ <!-- <div v-if="isFullscreen" style="display: flex;flex-direction: column;align-items: end">-->
+ <!-- <el-button-->
+ <!-- type="primary"-->
+ <!-- icon="el-icon-refresh-right"-->
+ <!-- style="margin: 10px 0"-->
+ <!-- @click="reset('update')"-->
+ <!-- >鍚屾ERP-->
+ <!-- </el-button>-->
+ <!-- <el-button-->
+ <!-- type="primary"-->
+ <!-- icon="el-icon-switch-button"-->
+ <!-- @click="orderClose"-->
+ <!-- >鍏抽棴璁㈠崟-->
+ <!-- </el-button>-->
+ <!-- </div>-->
</div>
</el-form>
</div>
@@ -78,13 +110,14 @@
<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>-->
@@ -109,12 +142,12 @@
<el-table-column
width="50"
>
- <template scope="scope">
+ <template slot-scope="{row}">
<el-radio
v-model="radioSelected"
- :label="scope.$index"
+ :label="row.wo"
style="color: #fff;padding-left: 10px; margin-right: -25px;"
- @change.native="getCurrentRow(scope.row)"
+ @change.native="getCurrentRow(row.wo)"
/>
</template>
</el-table-column>
@@ -130,24 +163,29 @@
width="110"
>
<template slot-scope="{row}">
- <div v-if="row.status==='CREATING'">杩涜涓�</div>
- <div v-if="row.status==='NEW'">鏈紑濮�</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="wo"
label="璁㈠崟缂栧彿"
sortable="custom"
+ width="150"
/>
<el-table-column
prop="partcode"
label="浜у搧缂栫爜"
sortable="custom"
+ width="150"
/>
<el-table-column
prop="partname"
label="浜у搧鍚嶇О"
sortable="custom"
+ width="150"
/>
<el-table-column
prop="partspec"
@@ -158,37 +196,40 @@
<el-table-column
prop="qty"
label="璁㈠崟鏁伴噺"
+ width="150"
sortable="custom"
/>
<el-table-column
prop="wkshp_name"
- label="鐢熸垚杞﹂棿"
+ label="鐢熶骇杞﹂棿"
sortable="custom"
+ width="150"
/>
<el-table-column
prop="paydate"
label="瑕佹眰浜や粯鏃堕棿"
sortable="custom"
- show-overflow-tooltip
+ width="160"
/>
<el-table-column
prop="createuser"
label="鍒涘缓浜哄憳"
sortable="custom"
+ width="150"
/>
<el-table-column
prop="createdate"
label="鍒涘缓鏃堕棿"
- show-overflow-tooltip
+ width="160"
sortable="custom"
/>
<el-table-column
label="鎿嶄綔"
+ fixed="right"
>
<template slot-scope="{row}">
<div class="operationClass">
- <el-button type="text" @click="edit('edit',row)">缂栬緫</el-button>
- <!-- <el-button type="text" @click="del(row)">鍒犻櫎</el-button>-->
+ <el-button type="text" @click="edit('edit',row)">涓嬭揪</el-button>
</div>
</template>
</el-table-column>
@@ -208,60 +249,85 @@
</div>
<el-dialog
- :title="operation==='add'?'鏂板':'缂栬緫'"
+ :title="operation==='add'?'鏂板':'涓嬭揪'"
:visible.sync="dialogVisible"
- width="50%"
+ width="800px"
top="15vh"
+ :close-on-click-modal="false"
@closed="handleClose"
@close="handleClose"
>
<el-form ref="dialogForm" inline :rules="dialogFormRules" :model="dialogForm" label-width="80px">
- <el-form-item label="璁㈠崟鐘舵��" prop="OrgCode">
- <el-select
- v-model="form.partcode"
+ <!-- <el-form-item label="璁㈠崟鐘舵��" prop="erporderstus">-->
+ <!-- <el-select-->
+ <!-- v-model="dialogForm.erporderstus"-->
+ <!-- disabled-->
+ <!-- :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="璁㈠崟缂栧彿" 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="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="erpqty">
+ <el-input v-model="dialogForm.erpqty" disabled style="width: 200px" />
+ </el-form-item>
+ <el-form-item label="宸蹭笅鍗曟暟" prop="relse_qty">
+ <el-input
+ v-model="dialogForm.relse_qty"
disabled
- :popper-append-to-body="false"
- style="width: 220px"
- 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="璁㈠崟缂栧彿" prop="OrgCode">
- <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" disabled style="width: 220px" />
- </el-form-item>
- <el-form-item label="浜у搧鍚嶇О" prop="OrgName">
- <el-input v-model="dialogForm.OrgName" disabled style="width: 220px" />
- </el-form-item>
- <el-form-item label="璁㈠崟鏁伴噺" prop="OrgName">
- <el-input v-model="dialogForm.OrgName" disabled style="width: 220px" />
- </el-form-item>
- <el-form-item label="浜у搧瑙勬牸" prop="OrgName">
- <el-input v-model="dialogForm.OrgName" disabled 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 label="涓嬪崟鏁伴噺" prop="OrgName">
- <el-input v-model="dialogForm.OrgName" style="width: 220px" />
- </el-form-item>
- <el-form-item label="浜や粯鏃堕棿" prop="OrgName">
- <el-date-picker
- v-model="dialogForm.OrgName"
- type="date"
- style="width: 220px"
- placeholder="閫夋嫨鏃ユ湡"
+ oninput="value=value.replace(/[^0-9.]/g,'')"
+ style="width: 200px"
/>
- <!-- <el-input v-model="dialogForm.OrgName" style="width: 220px" />-->
</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="">-->
+ <!-- <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">
@@ -276,10 +342,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 { PartSelect } from '@/api/zzmx'
+import { ClosedErpOrder, ErpOrderSearch, MarkSaveErpOrder } from '@/api/scgl'
+import { handleDatatime, handleDatetime } from '@/utils/global'
const SER_HZ = /^[\u4e00-\u9fa5]+$/
export default {
@@ -300,6 +364,7 @@
}
}
return {
+ isFullscreen: false,
mainHeight: 0,
tableHeight: 0,
form: {
@@ -311,39 +376,60 @@
paydate: '', // 浜や粯鏃堕棿
creatuser: '', // 鍒涘缓浜哄憳
createdate: '', // 鍒涘缓鏃堕棿
- prop: 'partcode', // 鎺掑簭瀛楁
+ prop: 'createdate', // 鎺掑簭瀛楁
order: 'desc', // 鎺掑簭瀛楁
page: 1, // 绗嚑椤�
rows: 20 // 姣忛〉澶氬皯鏉�
},
- // partArr: [],
erporderstusArr: [
- { code: 'CREATING', name: '杩涜涓�' },
- { code: 'NEW', name: '鏈紑濮�' }
+ { code: 'NEW', name: '鏂拌鍗�' },
+ { code: 'CREATING', name: '鍒涘缓涓�' },
+ { code: 'CREATED', name: '宸插垱寤�' },
+ { code: 'CLOSED', name: '宸插叧闂�' }
],
total: 10,
- radioSelected: {},
+ 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'] }
]
}
+ // expireTimeOption: {
+ // disabledDate(time) {
+ // return time.getTime() > Date.now() - 8.64e6 // 濡傛灉娌℃湁鍚庨潰鐨�-8.64e6灏辨槸涓嶅彲浠ラ�夋嫨浠婂ぉ鐨�
+ // }
+ // }
}
},
@@ -357,14 +443,37 @@
},
methods: {
async getErpOrderSearch() {
- const res = await ErpOrderSearch(this.form)
+ console.log(this.form, 1)
+ let tempDate2 = this.form.paydate
+ if (tempDate2.length > 0) {
+ tempDate2 = handleDatetime(tempDate2[0]) + '~' + handleDatetime(tempDate2[1])
+ }
+
+ let tempDate = this.form.createdate
+ if (tempDate.length > 0) {
+ tempDate = handleDatetime(tempDate[0]) + '~' + handleDatetime(tempDate[1])
+ }
+
+ const data = {
+ erporderstus: this.form.erporderstus, // 璁㈠崟鐘舵�佺爜
+ erpordercode: this.form.erpordercode, // 璁㈠崟缂栧彿
+ partcode: this.form.partcode, // 浜у搧缂栫爜
+ partname: this.form.partname, // 浜у搧鍚嶇О
+ partspec: this.form.partspec, // 浜у搧瑙勬牸
+ paydate: tempDate2, // 浜や粯鏃堕棿
+ creatuser: this.form.creatuser, // 鍒涘缓浜哄憳
+ createdate: tempDate, // 鍒涘缓鏃堕棿
+ prop: this.form.prop, // 鎺掑簭瀛楁
+ order: this.form.order, // 鎺掑簭瀛楁
+ page: this.form.page, // 绗嚑椤�
+ rows: this.form.rows // 姣忛〉澶氬皯鏉�
+
+ }
+
+ const res = await ErpOrderSearch(data)
this.tableData = res.data
this.total = res.count
},
- // async getPartSelect() {
- // const { data: res } = await PartSelect()
- // this.partArr = res
- // },
// 鎺掑簭鏀瑰彉鏃�
sortChange({ column, prop, order }) {
if (order === 'descending') {
@@ -383,7 +492,7 @@
this.getErpOrderSearch()
},
// 閲嶇疆
- reset() {
+ reset(val) {
this.form.erporderstus = ''
this.form.erpordercode = ''
this.form.partcode = ''
@@ -393,15 +502,42 @@
this.form.creatuser = ''
this.form.createdate = ''
this.getErpOrderSearch()
+ if (val.length > 0) {
+ this.$message.success('ERP宸插悓姝ワ紒')
+ }
},
// 鍗曢�夋閫変腑鑾峰彇褰撳墠琛屼俊鎭�
- getCurrentRow(row) {
- console.log(row, 1)
- this.radioSelected = row
+ getCurrentRow(wo) {
+ this.radioSelected = wo
},
// 璁㈠崟鍏抽棴
- orderClose() {
- console.log(this.radioSelected, 1)
+ async orderClose() {
+ if (this.radioSelected.length < 1) {
+ return this.$message.info('璇峰厛閫夋嫨璁㈠崟锛�')
+ }
+ this.tableData.forEach(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) {
@@ -414,34 +550,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()
},
// 瀵硅瘽妗嗗彇娑�
@@ -450,21 +590,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('涓嬭揪澶辫触锛�')
}
})
}
@@ -475,6 +628,10 @@
this.$nextTick(() => {
this.mainHeight = window.innerHeight - 250
this.tableHeight = this.mainHeight - 100
+ this.isFullscreen = window.innerHeight < 800
+ if (this.isFullscreen) {
+ this.tableHeight = this.tableHeight - 50
+ }
})
}
}
@@ -645,8 +802,8 @@
border-color: $main_color;
}
-.elTableDiv{
- ::v-deep .el-radio__label{
+.elTableDiv {
+ ::v-deep .el-radio__label {
display: none;
}
}
--
Gitblit v1.9.3