From 2c52158fd8edcf85cdeb101cb7f3ad1509db9d31 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期四, 21 九月 2023 10:19:54 +0800
Subject: [PATCH] 1.订单下达100%,2.ERP接口同步100%
---
src/api/WorkOrder.js | 83 ++
src/views/materialManager/inventoryList.vue | 38 +
src/api/ErpSyncMes.js | 30 +
src/views/workOrder/produceOrderList.vue | 1024 ++++++++++++++++++++++++++++++++++++
src/views/basicSettings/warehouseList.vue | 47 +
src/views/basicSettings/processSList.vue | 7
src/views/basicSettings/contactUnitList.vue | 36 +
src/views/workOrder/workOrderList.vue | 396 +++++++++++++
src/views/deviceManager/deviceList.vue | 9
9 files changed, 1,637 insertions(+), 33 deletions(-)
diff --git a/src/api/ErpSyncMes.js b/src/api/ErpSyncMes.js
index fe87b32..bb54a83 100644
--- a/src/api/ErpSyncMes.js
+++ b/src/api/ErpSyncMes.js
@@ -10,9 +10,37 @@
// }
// 鐗╂枡绠＄悊锛氳閲忓崟浣嶅悓姝�
-export function SaveSearchUnit(data) {
+export function SaveSearchUnit() {
return request({
url: 'ErpSyncMes/SaveSearchUnit',
method: 'post'
})
}
+// 鐢熶骇绠＄悊锛欵RP鐢熶骇璁㈠崟鍚屾
+export function SeaveSearchErpOrder() {
+ return request({
+ url: 'ErpSyncMes/SeaveSearchErpOrder',
+ method: 'post'
+ })
+}
+// 鐗╂枡绠＄悊锛氬瓨璐ф。妗堝悓姝�
+export function SaveSearchMateriel_Info() {
+ return request({
+ url: 'ErpSyncMes/SaveSearchMateriel_Info',
+ method: 'post'
+ })
+}
+// 鍩虹璁剧疆锛氫粨搴撳悓姝�
+export function SaveSearchWareHouse() {
+ return request({
+ url: 'ErpSyncMes/SaveSearchWareHouse',
+ method: 'post'
+ })
+}
+// 鍩虹璁剧疆锛氬線鏉ュ崟浣嶅悓姝�
+export function SeaveSearchPartner() {
+ return request({
+ url: 'ErpSyncMes/SeaveSearchPartner',
+ method: 'post'
+ })
+}
diff --git a/src/api/WorkOrder.js b/src/api/WorkOrder.js
new file mode 100644
index 0000000..c0ebb6f
--- /dev/null
+++ b/src/api/WorkOrder.js
@@ -0,0 +1,83 @@
+import request from '@/utils/request'
+
+// ERP璁㈠崟鏌ヨ
+export function ErpOrderSearch(data) {
+ return request({
+ url: 'WorkOrder/ErpOrderSearch',
+ method: 'get',
+ params: data
+ })
+}
+
+// ERP璁㈠崟涓嬭揪
+export function MarkSaveErpOrder(data) {
+ return request({
+ url: 'WorkOrder/MarkSaveErpOrder',
+ method: 'post',
+ data
+ })
+}
+
+// ERP璁㈠崟鍏抽棴
+export function ClosedErpOrder(data) {
+ return request({
+ url: 'WorkOrder/ClosedErpOrder',
+ method: 'post',
+ params: data
+ })
+}
+
+// ERP璁㈠崟鍒犻櫎
+export function DeleteErpOrder(data) {
+ return request({
+ url: 'WorkOrder/DeleteErpOrder',
+ method: 'post',
+ params: data
+ })
+}
+
+// MES宸ュ崟鏌ヨ
+export function MesOrderSearch(data) {
+ return request({
+ url: 'WorkOrder/MesOrderSearch',
+ method: 'get',
+ params: data
+ })
+}
+
+// MES鎶ュ簾琛ュ崟宸ュ崟鏌ヨ
+export function MesBadOrderSearch(data) {
+ return request({
+ url: 'WorkOrder/MesBadOrderSearch',
+ method: 'get',
+ params: data
+ })
+}
+
+// MES宸ュ崟鏂板銆佽幏鍙栧伐鍗曞彿
+export function AddMesOrderCodeSearch(data) {
+ return request({
+ url: 'WorkOrder/AddMesOrderCodeSearch',
+ method: 'post',
+ params: data
+ })
+}
+
+// 淇敼鍓嶈幏鍙�
+export function UpdateMesOrderStepSearch(data) {
+ return request({
+ url: 'WorkOrder/UpdateMesOrderStepSearch',
+ method: 'get',
+ params: data
+ })
+}
+
+// MES宸ュ崟鏂板銆佺紪杈戞彁浜�
+export function AddUpdateMesOrder(data, OperType) {
+ return request({
+ url: 'WorkOrder/AddUpdateMesOrder?OperType=' + OperType,
+ method: 'post',
+ data
+ })
+}
+
diff --git a/src/views/basicSettings/contactUnitList.vue b/src/views/basicSettings/contactUnitList.vue
index 40bc56b..cd8755e 100644
--- a/src/views/basicSettings/contactUnitList.vue
+++ b/src/views/basicSettings/contactUnitList.vue
@@ -63,7 +63,11 @@
>
<div class="bodyTopButtonGroup" style="justify-content: space-between">
<el-button v-waves type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板</el-button>
- <el-button v-waves type="success" icon="el-icon-download" @click="$router.push('./../systemSetting/dataImport?fileCode=5')">瀵煎叆</el-button>
+ <div style="display: flex">
+ <el-button v-waves type="success" icon="el-icon-download" @click="$router.push('./../systemSetting/dataImport?fileCode=5')">瀵煎叆</el-button>
+ <el-button v-waves icon="el-icon-refresh-right" @click="syncERP">鍚屾寰�鏉ュ崟浣�</el-button>
+
+ </div>
</div>
<div class="bodyTopFormGroup">
@@ -419,6 +423,7 @@
TCunstomerClassTreeDelete,
TCunstomerData, TCunstomerDelete
} from '@/api/basicSettings'
+import { SeaveSearchPartner } from '@/api/ErpSyncMes'
export default {
name: 'RoleList',
@@ -766,6 +771,35 @@
this.dialogForm.idUnitBySale = mainUnitCode
this.dialogForm.idunitbymanufacture = mainUnitCode
}
+ },
+ // 鍚屾ERP
+ syncERP() {
+ const loading = this.$loading({
+ lock: true,
+ text: '姝ｅ湪鍚屾ERP锛岃绋嶇瓑...',
+ spinner: 'el-icon-loading',
+ customClass: 'osloading',
+ background: 'rgba(0, 0, 0, 0.7)'
+ })
+
+ SeaveSearchPartner().then(res => {
+ if (res.code === '200') {
+ setTimeout(() => {
+ this.getTCunstomerData(this.$refs.treeLeftRef.getCurrentNode())
+ this.getTCunstomerClassTree()
+ loading.close()
+ this.$notify.success('鍚屾鎴愬姛锛�')
+ }, 2000)
+ }
+ // else if (res.code === '300') {
+ // setTimeout(() => {
+ // loading.close()
+ // this.$message.error('鍚屾澶辫触锛�')
+ // }, 10000)
+ // }
+ }).catch(e => {
+ loading.close()
+ })
}
}
}
diff --git a/src/views/basicSettings/processSList.vue b/src/views/basicSettings/processSList.vue
index 89dd2e5..cf3f122 100644
--- a/src/views/basicSettings/processSList.vue
+++ b/src/views/basicSettings/processSList.vue
@@ -254,12 +254,7 @@
<script>
import Pagination from '@/components/Pagination'
-import {
- AddUpdateOrganization, AddUpdatePost, AddUpdateStep,
- DeleteOrganization, DeletePost, DeleteStep, PostData,
- PrentOrganization, StepSearch,
- STorgData
-} from '@/api/basicSettings'
+import { AddUpdateStep, DeleteStep, StepSearch } from '@/api/basicSettings'
import { validateCode } from '@/utils/global'
import elDragDialog from '@/directive/el-drag-dialog'
import waves from '@/directive/waves'
diff --git a/src/views/basicSettings/warehouseList.vue b/src/views/basicSettings/warehouseList.vue
index d893964..60eba47 100644
--- a/src/views/basicSettings/warehouseList.vue
+++ b/src/views/basicSettings/warehouseList.vue
@@ -3,7 +3,17 @@
<div class="body" :style="{height:mainHeight+'px'}">
<div class="bodyTopButtonGroup" style="justify-content: space-between">
<el-button v-waves type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板</el-button>
- <el-button v-waves type="success" icon="el-icon-download" @click="$router.push('./../systemSetting/dataImport?fileCode=6')">瀵煎叆</el-button>
+
+ <div style="display:flex">
+ <el-button
+ v-waves
+ type="success"
+ icon="el-icon-download"
+ @click="$router.push('./../systemSetting/dataImport?fileCode=6')"
+ >瀵煎叆
+ </el-button>
+ <el-button v-waves icon="el-icon-refresh-right" @click="syncERP">鍚屾浠撳簱</el-button>
+ </div>
</div>
<div class="bodyTopFormGroup">
@@ -249,14 +259,11 @@
<script>
import Pagination from '@/components/Pagination'
-import {
- AddUpdateGroup,
- DeleteGroup,
- GroupData, TSecStckAddUpdate, TSecStckData, TSecStckDelete
-} from '@/api/basicSettings'
+import { TSecStckAddUpdate, TSecStckData, TSecStckDelete } from '@/api/basicSettings'
import { validateCode } from '@/utils/global'
import elDragDialog from '@/directive/el-drag-dialog'
import waves from '@/directive/waves'
+import { SaveSearchWareHouse } from '@/api/ErpSyncMes'
export default {
name: 'Zzjg',
@@ -425,6 +432,34 @@
this.tableHeight = this.mainHeight - 200
this.$refs.tableDataRef.doLayout()
})
+ },
+ // 鍚屾ERP
+ syncERP() {
+ const loading = this.$loading({
+ lock: true,
+ text: '姝ｅ湪鍚屾ERP锛岃绋嶇瓑...',
+ spinner: 'el-icon-loading',
+ customClass: 'osloading',
+ background: 'rgba(0, 0, 0, 0.7)'
+ })
+
+ SaveSearchWareHouse().then(res => {
+ if (res.code === '200') {
+ setTimeout(() => {
+ this.getTSecStckData()
+ loading.close()
+ this.$notify.success('鍚屾鎴愬姛锛�')
+ }, 2000)
+ }
+ // else if (res.code === '300') {
+ // setTimeout(() => {
+ // loading.close()
+ // this.$message.error('鍚屾澶辫触锛�')
+ // }, 10000)
+ // }
+ }).catch(e => {
+ loading.close()
+ })
}
}
}
diff --git a/src/views/deviceManager/deviceList.vue b/src/views/deviceManager/deviceList.vue
index 9f89ac6..050451f 100644
--- a/src/views/deviceManager/deviceList.vue
+++ b/src/views/deviceManager/deviceList.vue
@@ -369,15 +369,8 @@
import Pagination from '@/components/Pagination'
import { validateCode } from '@/utils/global'
import elDragDialog from '@/directive/el-drag-dialog'
-import {
- TMaterielAddUpdate,
- TMaterielClassTree,
- TMaterielClassTreeAddUpdate,
- TMaterielClassTreeDelete,
- TMaterielData, TMaterielDelete
-} from '@/api/ProductModel'
import arrayToTree from 'array-to-tree'
-import { PrentOrganization, UnitSerch } from '@/api/GeneralBasicData'
+import { PrentOrganization } from '@/api/GeneralBasicData'
import {
AddUpdateDeviceManger,
AddUpdateDeviceType, DeleteDeviceManger,
diff --git a/src/views/materialManager/inventoryList.vue b/src/views/materialManager/inventoryList.vue
index 206d0fe..16013b3 100644
--- a/src/views/materialManager/inventoryList.vue
+++ b/src/views/materialManager/inventoryList.vue
@@ -63,7 +63,10 @@
>
<div class="bodyTopButtonGroup" style="justify-content: space-between">
<el-button v-waves type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板</el-button>
- <el-button v-waves type="success" icon="el-icon-download" @click="$router.push('./../systemSetting/dataImport?fileCode=8')">瀵煎叆</el-button>
+ <div style="display: flex">
+ <el-button v-waves type="success" icon="el-icon-download" @click="$router.push('./../systemSetting/dataImport?fileCode=8')">瀵煎叆</el-button>
+ <el-button v-waves icon="el-icon-refresh-right" @click="syncERP">鍚屾瀛樿揣妗ｆ</el-button>
+ </div>
</div>
<div class="bodyTopFormGroup">
@@ -161,8 +164,9 @@
<el-table-column
prop="partname"
label="瀛樿揣鍚嶇О"
- width="110"
sortable="custom"
+ show-tooltip-when-overflow
+ min-width="200"
/>
<el-table-column
prop="partspec"
@@ -573,6 +577,7 @@
} from '@/api/ProductModel'
import arrayToTree from 'array-to-tree'
import { UnitSerch } from '@/api/GeneralBasicData'
+import { SaveSearchMateriel_Info } from '@/api/ErpSyncMes'
export default {
name: 'RoleList',
@@ -1015,6 +1020,35 @@
this.dialogForm.idUnitBySale = mainUnitCode
this.dialogForm.idunitbymanufacture = mainUnitCode
}
+ },
+ // 鍚屾ERP
+ syncERP() {
+ const loading = this.$loading({
+ lock: true,
+ text: '姝ｅ湪鍚屾ERP锛岃绋嶇瓑...',
+ spinner: 'el-icon-loading',
+ customClass: 'osloading',
+ background: 'rgba(0, 0, 0, 0.7)'
+ })
+
+ SaveSearchMateriel_Info().then(res => {
+ if (res.code === '200') {
+ setTimeout(() => {
+ this.getTMaterielData(this.$refs.treeLeftRef.getCurrentNode())
+ this.getTMaterielClassTree()
+ loading.close()
+ this.$notify.success('鍚屾鎴愬姛锛�')
+ }, 2000)
+ }
+ // else if (res.code === '300') {
+ // setTimeout(() => {
+ // loading.close()
+ // this.$message.error('鍚屾澶辫触锛�')
+ // }, 10000)
+ // }
+ }).catch(e => {
+ loading.close()
+ })
}
}
}
diff --git a/src/views/workOrder/produceOrderList.vue b/src/views/workOrder/produceOrderList.vue
index a734cf0..72037c9 100644
--- a/src/views/workOrder/produceOrderList.vue
+++ b/src/views/workOrder/produceOrderList.vue
@@ -1,11 +1,1029 @@
-<template />
+<template>
+ <div>
+ <div class="body" :style="{height:mainHeight+'px'}">
+
+ <div class="bodyTopButtonGroup" style="justify-content: space-between">
+ <el-button
+ v-waves
+ icon="el-icon-refresh-right"
+ @click="syncERP"
+ >鍚屾ERP
+ </el-button>
+ <div style="display: flex">
+ <el-button
+ v-waves
+ icon="el-icon-switch-button"
+ @click="orderClose"
+ >鍏抽棴璁㈠崟
+ </el-button>
+ <el-button
+ v-waves
+ icon="el-icon-delete"
+ @click="orderDel"
+ >鍒犻櫎璁㈠崟
+ </el-button>
+ </div>
+
+ </div>
+
+ <div class="bodyTopFormGroup">
+ <el-form
+ ref="form"
+ :model="form"
+ label-width="100px"
+ inline
+ 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="璇烽�夋嫨"
+ >
+ <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.erpordercode" placeholder="璇疯緭鍏�" style="width: 200px" />
+ </el-form-item>
+
+ <el-form-item label="閿�鍞鍗�" style=" display: flex;">
+ <el-input v-model="form.saleordercode" style="width: 200px" placeholder="璇疯緭鍏�" />
+ </el-form-item>
+
+ <el-form-item label="浜у搧缂栫爜" style=" display: flex;">
+ <el-input v-model="form.partcode" style="width: 200px" placeholder="璇疯緭鍏�" />
+ </el-form-item>
+
+ <el-form-item v-show="isExpandForm" label="浜у搧鍚嶇О" style=" display: flex;">
+ <el-input v-model="form.partname" style="width: 200px" placeholder="璇疯緭鍏�" />
+ </el-form-item>
+ <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 v-show="isExpandForm" label="鍒涘缓浜哄憳" style=" display: flex;">-->
+ <!-- <el-input v-model="form.creatuser" style="width: 200px" placeholder="璇疯緭鍏�" />-->
+ <!-- </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.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
+ 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>
+
+ <div class="elTableDiv">
+ <el-table
+ ref="tableDataRef"
+ class="tableFixed"
+ :data="tableData"
+ :height="isExpandForm?tableHeight:(tableHeight+40)+'px'"
+ border
+ :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"-->
+ <!-- width="50"-->
+ <!-- />-->
+ <el-table-column
+ width="50"
+ fixed
+ >
+ <template slot-scope="{row}">
+ <el-radio
+ 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
+ prop="status"
+ 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==='CLOSED'">宸插叧闂�</div>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="wo"
+ label="璁㈠崟缂栧彿"
+ show-tooltip-when-overflow
+ sortable="custom"
+ min-width="150"
+ />
+ <el-table-column
+ show-tooltip-when-overflow
+ prop="saleOrderCode"
+ label="閿�鍞鍗�"
+ sortable="custom"
+ width="150"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.saleOrderCode">{{ row.saleOrderCode }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
+ <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"
+ 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="planstartdate"
+ show-tooltip-when-overflow
+ label="棰勮寮�宸ユ椂闂�"
+ sortable="custom"
+ 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="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-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>
+ </el-table>
+ </div>
+ <!--鍒嗛〉-->
+ <pagination
+ :total="total"
+ :page.sync="form.page"
+ :limit.sync="form.rows"
+ align="right"
+ layout="total,prev, pager, next,sizes,jumper"
+ popper-class="select_bottom"
+ @pagination="getErpOrderSearch"
+ />
+ </div>
+
+ <el-dialog
+ v-el-drag-dialog
+ :title="operation==='add'?'鏂板':'涓嬭揪'"
+ :visible.sync="dialogVisible"
+ width="860px"
+ top="15vh"
+ :close-on-click-modal="false"
+ @closed="handleClose"
+ @close="handleClose"
+ >
+ <el-form ref="dialogForm" inline :rules="dialogFormRules" :model="dialogForm" label-width="106px">
+ <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
+ oninput="value=value.replace(/[^0-9.]/g,'')"
+ 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="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>
+ <span slot="footer" class="dialog-footer">
+ <div class="footerButton">
+ <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>
+ </div>
+</template>
<script>
+import Pagination from '@/components/Pagination'
+import { handleDatetime } from '@/utils/global'
+import elDragDialog from '@/directive/el-drag-dialog'
+import waves from '@/directive/waves'
+import { ClosedErpOrder, DeleteErpOrder, ErpOrderSearch, MarkSaveErpOrder } from '@/api/WorkOrder'
+import { SeaveSearchErpOrder } from '@/api/ErpSyncMes'
+
+const SER_HZ = /^[\u4e00-\u9fa5]+$/
export default {
- name: 'ProduceOrderList'
+ name: 'SCDD',
+ components: {
+ Pagination
+ },
+ directives: { elDragDialog, waves },
+ 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 {
+ mouseHoverType: 'mouseout',
+ isExpandForm: false,
+ mainHeight: 0,
+ tableHeight: 0,
+ form: {
+ erporderstus: '', // 璁㈠崟鐘舵�佺爜
+ erpordercode: '', // 璁㈠崟缂栧彿
+ partcode: '', // 浜у搧缂栫爜
+ partname: '', // 浜у搧鍚嶇О
+ partspec: '', // 浜у搧瑙勬牸
+ creatuser: '', // 鍒涘缓浜哄憳
+ saleordercode: '', // 閿�鍞鍗�
+ // paystartdate: '', // 浜や粯鏃堕棿
+ paystartdate: '', // 棰勮寮�宸ユ椂闂�
+ payenddate: '', // 棰勮瀹屽伐鏃堕棿
+ createdate: '', // 鍒涘缓鏃堕棿
+ prop: 'wo', // 鎺掑簭瀛楁
+ order: 'desc', // 鎺掑簭瀛楁
+ page: 1, // 绗嚑椤�
+ rows: 20 // 姣忛〉澶氬皯鏉�
+ },
+ erporderstusArr: [
+ { code: 'NEW', name: '鏂拌鍗�' },
+ { code: 'CREATING', name: '閮ㄥ垎涓嬭揪' },
+ { code: 'CREATED', name: '鍏ㄩ儴涓嬭揪' },
+ { code: 'CLOSED', name: '宸插叧闂�' }
+ ],
+ total: 10,
+ radioSelectedId: '',
+ tableData: [],
+ dialogVisible: false,
+ dialogForm: {
+ erporderid: '', // 璁㈠崟id
+ sbid: '', // 璁㈠崟鏄庣粏id
+ erpordercode: '', // 璁㈠崟缂栧彿
+ saleordercode: '', // 閿�鍞鍗�
+
+ partcode: '', // 浜у搧缂栫爜
+ partname: '', // 浜у搧鍚嶇О
+ partspec: '', // 浜у搧瑙勬牸
+
+ wkshopcode: '', // 杞﹂棿缂栫爜
+ wkshopname: '', // 杞﹂棿鍚嶇О
+
+ warehousecode: '', // 浠撳簱缂栫爜
+ warehousename: '', // 浠撳簱鍚嶇О
+
+ erpqty: '', // 璁㈠崟鏁伴噺
+ markqty: '', // 涓嬪崟鏁伴噺
+ ordernum: '', // 涓嬪崟鍗曟暟
+ relse_qty: '', // 宸蹭笅鍗曟暟閲�
+
+ saleOrderDeliveryDate: '' // 棰勮浜や粯鏃ユ湡
+ },
+ operation: '',
+ dialogFormRules: {
+ // OrgType: [
+ // { required: true, message: '璇疯緭鍏ラ�夋嫨绫诲瀷', trigger: ['blur', 'change'] }
+ // ],
+ // OrgCode: [
+ // { required: true, validator: validateName, trigger: ['blur', 'change'] }
+ // ],
+ markqty: [
+ { required: true, message: '璇疯緭鍏ヤ笅鍗曟暟閲�', trigger: ['blur', 'change'] }
+ ],
+ 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灏辨槸涓嶅彲浠ラ�夋嫨浠婂ぉ鐨�
+ // }
+ // }
+
+ }
+ },
+ created() {
+ this.getErpOrderSearch()
+ // this.getPartSelect()// 鑾峰彇浜у搧缂栫爜淇℃伅
+ },
+ mounted() {
+ window.addEventListener('resize', this.getHeight)
+ this.getHeight()
+ },
+ methods: {
+ async getErpOrderSearch() {
+ 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, // 浜や粯鏃堕棿
+ saleordercode: this.form.saleordercode,
+ 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
+ },
+ // 鎺掑簭鏀瑰彉鏃�
+ 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()
+ },
+ // 鍚屾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)
+ // }
+ }).catch(e => {
+ loading.close()
+ })
+ },
+ // 鏌ヨ
+ search() {
+ this.getErpOrderSearch()
+ },
+ // 閲嶇疆
+ reset() {
+ this.form.erporderstus = ''
+ this.form.erpordercode = ''
+ this.form.partcode = ''
+ this.form.partname = ''
+ this.form.partspec = ''
+ this.form.paystartdate = ''
+ this.form.payenddate = ''
+ this.form.creatuser = ''
+ this.form.erpordercode = ''
+ this.form.createdate = ''
+ this.getErpOrderSearch()
+ },
+ // 鍗曢�夋閫変腑鑾峰彇褰撳墠琛屼俊鎭�
+ getCurrentRow(id) {
+ this.radioSelectedId = id
+ },
+ rowClick(row) {
+ this.radioSelectedId = row.id
+ },
+
+ // 璁㈠崟鍒犻櫎
+ orderDel() {
+ if (this.radioSelectedId.length < 1) {
+ return this.$message.info('璇峰厛閫夋嫨璁㈠崟锛�')
+ }
+ this.tableData.forEach(item => {
+ if (item.id === this.radioSelectedId) {
+ if (item.status === 'CLOSED') {
+ return this.$message.info('姝よ鍗曞凡鍏抽棴锛屾棤娉曞垹闄わ紒')
+ } else {
+ this.$confirm('鏄惁纭鍏抽棴璁㈠崟?', '鎻愮ず', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning'
+ }).then(() => {
+ DeleteErpOrder({ erpordercode: item.wo, erporderid: this.radioSelectedId }).then(res => {
+ if (res.code === '200') {
+ this.$message.success('璁㈠崟鍒犻櫎鎴愬姛!')
+ this.getErpOrderSearch()
+ }
+ })
+ }).catch(() => {
+ 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('宸插彇娑堝叧闂紒')
+ })
+ }
+ }
+ })
+ },
+ // 鏂板鎸夐挳
+ add(operation) {
+ this.operation = operation
+ this.dialogVisible = true
+ },
+ // 淇敼鎸夐挳
+ edit(operation, row) {
+ if (parseFloat(row.qty) === parseFloat(row.relse_qty) || row.status === 'CLOSED') {
+ return this.$message.info('姝ゅ伐鍗曞凡鍏ㄩ儴涓嬭揪锛�')
+ }
+
+ this.operation = operation
+ this.dialogVisible = true
+
+ this.$nextTick(() => {
+ this.dialogForm.sbid = row.sbid
+ this.dialogForm.erporderid = row.id
+ this.dialogForm.erpordercode = row.wo
+ this.dialogForm.saleordercode = row.saleOrderCode
+
+ 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.saleOrderDeliveryDate = row.saleOrderDeliveryDate
+
+ 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 = {
+ erporderid: '', // 璁㈠崟id
+ sbid: '', // 璁㈠崟鏄庣粏id
+ erpordercode: '', // 璁㈠崟缂栧彿
+ saleordercode: '', // 閿�鍞鍗�
+
+ partcode: '', // 浜у搧缂栫爜
+ partname: '', // 浜у搧鍚嶇О
+ partspec: '', // 浜у搧瑙勬牸
+
+ wkshopcode: '', // 杞﹂棿缂栫爜
+ wkshopname: '', // 杞﹂棿鍚嶇О
+
+ warehousecode: '', // 浠撳簱缂栫爜
+ warehousename: '', // 浠撳簱鍚嶇О
+
+ erpqty: '', // 璁㈠崟鏁伴噺
+ markqty: '', // 涓嬪崟鏁伴噺
+ ordernum: '', // 涓嬪崟鍗曟暟
+ relse_qty: '', // 宸蹭笅鍗曟暟閲�
+
+ saleOrderDeliveryDate: '' // 棰勮浜や粯鏃ユ湡
+ }
+ this.$refs.dialogForm.clearValidate()
+ },
+ // 瀵硅瘽妗嗗彇娑�
+ dialogVisibleCancel() {
+ this.dialogVisible = false
+ },
+ // 瀵硅瘽妗嗙‘璁�
+ 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 = {
+ 'sbid': this.dialogForm.sbid,
+ 'erporderid': this.dialogForm.erporderid,
+ 'erpordercode': this.dialogForm.erpordercode,
+ 'saleordercode': this.dialogForm.saleordercode,
+ '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,
+ 'saleOrderDeliveryDate': handleDatetime(this.dialogForm.saleOrderDeliveryDate) + ' 00:00:00'
+ }
+
+ MarkSaveErpOrder(data).then(res => {
+ if (res.code === '200') {
+ this.dialogVisible = false
+ this.$message.success('涓嬭揪鎴愬姛锛�')
+ this.getErpOrderSearch()
+ this.$store.state.app.buttonIsDisabled = false
+ } else {
+ this.$message.error('涓嬭揪澶辫触锛�')
+ }
+ })
+ }
+ })
+ },
+ // 鑾峰彇椤甸潰楂樺害
+ getHeight() {
+ this.$nextTick(() => {
+ this.mainHeight = window.innerHeight - 85
+ this.tableHeight = this.mainHeight - 250
+
+ this.$refs.tableDataRef.doLayout()
+ })
+ },
+ tableRowClassName({ row, rowIndex }) {
+ return 'custom-row'
+ }
+ }
}
</script>
-<style scoped>
+<!--鍏叡椤甸潰鏍峰紡-->
+<style lang="scss" scoped>
+$main_color: #42b983;
+::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;
+}
+
+::v-deep .el-button--default {
+ background-color: #f8f8fa;
+ border: none;
+}
+
+::v-deep .el-input__inner {
+ height: 34px;
+ line-height: 34px;
+ //color: #a7a7a7;
+}
+
+::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 {
+ display: flex;
+ justify-content: flex-end;
+}
+
+::v-deep .el-table .caret-wrapper {
+ transform: scale(0.8);
+}
+
+::v-deep .cell {
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+}
+
+::v-deep .el-table::before {
+ height: 0;
+}
+
+::v-deep .el-table__body-wrapper {
+ background-color: #f8f8fa;
+}
+
+::v-deep .el-table__body .el-table__row.hover-row td {
+ background-color: #eaecef;
+}
+
+::v-deep .el-form--inline .el-form-item__label {
+ color: #a7a7a7;
+}
+
+.body ::v-deep .el-divider {
+ border: 1px solid #eee;
+ width: 99%;
+ margin: 10px auto;
+}
+
+.body ::v-deep .el-form-item {
+ margin-bottom: 0;
+}
+
+.userDialogVisible ::v-deep .el-form-item {
+ margin-bottom: 0;
+}
+
+.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;
+ }
+}
+::v-deep .el-icon-delete {
+ cursor: pointer;
+ margin-right: 0px !important;
+}
</style>
+<style>
+.el-table .custom-row {
+ background: #f8f8fa;
+}
+
+.osloading {
+ font-size: 26px !important;
+}
+
+.el-loading-text {
+ font-size: 26px !important;
+}
+</style>
+
diff --git a/src/views/workOrder/workOrderList.vue b/src/views/workOrder/workOrderList.vue
index 4398e56..94f81a2 100644
--- a/src/views/workOrder/workOrderList.vue
+++ b/src/views/workOrder/workOrderList.vue
@@ -1,11 +1,395 @@
-<template />
+<template>
+ <div>
+ <div class="body" :style="{height:mainHeight+'px'}">
+ <div class="bodyTopButtonGroup" style="justify-content: space-between">
+ <div style="display: flex">
+ <el-button v-waves type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板</el-button>
+ <el-button v-waves type="success" icon="el-icon-connection" @click="send('send')">娲惧彂</el-button>
+ </div>
+ <el-button v-waves type="success" icon="el-icon-download" @click="$router.push('./../systemSetting/dataImport?fileCode=1')">瀵煎叆</el-button>
+ </div>
+
+ <div class="bodyTopFormGroup">
+ <el-form
+ ref="form"
+ :model="form"
+ label-width="100px"
+ inline
+ style="display: flex;"
+ >
+ <div class="elForm">
+ <el-form-item label="宸ュ崟缂栧彿" style=" display: flex;">
+ <el-input v-model="form.postcode" placeholder="璇疯緭鍏�" style="width: 200px" />
+ </el-form-item>
+ <el-form-item label="浜у搧缂栧彿" style=" display: flex;">
+ <el-input v-model="form.postname" placeholder="璇疯緭鍏�" style="width: 200px" />
+ </el-form-item>
+ <el-form-item label="浜у搧鍚嶇О" style=" display: flex;">
+ <el-input v-model="form.postname" placeholder="璇疯緭鍏�" style="width: 200px" />
+ </el-form-item>
+ </div>
+ <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="getPostData">鏌ヨ</el-button>
+ <el-button v-waves type="info" icon="el-icon-refresh" @click="reset">閲嶇疆</el-button>
+ </div>
+ </el-form>
+ <div
+ class="bodyTopFormExpand"
+ style="height:5px"
+ >
+ <!-- <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>
+
+ <div class="elTableDiv">
+ <el-table
+ ref="tableDataRef"
+ class="tableFixed"
+ :data="tableData"
+ :height="tableHeight+'px'"
+ border
+ row-class-name="custom-row"
+ :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"
+ fixed
+ />
+ <el-table-column
+ prop="rowNum"
+ width="50"
+ fixed
+ label="搴忓彿"
+ />
+ <el-table-column
+ prop="postcode"
+ label="宸ュ崟鐘舵��"
+ sortable="custom"
+ />
+ <el-table-column
+ prop="postname"
+ label="宸ュ崟缂栧彿"
+ sortable="custom"
+ />
+ <el-table-column
+ prop="status"
+ label="鐘舵��"
+ sortable="custom"
+ >
+ <template slot-scope="{row}">
+ <el-tag v-if="row.status==='Y'" size="small" type="success">姝ｅ父</el-tag>
+ <el-tag v-if="row.status==='N'" size="small" type="danger">鍋滅敤</el-tag>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="description"
+ label="鎻忚堪"
+ sortable="custom"
+ >
+ <template slot-scope="{row}">
+ {{ row.description?row.description:'/' }}
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="username"
+ label="鍒涘缓浜哄憳"
+ sortable="custom"
+ />
+ <el-table-column
+ prop="lm_date"
+ label="鍒涘缓鏃堕棿"
+ width="160"
+ sortable="custom"
+ />
+ <el-table-column
+ label="鎿嶄綔"
+ width="120"
+ fixed="right"
+ >
+ <template slot-scope="{row}">
+ <div class="operationClass">
+ <el-tooltip class="item" effect="dark" content="缂栬緫" placement="top">
+ <i
+ v-if="row.leve!==0"
+ class="el-icon-edit-outline"
+ :style="{color:$store.state.settings.theme}"
+ @click="edit('edit',row)"
+ />
+ </el-tooltip>
+ <el-tooltip v-del-tab-index class="item" effect="dark" content="鍒犻櫎" placement="top">
+ <i
+ v-if="row.leve!==0"
+ class="el-icon-delete"
+ :style="{color:$store.state.settings.theme}"
+ @click="del(row)"
+ />
+ </el-tooltip>
+ <el-tooltip v-del-tab-index class="item" effect="dark" content="璇︽儏" placement="top">
+ <i
+ v-if="row.leve!==0"
+ class="el-icon-view"
+ style="cursor: pointer"
+ :style="{color:$store.state.settings.theme}"
+ @click="view('view',row)"
+ />
+ </el-tooltip>
+ </div>
+ </template>
+ </el-table-column>
+ </el-table>
+ </div>
+ <!--鍒嗛〉-->
+ <pagination
+ :total="total"
+ :page.sync="form.page"
+ :limit.sync="form.rows"
+ align="right"
+ layout="total,prev, pager, next,sizes,jumper"
+ popper-class="select_bottom"
+ @pagination="getPostData"
+ />
+ </div>
+
+ <el-dialog
+ v-el-drag-dialog
+ :title="operation==='add'?'鏂板':'缂栬緫'"
+ :visible.sync="dialogVisible"
+ width="800px"
+ :close-on-click-modal="false"
+ top="15vh"
+ @closed="handleClose"
+ @close="handleClose"
+ >
+ <el-form ref="dialogForm" inline :rules="dialogFormRules" :model="dialogForm" label-width="80px">
+ <el-form-item label="宀椾綅缂栫爜" prop="postcode">
+ <el-input v-model="dialogForm.postcode" :disabled="operation!=='add'" style="width: 200px" />
+ </el-form-item>
+ <el-form-item label="宀椾綅鍚嶇О" prop="postname">
+ <el-input v-model="dialogForm.postname" style="width: 200px" />
+ </el-form-item>
+ <el-form-item label="鎻忚堪">
+ <el-input
+ v-model="dialogForm.description"
+ type="textarea"
+ style="width: 200px"
+ />
+ </el-form-item>
+ <el-form-item required label="宀椾綅鐘舵��">
+ <el-radio-group v-model="dialogForm.status">
+ <el-radio label="Y">姝ｅ父</el-radio>
+ <el-radio label="N">鍋滅敤</el-radio>
+ </el-radio-group>
+ </el-form-item>
+ </el-form>
+ <span slot="footer" class="dialog-footer">
+ <div class="footerButton">
+ <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>
+
+ </div>
+</template>
<script>
+import Pagination from '@/components/Pagination'
+import {
+ AddUpdateOrganization, AddUpdatePost,
+ DeleteOrganization, DeletePost, PostData,
+ PrentOrganization,
+ STorgData
+} from '@/api/basicSettings'
+import { validateCode } from '@/utils/global'
+import elDragDialog from '@/directive/el-drag-dialog'
+import waves from '@/directive/waves'
+
export default {
- name: 'WorkOrderList'
+ name: 'Zzjg',
+ components: {
+ Pagination
+ },
+ directives: { elDragDialog, waves },
+ data() {
+ return {
+ mainHeight: 0,
+ tableHeight: 0,
+ form: {
+ postcode: '', // 缁勭粐鏋舵瀯缂栫爜
+ postname: '', // 缁勭粐鏋舵瀯鍚嶇О
+ prop: 'lm_date', // 鎺掑簭瀛楁
+ order: 'desc', // 鎺掑簭瀛楁
+ page: 1, // 绗嚑椤�
+ rows: 20 // 姣忛〉澶氬皯鏉�
+ },
+ total: 10,
+ tableData: [],
+ dialogVisible: false,
+ dialogForm: {
+ postcode: '', // 缁勭粐缂栫爜
+ postname: '', // 缁勭粐鍚嶇О
+ description: '', // 鎻忚堪
+ status: 'Y'// 鐘舵��
+ },
+ operation: '',
+ dialogFormRules: {
+ postcode: [
+ { required: true, validator: validateCode, trigger: ['blur', 'change'] }
+ ],
+ postname: [
+ { required: true, message: '璇疯緭鍏ュ矖浣嶅悕绉�', trigger: ['blur', 'change'] }
+ ]
+ }
+
+ }
+ },
+ created() {
+ this.getPostData()
+ },
+ mounted() {
+ window.addEventListener('resize', this.getHeight)
+ this.getHeight()
+ },
+ methods: {
+ // 缁勭粐鏋舵瀯澶у垪琛ㄦ煡璇�
+ async getPostData() {
+ const res = await PostData(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.getPostData()
+ },
+ // 閲嶇疆
+ reset() {
+ this.form.postcode = ''
+ this.form.postname = ''
+ this.getPostData()
+ },
+ // 鏂板鎸夐挳
+ add(operation) {
+ this.operation = operation
+ this.dialogVisible = true
+ this.dialogForm.OperType = 'Add'
+ },
+ // 淇敼鎸夐挳
+ async edit(operation, row) {
+ this.operation = operation
+ this.dialogVisible = true
+ this.dialogForm.OperType = 'Update'
+
+ this.$nextTick(() => {
+ this.dialogForm.postcode = row.postcode
+ this.dialogForm.postname = row.postname
+ this.dialogForm.description = row.description
+ this.dialogForm.status = row.status
+ })
+ },
+ // 鍒犻櫎鎸夐挳
+ async del(row) {
+ this.$confirm('鏄惁纭鍒犻櫎?', '鎻愮ず', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning'
+ }).then(() => {
+ DeletePost({ postcode: row.postcode }).then(res => {
+ if (res.code === '200') {
+ this.$notify.success('鍒犻櫎鎴愬姛!')
+ if (this.form.page > 1 && this.tableData.length === 1) {
+ this.form.page--
+ }
+ this.getPostData()
+ }
+ })
+ }).catch(() => {
+ this.$notify.info('宸插彇娑堝垹闄�')
+ })
+ },
+ // 娲惧彂
+ send(operation) {
+ console.log(operation)
+ },
+ // 璇︽儏
+ view(operation, row) {
+
+ },
+ // 瀵硅瘽妗嗗叧闂簨浠�
+ handleClose() {
+ this.dialogForm.postcode = ''
+ this.dialogForm.postname = ''
+ this.dialogForm.status = 'Y'
+ this.dialogForm.description = ''
+ this.$refs.dialogForm.clearValidate()
+ },
+ // 瀵硅瘽妗嗗彇娑�
+ dialogVisibleCancel() {
+ this.dialogVisible = false
+ },
+ // 瀵硅瘽妗嗙‘璁�
+ dialogVisibleConfirm() {
+ this.$refs.dialogForm.validate(valid => {
+ if (valid) {
+ this.$store.state.app.buttonIsDisabled = true
+ AddUpdatePost(this.dialogForm).then(res => {
+ if (res.code === '200') {
+ this.$notify.success(this.operation === 'add' ? '娣诲姞鎴愬姛锛�' : '淇敼鎴愬姛锛�')
+ this.dialogVisible = false
+ this.$store.state.app.buttonIsDisabled = false
+ this.getPostData()
+ } else {
+ this.$store.state.app.buttonIsDisabled = false
+ this.$notify.error(this.operation === 'add' ? '娣诲姞澶辫触锛�' : '淇敼澶辫触锛�')
+ }
+ })
+ }
+ })
+ },
+
+ // 鑾峰彇椤甸潰楂樺害
+ getHeight() {
+ this.$nextTick(() => {
+ this.mainHeight = window.innerHeight - 85
+ this.tableHeight = this.mainHeight - 200
+ this.$refs.tableDataRef.doLayout()
+ })
+ }
+ }
}
</script>
-
-<style scoped>
-
-</style>
--
Gitblit v1.9.3