From b46bc2dba51a3885a68e4c58316b41a31ea16bb2 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期二, 14 二月 2023 13:35:03 +0800
Subject: [PATCH] 1.存货档案修改
---
src/views/scgl/scdd.vue | 808 +++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 526 insertions(+), 282 deletions(-)
diff --git a/src/views/scgl/scdd.vue b/src/views/scgl/scdd.vue
index a063c82..a54b462 100644
--- a/src/views/scgl/scdd.vue
+++ b/src/views/scgl/scdd.vue
@@ -1,18 +1,35 @@
<template>
<div>
<div class="body" :style="{height:mainHeight+'px'}">
- <div style="padding: 10px 5px 0 0">
+
+ <div class="bodyTopButtonGroup" style="justify-content: space-between">
+ <el-button
+ v-waves
+ icon="el-icon-refresh-right"
+ @click="syncERP"
+ >鍚屾ERP
+ </el-button>
+ <el-button
+ v-waves
+ icon="el-icon-switch-button"
+ @click="orderClose"
+ >鍏抽棴璁㈠崟
+ </el-button>
+ </div>
+
+ <div class="bodyTopFormGroup">
<el-form
ref="form"
:model="form"
- label-width="80px"
+ label-width="100px"
inline
- style="display: flex;justify-content: space-between"
+ style="display: flex;"
>
<div class="elForm">
<el-form-item label="璁㈠崟鐘舵��" style=" display: flex;">
<el-select
v-model="form.erporderstus"
+ filterable
:popper-append-to-body="false"
style="width: 200px"
placeholder="璇烽�夋嫨"
@@ -28,80 +45,112 @@
<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-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="璇疯緭鍏�" />
</el-form-item>
- <el-form-item label="浜у搧瑙勬牸" style=" display: flex;">
+ <el-form-item v-show="isExpandForm" 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"
- style="width: 200px"
- placeholder="閫夋嫨鏃ユ湡"
- />
- </el-form-item>
- <el-form-item label="鍒涘缓浜哄憳" style=" display: flex;">
+ <el-form-item v-show="isExpandForm" label="鍒涘缓浜哄憳" style=" display: flex;">
<el-input v-model="form.creatuser" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
- <el-form-item label="鍒涘缓鏃堕棿" style=" display: flex;">
+ <el-form-item
+ v-show="isExpandForm"
+ label="棰勮寮�宸ユ椂闂�"
+ label-width="100px"
+ style="display: flex;font-size: 14px;align-items: center"
+ >
<el-date-picker
- v-model="form.createdate"
- type="date"
- style="width: 200px"
- placeholder="閫夋嫨鏃ユ湡"
+ v-model="form.paystartdate"
+ type="daterange"
+ range-separator="~"
+ class="timeMini"
+ size="mini"
+ style="width: 200px;display: flex;line-height: 34px;height: 34px;"
+ :clearable="false"
+ start-placeholder="寮�濮嬫棩鏈�"
+ end-placeholder="缁撴潫鏃ユ湡"
/>
+ <!-- font-size: 14px!important;-->
+ <!-- :picker-options="expireTimeOption"-->
+
+ </el-form-item>
+ <el-form-item
+ v-show="isExpandForm"
+ label="棰勮瀹屽伐鏃堕棿"
+ label-width="100px"
+ style=" display: flex;font-size: 14px;align-items: center"
+ >
+ <el-date-picker
+ v-model="form.payenddate"
+ type="daterange"
+ :clearable="false"
+ class="timeMini"
+ range-separator="~"
+ start-placeholder="寮�濮嬫棩鏈�"
+ style="width: 200px;display: flex;line-height: 34px ;height: 34px ;"
+ end-placeholder="缁撴潫鏃ユ湡"
+ size="mini"
+ />
+ <!-- :picker-options="expireTimeOption"-->
+ <!-- <el-date-picker-->
+ <!-- v-model="form.createdate"-->
+ <!-- type="date"-->
+ <!-- size="mini"-->
+ <!-- :clearable="false"-->
+ <!-- style="width: 200px;"-->
+ <!-- format="yyyy-MM-dd"-->
+ <!-- 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
+ class="bodySearchReset"
+ :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}"
+ >
+ <el-button v-waves type="primary" icon="el-icon-search" @click="search">鏌ヨ</el-button>
+ <el-button v-waves type="info" icon="el-icon-refresh" @click="reset">閲嶇疆</el-button>
</div>
+
</el-form>
+
+ <div
+ class="bodyTopFormExpand"
+ >
+ <svg-icon
+ v-show="mouseHoverType==='mouseout'"
+ style="cursor: pointer"
+ :icon-class="!isExpandForm?'doubleDown3':'doubleUp3'"
+ @mouseenter="mouseHoverType=$event.type"
+ />
+ <svg-icon
+ v-show="mouseHoverType==='mouseenter'"
+ style="cursor: pointer"
+ :icon-class="!isExpandForm?'doubleDown':'doubleUp'"
+ @click="isExpandForm=!isExpandForm"
+ @mouseout="mouseHoverType=$event.type"
+ />
+ </div>
</div>
- <el-divider />
- <div style="margin-left: 10px;display: flex">
- <el-button
- type="primary"
- icon="el-icon-refresh-right"
- @click="reset"
- >鍚屾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">
<el-table
+ ref="tableDataRef"
+ class="tableFixed"
:data="tableData"
- :height="tableHeight"
+ :height="isExpandForm?tableHeight:(tableHeight+40)+'px'"
border
- stripe
- :style="{width: 100+'%',height:tableHeight+'px',}"
+ :row-class-name="tableRowClassName"
+ :style="{width: 100+'%',height:isExpandForm?tableHeight:(tableHeight+40)+'px',}"
highlight-current-row
:header-cell-style="this.$headerCellStyle"
:cell-style="this.$cellStyle"
@sort-change="sortChange"
+ @row-click="rowClick"
>
<!-- <el-table-column-->
<!-- type="selection"-->
@@ -109,19 +158,21 @@
<!-- />-->
<el-table-column
width="50"
+ fixed
>
<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)"
+ v-model="radioSelectedId"
+ :label="row.id"
+ style="color: transparent;padding-left: 10px;"
/>
+ <!-- @change.native="getCurrentRow(row.id)"-->
</template>
</el-table-column>
<el-table-column
prop="RowNum"
width="50"
+ fixed
label="搴忓彿"
/>
<el-table-column
@@ -129,68 +180,150 @@
label="璁㈠崟鐘舵��"
sortable="custom"
width="110"
+ show-tooltip-when-overflow
>
<template slot-scope="{row}">
<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==='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="璁㈠崟缂栧彿"
+ show-tooltip-when-overflow
sortable="custom"
+ min-width="150"
/>
<el-table-column
prop="partcode"
label="浜у搧缂栫爜"
sortable="custom"
+ show-tooltip-when-overflow
+ min-width="150"
/>
<el-table-column
prop="partname"
label="浜у搧鍚嶇О"
sortable="custom"
+ min-width="150"
+ show-tooltip-when-overflow
/>
<el-table-column
prop="partspec"
label="浜у搧瑙勬牸"
sortable="custom"
- width="110"
- />
+ show-tooltip-when-overflow
+ min-width="110"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.partspec">{{ row.partspec }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
<el-table-column
prop="qty"
label="璁㈠崟鏁伴噺"
+ width="150"
+ show-tooltip-when-overflow
+ sortable="custom"
+ />
+ <el-table-column
+ prop="relse_qty"
+ label="宸蹭笅鍗曟暟閲�"
+ show-tooltip-when-overflow
+ width="150"
sortable="custom"
/>
<el-table-column
prop="wkshp_name"
label="鐢熶骇杞﹂棿"
+ show-tooltip-when-overflow
sortable="custom"
- />
+ width="150"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.wkshp_name">{{ row.wkshp_name }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
<el-table-column
- prop="paydate"
- label="瑕佹眰浜や粯鏃堕棿"
+ prop="planstartdate"
+ show-tooltip-when-overflow
+ label="棰勮寮�宸ユ椂闂�"
sortable="custom"
- width="160"
- />
+ width="130"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.planstartdate">{{ row.planstartdate.substring(0, 11) }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
<el-table-column
+ prop="planenddate"
+ label="棰勮瀹屽伐鏃堕棿"
+ show-tooltip-when-overflow
+ sortable="custom"
+ width="130"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.planenddate">{{ row.planenddate.substring(0, 11) }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="saleOrderDeliveryDate"
+ label="棰勮浜や粯鏃ユ湡"
+ sortable="custom"
+ show-tooltip-when-overflow
+ width="130"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.saleOrderDeliveryDate">{{ row.saleOrderDeliveryDate.substring(0, 11) }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
+ <el-table-column
+ show-tooltip-when-overflow
prop="createuser"
label="鍒涘缓浜哄憳"
sortable="custom"
- />
+ width="150"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.createuser">{{ row.createuser }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
<el-table-column
prop="createdate"
label="鍒涘缓鏃堕棿"
- width="160"
+ width="130"
+ show-tooltip-when-overflow
sortable="custom"
- />
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.createdate">{{ row.createdate.substring(0, 11) }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
<el-table-column
label="鎿嶄綔"
+ fixed="right"
+ width="80"
>
<template slot-scope="{row}">
<div class="operationClass">
- <el-button type="text" @click="edit('edit',row)">涓嬭揪</el-button>
+ <el-tooltip class="item" effect="dark" content="涓嬭揪" placement="top">
+ <!-- <el-button v-waves type="text" @click="edit('edit',row)">涓嬭揪</el-button>-->
+ <i
+ class="el-icon-bottom"
+ :style="{color:$store.state.settings.theme}"
+ style="cursor: pointer;margin-left: 5px"
+ @click="edit('edit',row)"
+ />
+ </el-tooltip>
</div>
</template>
</el-table-column>
@@ -198,42 +331,43 @@
</div>
<!--鍒嗛〉-->
<pagination
- v-show="total>0"
:total="total"
:page.sync="form.page"
:limit.sync="form.rows"
align="right"
- layout="prev, pager, next,sizes"
+ layout="total,prev, pager, next,sizes"
popper-class="select_bottom"
@pagination="getErpOrderSearch"
/>
</div>
<el-dialog
+ v-el-drag-dialog
:title="operation==='add'?'鏂板':'涓嬭揪'"
:visible.sync="dialogVisible"
- width="50%"
+ width="860px"
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="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 ref="dialogForm" inline :rules="dialogFormRules" :model="dialogForm" label-width="106px">
+ <!-- <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>
@@ -243,9 +377,7 @@
<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>
@@ -254,6 +386,17 @@
</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
+ oninput="value=value.replace(/[^0-9.]/g,'')"
+ style="width: 200px"
+ />
</el-form-item>
<el-form-item label="涓嬪崟鏁伴噺" prop="markqty">
<el-input
@@ -269,29 +412,31 @@
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 label="棰勮浜や粯鏃ユ湡" prop="saleOrderDeliveryDate">
+ <el-date-picker
+ v-model="dialogForm.saleOrderDeliveryDate"
+ type="date"
+ size="mini"
+ :clearable="false"
+ class="dateMini"
+ :picker-options="pickerOptions"
+ format="yyyy-MM-dd"
+ placeholder="閫夋嫨鏃ユ湡"
+ :disabled="dialogForm.saleOrderDeliveryDateIsDisabled"
/>
</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 v-waves @click="dialogVisibleCancel">鍙� 娑�</el-button>
+ <el-button
+ v-waves
+ type="primary"
+ :loading="$store.state.app.buttonIsDisabled"
+ :disabled="$store.state.app.buttonIsDisabled"
+ @click="dialogVisibleConfirm"
+ >涓� 杈�</el-button>
</div>
</span>
</el-dialog>
@@ -300,17 +445,19 @@
<script>
import Pagination from '@/components/Pagination'
-import { AddUpdateOrganization, DeleteOrganization, OrganizationSearch, PrentOrganization } from '@/api/jcsz'
-import { getCookie } from '@/utils/auth'
import { ClosedErpOrder, ErpOrderSearch, MarkSaveErpOrder } from '@/api/scgl'
-import { PartSelect } from '@/api/zzmx'
+import { handleDatetime } from '@/utils/global'
+import { SeaveSearchErpOrder } from '@/api/ErpSyncMes'
+import elDragDialog from '@/directive/el-drag-dialog'
+import waves from '@/directive/waves'
const SER_HZ = /^[\u4e00-\u9fa5]+$/
export default {
- name: 'Zzjg',
+ name: 'SCDD',
components: {
Pagination
},
+ directives: { elDragDialog, waves },
data() {
const validateName = (rule, value, callback) => {
if (!value) {
@@ -324,6 +471,8 @@
}
}
return {
+ mouseHoverType: 'mouseout',
+ isExpandForm: false,
mainHeight: 0,
tableHeight: 0,
form: {
@@ -332,30 +481,31 @@
partcode: '', // 浜у搧缂栫爜
partname: '', // 浜у搧鍚嶇О
partspec: '', // 浜у搧瑙勬牸
- paydate: '', // 浜や粯鏃堕棿
creatuser: '', // 鍒涘缓浜哄憳
+ // paystartdate: '', // 浜や粯鏃堕棿
+ paystartdate: '', // 棰勮寮�宸ユ椂闂�
+ payenddate: '', // 棰勮瀹屽伐鏃堕棿
createdate: '', // 鍒涘缓鏃堕棿
- prop: 'partcode', // 鎺掑簭瀛楁
+ prop: 'wo', // 鎺掑簭瀛楁
order: 'desc', // 鎺掑簭瀛楁
page: 1, // 绗嚑椤�
rows: 20 // 姣忛〉澶氬皯鏉�
},
- // partArr: [],
erporderstusArr: [
{ code: 'NEW', name: '鏂拌鍗�' },
- { code: 'CREATING', name: '鍒涘缓涓�' },
- { code: 'CREATED', name: '宸插垱寤�' },
+ { code: 'CREATING', name: '閮ㄥ垎涓嬭揪' },
+ { code: 'CREATED', name: '鍏ㄩ儴涓嬭揪' },
{ code: 'CLOSED', name: '宸插叧闂�' }
],
total: 10,
- // radioSelected: {},
- radioSelected: '',
+ radioSelectedId: '',
tableData: [],
dialogVisible: false,
dialogForm: {
+ erporderid: '',
partname: '', // 浜у搧鍚嶇О
partspec: '', // 浜у搧瑙勬牸
- paydate: '', // 浜や粯鏃堕棿
+ // paystartdate: '', // 棰勮寮�宸ユ椂闂�
wkshopname: '', // 杞﹂棿鍚嶇О
warehousename: '', // 浠撳簱鍚嶇О
@@ -368,7 +518,10 @@
erpqty: '', // 璁㈠崟鏁伴噺
markqty: '', // 涓嬪崟鏁伴噺
ordernum: '', // 涓嬪崟鍗曟暟
- relse_qty: '' // 宸蹭笅鍗曟暟閲�
+ relse_qty: '', // 宸蹭笅鍗曟暟閲�
+ saleOrderDeliveryDate: '', // 棰勮浜や粯鏃ユ湡
+
+ saleOrderDeliveryDateIsDisabled: false// 棰勮浜や粯鏃ユ湡瀛楁鏄惁鍙慨鏀�
},
operation: '',
dialogFormRules: {
@@ -383,9 +536,23 @@
],
ordernum: [
{ required: true, message: '璇疯緭鍏ヤ笅鍗曞崟鏁�', trigger: ['blur', 'change'] }
+ ],
+ saleOrderDeliveryDate: [
+ { required: true, message: '璇烽�夋嫨棰勮浜や粯鏃ユ湡', trigger: ['blur', 'change'] }
]
+ },
+ pickerOptions: {
+ disabledDate(time) {
+ return time.getTime() < Date.now() - 8.64e7
+ }
}
+
+ // expireTimeOption: {
+ // disabledDate(time) {
+ // return time.getTime() > Date.now() - 8.64e6 // 濡傛灉娌℃湁鍚庨潰鐨�-8.64e6灏辨槸涓嶅彲浠ラ�夋嫨浠婂ぉ鐨�
+ // }
+ // }
}
},
@@ -399,17 +566,39 @@
},
methods: {
async getErpOrderSearch() {
- const res = await ErpOrderSearch(this.form)
+ console.log(this.form, 1)
+ let tempDate2 = this.form.paystartdate
+ if (tempDate2.length > 0) {
+ tempDate2 = handleDatetime(tempDate2[0]) + '~' + handleDatetime(tempDate2[1])
+ }
+
+ let tempDate = this.form.payenddate
+ 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, // 浜у搧瑙勬牸
+ paystartdate: tempDate2, // 浜や粯鏃堕棿
+ payenddate: tempDate, // 浜や粯鏃堕棿
+ creatuser: this.form.creatuser, // 鍒涘缓浜哄憳
+ // createdate: this.form.createdate.toString().length > 0 ? handleDatetime(this.form.createdate) : '', // 鍒涘缓鏃堕棿
+
+ 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
},
- // syncGetErpOrderSearch() {
- // this.getErpOrderSearch()
- // },
- // async getPartSelect() {
- // const { data: res } = await PartSelect()
- // this.partArr = res
- // },
// 鎺掑簭鏀瑰彉鏃�
sortChange({ column, prop, order }) {
if (order === 'descending') {
@@ -423,6 +612,33 @@
this.form.prop = prop
this.getErpOrderSearch()
},
+ // 鍚屾ERP
+ syncERP() {
+ const loading = this.$loading({
+ lock: true,
+ text: '姝ｅ湪鍚屾ERP锛岃绋嶇瓑...',
+ spinner: 'el-icon-loading',
+ customClass: 'osloading',
+ background: 'rgba(0, 0, 0, 0.7)'
+ })
+
+ SeaveSearchErpOrder().then(res => {
+ console.log(res, 11)
+ if (res.code === '200') {
+ setTimeout(() => {
+ this.getErpOrderSearch()
+ loading.close()
+ this.$message.success('鍚屾鎴愬姛锛�')
+ }, 2000)
+ }
+ // else if (res.code === '300') {
+ // setTimeout(() => {
+ // loading.close()
+ // this.$message.error('鍚屾澶辫触锛�')
+ // }, 10000)
+ // }
+ })
+ },
// 鏌ヨ
search() {
this.getErpOrderSearch()
@@ -434,40 +650,45 @@
this.form.partcode = ''
this.form.partname = ''
this.form.partspec = ''
- this.form.paydate = ''
+ this.form.paystartdate = ''
+ this.form.payenddate = ''
this.form.creatuser = ''
this.form.createdate = ''
this.getErpOrderSearch()
},
// 鍗曢�夋閫変腑鑾峰彇褰撳墠琛屼俊鎭�
- getCurrentRow(wo) {
- this.radioSelected = wo
+ getCurrentRow(id) {
+ this.radioSelectedId = id
+ },
+ rowClick(row) {
+ this.radioSelectedId = row.id
},
// 璁㈠崟鍏抽棴
- async orderClose() {
- console.log(this.radioSelected, 1)
-
- this.$confirm('鏄惁纭鍏抽棴璁㈠崟?', '鎻愮ず', {
- confirmButtonText: '纭畾',
- cancelButtonText: '鍙栨秷',
- type: 'warning'
- }).then(() => {
- this.tableData.forEach((item, index) => {
- if (this.radioSelected === item.wo) {
- if (item.status !== 'NEW') {
- return this.$message.info('姝よ鍗曢潪鏂拌鍗曪紝鏃犳硶鍏抽棴锛�')
- }
+ async orderClose() {
+ if (this.radioSelectedId.length < 1) {
+ return this.$message.info('璇峰厛閫夋嫨璁㈠崟锛�')
+ }
+ this.tableData.forEach(item => {
+ if (item.id === this.radioSelectedId) {
+ if (item.status !== 'NEW') {
+ return this.$message.info('姝よ鍗曢潪鏂拌鍗曪紝鏃犳硶鍏抽棴锛�')
+ } else {
+ this.$confirm('鏄惁纭鍏抽棴璁㈠崟?', '鎻愮ず', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning'
+ }).then(() => {
+ ClosedErpOrder({ erpordercode: item.wo, erporderid: this.radioSelectedId }).then(res => {
+ if (res.code === '200') {
+ this.$message.success('璁㈠崟鍏抽棴鎴愬姛!')
+ this.getErpOrderSearch()
+ }
+ })
+ }).catch(() => {
+ this.$message.info('宸插彇娑堝叧闂紒')
+ })
}
- })
-
- ClosedErpOrder({ erpordercode: this.radioSelected }).then(res => {
- if (res.code === '200') {
- this.$message.success('鍒犻櫎鎴愬姛!')
- this.getErpOrderSearch()
- }
- })
- }).catch(() => {
- this.$message.info('宸插彇娑堝垹闄�')
+ }
})
},
// 鏂板鎸夐挳
@@ -477,10 +698,15 @@
},
// 淇敼鎸夐挳
edit(operation, row) {
+ if (parseFloat(row.qty) === parseFloat(row.relse_qty)) {
+ return this.$message.info('姝ゅ伐鍗曞凡鍏ㄩ儴涓嬭揪锛�')
+ }
+
this.operation = operation
this.dialogVisible = true
this.$nextTick(() => {
+ this.dialogForm.erporderid = row.id
this.dialogForm.erporderstus = row.status
this.dialogForm.erpordercode = row.wo
this.dialogForm.partcode = row.partcode
@@ -490,6 +716,10 @@
this.dialogForm.wkshopname = row.wkshp_name
this.dialogForm.warehousecode = row.stck_code
this.dialogForm.warehousename = row.stck_name
+
+ this.dialogForm.saleOrderDeliveryDate = row.saleOrderDeliveryDate
+
+ this.dialogForm.saleOrderDeliveryDateIsDisabled = this.dialogForm.saleOrderDeliveryDate !== null
this.dialogForm.erpqty = row.qty
this.dialogForm.markqty = parseFloat(row.qty) - parseFloat(row.relse_qty)
@@ -509,10 +739,15 @@
this.dialogForm.warehousecode = ''
this.dialogForm.warehousename = ''
+ this.dialogForm.saleOrderDeliveryDate = ''
+
this.dialogForm.erpqty = ''
this.dialogForm.markqty = ''
this.dialogForm.ordernum = ''
this.dialogForm.relse_qty = ''
+
+ this.dialogForm.saleOrderDeliveryDateIsDisabled = false
+
this.$refs.dialogForm.clearValidate()
},
// 瀵硅瘽妗嗗彇娑�
@@ -521,10 +756,24 @@
},
// 瀵硅瘽妗嗙‘璁�
dialogVisibleConfirm() {
+ this.dialogForm.markqty = parseFloat(this.dialogForm.markqty)
+ this.dialogForm.erpqty = parseFloat(this.dialogForm.erpqty)
+ this.dialogForm.relse_qty = parseFloat(this.dialogForm.relse_qty)
+ this.dialogForm.ordernum = parseFloat(this.dialogForm.ordernum)
+ 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) {
+ this.$store.state.app.buttonIsDisabled = true
const data = {
- 'erporderstus': this.dialogForm.erporderstus,
+ 'erporderid': this.dialogForm.erporderid,
+ // 'erporderstus': this.dialogForm.erporderstus,
'erpordercode': this.dialogForm.erpordercode,
'partcode': this.dialogForm.partcode,
'wkshopcode': this.dialogForm.wkshopcode,
@@ -532,14 +781,16 @@
'erpqty': this.dialogForm.erpqty,
'markqty': this.dialogForm.markqty,
'ordernum': this.dialogForm.ordernum,
- 'relse_qty': this.dialogForm.relse_qty
+ 'relse_qty': this.dialogForm.relse_qty,
+ 'saleOrderDeliveryDate': handleDatetime(this.dialogForm.saleOrderDeliveryDate) + ' 00:00:00'
}
- console.log(data)
+
MarkSaveErpOrder(data).then(res => {
if (res.code === '200') {
- this.$message.success('涓嬭揪鎴愬姛锛�')
this.dialogVisible = false
+ this.$message.success('涓嬭揪鎴愬姛锛�')
this.getErpOrderSearch()
+ this.$store.state.app.buttonIsDisabled = false
} else {
this.$message.error('涓嬭揪澶辫触锛�')
}
@@ -550,39 +801,85 @@
// 鑾峰彇椤甸潰楂樺害
getHeight() {
this.$nextTick(() => {
- this.mainHeight = window.innerHeight - 250
- this.tableHeight = this.mainHeight - 100
+ this.mainHeight = window.innerHeight - 85
+ this.tableHeight = this.mainHeight - 250
+
+ this.$refs.tableDataRef.doLayout()
})
+ },
+ tableRowClassName({ row, rowIndex }) {
+ return 'custom-row'
}
}
}
</script>
+<!--鍏叡椤甸潰鏍峰紡-->
<style lang="scss" scoped>
$main_color: #42b983;
+::v-deep .el-range-input {
+ //font-size: 14px !important;
+}
+
+::v-deep .el-range__icon {
+ line-height: 28px !important;
+}
+
+::v-deep .el-range-separator {
+ line-height: 28px !important;
+}
+
+::v-deep .el-range-input {
+ font-size: 14px;
+}
+
+::v-deep .el-range-separator {
+ display: flex;
+ justify-content: center;
+ align-items: center;
+}
+
+.el-icon-share, .el-icon-delete, .el-icon-edit-outline {
+ color: $main_color;
+ cursor: pointer;
+}
+
+.el-icon-edit-outline {
+ margin-right: 15px;
+}
+
+::v-deep .el-button--primary, .el-button--default, .el-button--info {
+ height: 34px;
+ display: flex;
+ align-items: center;
+ padding: 0 15px;
+}
+
::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;
+ //background-color: $main_color !important;
}
-::v-deep .el-button--primary:hover {
+::v-deep .el-button--default {
+ background-color: #f8f8fa;
border: none;
}
-::v-deep .el-button--info {
- height: 30px;
- display: flex;
- align-items: center;
- padding: 0 20px;
+::v-deep .el-input__inner {
+ height: 34px;
+ line-height: 34px;
+ //color: #a7a7a7;
}
-::v-deep .el-pagination.is-background .el-pager li:not(.disabled).active {
- background-color: $main_color !important;
+::v-deep .el-dialog__body {
+ padding: 20px 100px !important;
+}
+
+::v-deep .dialogVisibleRoles .el-dialog__body {
+ padding: 20px 20px !important;
+}
+
+::v-deep .importPickerClass .el-dialog__body {
+ padding: 20px 20px !important;
}
::v-deep .el-dialog__footer {
@@ -590,106 +887,30 @@
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;
+ justify-content: space-between;
}
-.el-icon-share {
- color: $main_color;
- cursor: pointer;
+::v-deep .el-table::before {
+ height: 0;
}
-.el-checkbox.is-bordered.is-checked {
- border-color: $main_color;
+::v-deep .el-table__body-wrapper {
+ background-color: #f8f8fa;
}
-::v-deep .el-radio__input.is-checked .el-radio__inner {
- border-color: $main_color;
- background: $main_color;
+::v-deep .el-table__body .el-table__row.hover-row td {
+ background-color: #eaecef;
}
-::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;
+::v-deep .el-form--inline .el-form-item__label {
+ color: #a7a7a7;
}
.body ::v-deep .el-divider {
@@ -702,30 +923,53 @@
margin-bottom: 0;
}
-::v-deep .el-input__inner:focus {
- border-color: $main_color;
+.userDialogVisible ::v-deep .el-form-item {
+ margin-bottom: 0;
}
-::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;
-}
-
-.elTableDiv{
- ::v-deep .el-radio__label{
+.elTableDiv {
+ ::v-deep .el-radio__label {
display: none;
}
}
+.tableFixed {
+ ::v-deep .el-table__fixed-right {
+ height: 100% !important;
+ }
+
+ ::v-deep .el-table__fixed {
+ height: 100% !important;
+ }
+}
+
+.dateMini {
+ ::v-deep .el-input__inner {
+ line-height: 34px;
+ height: 34px;
+ width: 200px;
+ display: flex;
+ font-size: 14px !important;
+ align-items: center !important;
+ }
+
+ ::v-deep .el-input__prefix {
+ margin-top: -3px;
+ }
+}
+
</style>
+<style>
+.el-table .custom-row {
+ background: #f8f8fa;
+}
+
+.osloading {
+ font-size: 26px !important;
+}
+
+.el-loading-text {
+ font-size: 26px !important;
+}
+</style>
+
--
Gitblit v1.9.3