From 8f53694cc7ed5b9965d172a511ab39b914edbfb6 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 19 四月 2024 14:18:02 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/a1536384743/erp_-override
---
north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue | 517 ++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 419 insertions(+), 98 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue b/north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue
index 5eecb7f..45bd176 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue
+++ b/north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue
@@ -6,11 +6,26 @@
import request from "@/utils/request"
import deepClone from "@/utils/deepClone"
import useUserInfoStore from '@/stores/userInfo'
+import SelectProduct from "@/views/sd/product/SelectProduct.vue"
+import OrderOtherMoney from "@/components/sd/order/OrderOtherMoney.vue"
+import {changeFilterEvent,filterChanged} from "@/hook"
+import {addListener,toolbarButtonClickEvent} from "@/hook/mouseMove"
+import downLoadFile from "@/hook/downLoadFile"
+import {useI18n} from "vue-i18n"
+const { t } = useI18n()
+
let dialogTableVisible = ref(false)
+let productVisible = ref(false)
+let errorAreaVisible = ref(false)
+let otherMoneyVisible = ref(false)
+let errorArea = ref(null)
const userStore = useUserInfoStore()
const router = useRouter()
const route = useRoute()
const xGrid = ref()
+let cellArea = ref()
+const shapeList = ref(['鏅舰','寮傚舰'])
+
// 瀹氫箟琛ㄥご涓婁紶鏁版嵁
const titleUploadData = ref({
project:'',
@@ -23,7 +38,7 @@
orderId:'',
deliveryDate:'',
batch:'',
- calculateType:'',
+ calculateType:null,
salesmanId:'',
salesman:'',
alType:'',
@@ -42,6 +57,7 @@
})
//瀹氫箟鎺ユ敹鍔犺浇琛ㄥご涓嬫媺鏁版嵁
const titleSelectJson = ref({
+ orderOtherMoney:[],
orderType:[],
alType:[],
icon:[],
@@ -51,13 +67,10 @@
saleMan:[]
})
let filterData = ref({})
-const filterChanged = ({ option, row, column }) => {
- if (option.data) {
- return row[column.field].toString().toLowerCase().indexOf(option.data) > -1
- }
- return true
- //@filter-change="filterChanged"
-}
+let rowIndex = ref(null)
+let rowClickIndex = ref(null)
+let otherMoney = ref(null)
+
const gridOptions = reactive({
border: "full",//琛ㄦ牸鍔犺竟妗�
keepSource: true,//淇濇寔婧愭暟鎹�
@@ -75,7 +88,14 @@
body: {
options: [
[
- { code: 'addRow', name: '娣诲姞', prefixIcon: 'vxe-icon-square-plus', visible: true, disabled: false }
+ { code: 'addRow', name: t('basicData.add'), prefixIcon: 'vxe-icon-square-plus', visible: true, disabled: false },
+ { code: 'deleteRow', name: t('basicData.delete'), prefixIcon: 'vxe-icon-delete', visible: true, disabled: true },
+ { code: 'copyChecked', name: t('basicData.selectSame'), prefixIcon: 'vxe-icon-copy', visible: true, disabled: false },
+ { code: 'copyAll', name: t('basicData.sameAfterwards'), prefixIcon: 'vxe-icon-feedback', visible: true, disabled: false },
+ { code: 'clearChecked', name: t('basicData.clearSelection'), prefixIcon: 'vxe-icon-indicator', visible: true, disabled: false },
+ { code: 'computedMoney', name: t('basicData.calculateAmount'), prefixIcon: 'vxe-icon-chart-bar-x', visible: true, disabled: true },
+ { code: 'errorArea', name: '璇樊缁撶畻闈㈢Н', prefixIcon: 'vxe-icon-chart-bar-x', visible: true, disabled: false },
+ { code: 'otherMoney', name: '鍏朵粬閲戦', prefixIcon: 'vxe-icon-chart-bar-x', visible: true, disabled: false }
]
]
}
@@ -93,27 +113,32 @@
editConfig: {
trigger: 'click',
mode: 'cell',
- showStatus: true
+ showStatus: true,
+ showIcon:false
},//琛ㄥご鍙傛暟
columns:[
- {type: 'seq',fixed:"left", title: '鑷簭', width: 80 },
+ {type: 'seq',fixed:"left", title: t('basicData.Number'), width: 80 },
// {field: 'buildingNumber',width:120, title: '妤煎彿',editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter'}, sortable: true,filterMethod:filterChanged},
- {field: 'productId',width:100, title: '浜у搧ID',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
- {field: 'productName',width:120, title: '浜у搧',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
- {field: 'price',width:140, title: '鍗曚环',editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
- {field: 'quantity',width:120, title: '鏁伴噺',editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
- {field: 'grossAmount',width:120, title: '鎬婚噾棰�',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
- {field: 'width',width:120, title: '瀹�',editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
- {field: 'height',width:120, title: '楂�',editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
- {field: 'area',width:150, title: '瀹為檯鍗曠墖闈㈢Н',filters:[{ data: '' }],slots: { filter: 'num1_filter'}, sortable: true,filterMethod:filterChanged},
- {field: 'grossArea',width:140, title: '瀹為檯鎬婚潰绉�',filters:[{ data: '' }],slots: { filter: 'num1_filter'}, sortable: true,filterMethod:filterChanged},
- {field: 'computeArea',width:180, title: '缁撶畻鍗曠墖闈㈢Н',editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
- {field: 'computeGrossArea',width:140, title: '缁撶畻鎬婚潰绉�',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
- {field: 'shape',width:120, title: '褰㈢姸',editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
- {field: 'bendRadius',width:140, title: '寮挗寮у害',editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
- {field: 'edgingType',width:140, title: '纾ㄨ竟绫诲瀷',editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
- {field: 'processingNote',width:140, title: '鍔犲伐瑕佹眰',editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
- {field: 'remarks',width:120, title: '澶囨敞',editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged}
+ {field: 'productId',width:140, title: t('order.productId'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
+ {field: 'productName',width:300, title: t('order.product'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
+ {field: 'price',width:140, title: t('order.price'),editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
+ {field: 'quantity',width:140, title: t('order.quantity'),editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
+ {field: 'grossAmount',width:160, title: t('order.grossAmount'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
+ {field: 'width',width:120, title: t('order.width') ,editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
+ {field: 'height',width:140, title: t('order.height'),editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
+ {field: 'area',width:150, title: t('order.trueArea'),filters:[{ data: '' }],slots: { filter: 'num1_filter'}, sortable: true,filterMethod:filterChanged},
+ {field: 'grossArea',width:160, title: t('order.trueGrossArea'),filters:[{ data: '' }],slots: { filter: 'num1_filter'}, sortable: true,filterMethod:filterChanged},
+ {field: 'computeArea',width:180, title: t('order.computeArea'),editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
+ {field: 'computeGrossArea',width:200, title: t('order.computeGrossArea'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
+ {field: 'shape',width:120,
+ title: t('order.shape'),
+ editRender: { name: 'input'},
+ filters:[{ data: '' }],
+ slots: { filter: 'num1_filter',edit:'shape_edit' }, sortable: true,filterMethod:filterChanged},
+ {field: 'bendRadius',width:160, title: t('order.bendRadius'),editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
+ {field: 'edgingType',width:160, title: t('order.edgingType'),editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
+ {field: 'processingNote',width:200, title: t('order.processingNote'),editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
+ {field: 'remarks',width:140, title: t('basicData.remarks'),editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
],
@@ -121,17 +146,20 @@
editRules: {
buildingNumber: [
{ required: false},
- { min: 0, max: 255, message: '鍚嶇О闀垮害鍦� 0 鍒� 255 涓瓧绗�' }
+ { min: 0, max: 255, message: t('basicData.msg.max255') }
],
productId: [
- { required: true, message: '璇烽�夋嫨浜у搧' }
+ { required: true, message: t('order.msg.productCheck') }
+ ],
+ productName: [
+ { required: true, message: t('order.msg.productCheck') }
],
price: [
{
validator ({ cellValue }) {
- const regex = /^(0|[1-9][0-9]{0,4}([.][0-9]{1,2})?)$/
+ const regex = /^(0(\.\d{1,2})?|([1-9]\d{0,4})(\.\d{1,2})?|99999(\.9{1,2})?)$/
if ( !regex.test(cellValue) ) {
- return new Error('杈撳叆0.00~99999.99鐨勬暟瀛�')
+ return new Error(t('basicData.msg.range99999Dec2') )
}
}
}
@@ -139,22 +167,29 @@
computeArea: [
{
validator ({ cellValue }) {
- const regex = /^(0|[1-9][0-9]{0,4}([.][0-9]{1,2})?)$/
+ const regex = /^(0(\.\d{1,2})?|([1-9]\d{0,4})(\.\d{1,2})?|99999(\.9{1,2})?)$/
if (!regex.test(cellValue)) {
- return new Error('杈撳叆0.00~99999.99鐨勬暟瀛�')
+ return new Error(t('basicData.msg.range99999Dec2'))
}
}
}
],
quantity: [
- { type: 'number', min: 0, message: '璇疯緭鍏ュぇ浜庣瓑浜�0鐨勬暟鍊�' }
+ //type: 'number', min: 0, message: '璇疯緭鍏ュぇ浜庣瓑浜�0鐨勬暟鍊�' ,
+ {
+ validator ({ cellValue }) {
+ const regex = /^[1-9]\d*$/
+ if (!regex.test(cellValue)) {
+ return new Error(t('basicData.msg.greater0'))
+ }
+ }}
],
width:[
{
validator ({ cellValue }) {
- const regex = /^(0|[1-9][0-9]{0,4}([.][0-9]{1,2})?)$/
+ const regex = /^(0(\.\d{1,2})?|([1-9]\d{0,4})(\.\d{1,2})?|99999(\.9{1,2})?)$/
if (!regex.test(cellValue)) {
- return new Error('杈撳叆0.00~99999.99鐨勬暟瀛�')
+ return new Error(t('basicData.msg.range99999Dec2'))
}
}
}
@@ -164,7 +199,7 @@
validator ({ cellValue }) {
const regex = /^(0|[1-9][0-9]{0,4}([.][0-9]{1,2})?)$/
if ( !regex.test(cellValue)) {
- return new Error('杈撳叆0.00~99999.99鐨勬暟瀛�')
+ return new Error(t('basicData.msg.range99999Dec2'))
}
}
}
@@ -172,10 +207,11 @@
},
toolbarConfig: {
buttons: [
- {'code': 'remarks', 'name': '鍔犲伐瑕佹眰'},
- {'code': 'Craft', 'name': '宸ヨ壓',status: 'primary',disabled: true},
- {'code': 'review', 'name': '瀹℃牳',status: 'primary',disabled: true},
- {'code': 'saveOrder', 'name': '淇濆瓨',status: 'primary',icon: 'vxe-icon-save',disabled: false}
+ {'code': 'remarks', 'name': t('order.processingNote')},
+ {'code': 'Craft', 'name': t('order.technology'),status: 'primary',disabled: true},
+ {'code': 'review', 'name': t('basicData.review'),status: 'primary',disabled: true},
+ {'code': 'updateMoney', 'name': t('order.amountReset'),status: 'primary',disabled: true},
+ {'code': 'saveOrder', 'name': t('basicData.save'),status: 'primary',icon: 'vxe-icon-save',disabled: false}
],
slots: {
tools: 'toolbar_buttons'
@@ -192,7 +228,7 @@
return[
columns.map((column, columnIndex) => {
if (columnIndex === 0) {
- return '鍚堣:'
+ return t('basicData.total')+':'
}
// if (props.tableProp.footList.includes(column.field)) {
// return sumNum(data, column.field)
@@ -212,6 +248,10 @@
dialogTableVisible.value=true
break
}
+ case 'updateMoney': {
+ updateMoney()
+ break
+ }
case 'Craft': {
await router.push({path: '/main/order/updateOrderCraft', query: {orderId: titleUploadData.value.orderId }})
break
@@ -224,41 +264,51 @@
reviewOrder(0)
break
}
+ case 'cancelOrder':{
+ cancelOrder()
+ break
+ }
case 'saveOrder': {
if ($grid.getTableData().tableData.length === 0){
- ElMessage.error('娌℃湁琛ㄦ牸鏁版嵁锛�')
+ ElMessage.error( t('order.msg.tableLengthNot'))
return
}
+ if(!gridOptions.menuConfig.body.options[0][5].disabled){
+ ElMessage.error(t('order.msg.amountReset'))
+ return
+ }
+
const project = titleUploadData.value.project
if(project === null || project === undefined || project === ''){
- ElMessage.error('杈撳叆椤圭洰鍚嶇О锛�')
+ ElMessage.error(t('order.msg.projectCheck'))
return
}
const customer = titleUploadData.value.customerId
if(customer === null || customer === undefined || customer === ''){
- ElMessage.error('璇烽�夋嫨瀹㈡埛锛�')
+ ElMessage.error(t('order.msg.customerCheck'))
return
}
const salasMan = titleUploadData.value.salesman
if(salasMan === null || salasMan === undefined || salasMan === ''){
- ElMessage.error('璇烽�夋嫨涓氬姟鍛橈紒')
+ ElMessage.error(t('order.msg.salasManCheck'))
return
}
const calculateType = titleUploadData.value.calculateType
if(calculateType === null || calculateType === undefined || calculateType === ''){
- ElMessage.error('璇烽�夋嫨璁＄畻鏂瑰紡锛�')
+ ElMessage.error(t('order.msg.calculateTypeCheck'))
return
}
if ($grid) {
const errMap = await $grid.validate(true)
if (errMap) {
- ElMessage.error(`鏍￠獙涓嶉�氳繃锛乣)
+ ElMessage.error(t('basicData.msg.checkoutLose'))
return
}
let order ={
title:titleUploadData.value,
- detail:$grid.getTableData().tableData
+ detail:$grid.getTableData().tableData,
+ otherMoney:otherMoney.value
}
saveOrder(order)
}
@@ -266,7 +316,8 @@
}
}
}
- },//澶撮儴鎸夐挳浜嬩欢
+ },
+ //鍙抽敭鎸夐挳浜嬩欢
menuClick ({ menu, row, column }) {
const $grid = xGrid.value
if ($grid) {
@@ -277,11 +328,81 @@
}
case 'addRow': {
if ($grid.getTableData().tableData.length >=240){
- ElMessage.error('琛ㄦ牸鏁版嵁宸茶揪鍒版渶澶у�硷紒')
+ ElMessage.error(t('order.msg.tableLengthMax'))
return
}
$grid.insert({})
- //console.log($grid.getRecordset().insertRecords)
+ break
+ }
+ case 'deleteRow':{
+
+ $grid.remove(rowClickIndex.value)
+ rowClickIndex.value = null
+ gridOptions.menuConfig.body.options[0][1].disabled=true
+ gridOptions.menuConfig.body.options[0][5].disabled=false
+ break
+ }
+ case 'copyChecked' :{
+ let result = toolbarButtonClickEvent()
+ if(result){
+ const dataList = xGrid.value.getTableData().visibleData
+ const val = dataList[result.start][result.cell]
+ dataList.forEach((item,index) =>{
+ if(index>=result.start && index<=result.end){
+ item[result.cell] = val
+ }
+ })
+ }
+ gridOptions.menuConfig.body.options[0][5].disabled=false
+ break
+ }
+ case 'copyAll' :{
+ let result = toolbarButtonClickEvent()
+ if(result){
+ const dataList = xGrid.value.getTableData().visibleData
+ const val = dataList[result.start][result.cell]
+ dataList.forEach((item,index) =>{
+ if(index>=result.start ){
+ item[result.cell] = val
+ }
+ })
+ }
+ gridOptions.menuConfig.body.options[0][5].disabled=false
+ break
+ }
+ case 'clearChecked' :{
+ let result = toolbarButtonClickEvent()
+ if(result){
+ const dataList = xGrid.value.getTableData().visibleData
+ dataList.forEach((item,index) =>{
+ if(index>=result.start && index<=result.end){
+ item[result.cell] = ''
+ }
+ })
+ }
+ gridOptions.menuConfig.body.options[0][5].disabled=false
+ break
+ }
+ case 'computedMoney' :{
+ const dataList = xGrid.value.getTableData().fullData
+ dataList.forEach((item,index) =>{
+ item.area = area(item)
+ item.grossArea = countArea(item)
+ item.computeArea = item.area
+ item.computeGrossArea = item.grossArea
+ item.grossAmount=parseFloat((item.price * item.computeGrossArea).toFixed(2))
+ })
+ titleUploadData.value.money=countMoney(xGrid.value.getTableData().fullData).toString()
+
+ gridOptions.menuConfig.body.options[0][5].disabled=true
+ break
+ }
+ case 'errorArea' :{
+ errorAreaVisible.value=true
+ break
+ }
+ case 'otherMoney' :{
+ otherMoneyVisible.value=true
break
}
}
@@ -289,24 +410,62 @@
},
cellDblclick (params) {//琛ㄦ牸鍐呭鍙屽嚮鎵撳紑浜у搧鐣岄潰
const { row } = params
- //alert("鎴戞墦寮�浜嗕骇鍝佺晫闈�")
+ productVisible.value = true
+ rowIndex=row
+ },
+ cellClick({ row }){
+ rowClickIndex.value = row
+ //鍙抽敭鑿滃崟鍒犻櫎鍚敤
+ gridOptions.menuConfig.body.options[0][1].disabled=false
}
}
+//鑾峰彇瀛愰〉闈骇鍝佹柟娉�
+const getProductRow = (row) => {
+ if(row.state!=1){
+ ElMessage.warning(t('order.msg.productStateCheck'))
+ return
+ }
+
+ rowIndex.productName = row.productName
+ rowIndex.productId = row.id
+ productVisible.value = false
+}
+
+
//鍒濆鍖栧垽鏂槸鍚︽湁id浼犲叆
onMounted(()=>{
- const str = route.query.orderId
+ //鍚敤琛ㄦ牸鎷栧姩閫変腑
+ addListener(xGrid.value,gridOptions)
+ const str = route.query.orderId || history.state.orderId
if (typeof str === 'undefined' || str === null || str === '' || str === '\n' || str === '\r'){
return
}
request.post(`/order/getOrderById/${str}`).then((res) => {
if(res.code==200){
titleUploadData.value = res.data.order
+ if(history.state.orderId!=null){
+ titleUploadData.value.orderId=''
+ titleUploadData.value.id=null
+ titleUploadData.value.processReview=null
+ titleUploadData.value.orderReview=null
+ titleUploadData.value.productionOrder=null
+ titleUploadData.value.processingCard=null
+ titleUploadData.value.warehousing=null
+ titleUploadData.value.delivery=null
+ titleUploadData.value.createTime=null
+
+ if(history.state.type=='copy'){
+ xGrid.value.reloadData(res.data.orderDetails)
+ }
+ return
+ }
//鍙栨秷宸ヨ壓鎸夐挳绂佺敤
gridOptions.toolbarConfig.buttons[1].disabled = false
//宸ヨ壓瀹℃牳鍚庝繚瀛樻寜閽鐢�
if(res.data.order.processReview === 2){
- gridOptions.toolbarConfig.buttons[3].disabled = true
+ gridOptions.toolbarConfig.buttons[4].disabled = true
+
}
//鍙栨秷瀹℃牳鎸夐挳绂佺敤
if(res.data.order.processReview === 2 && res.data.order.orderReview === 0){
@@ -314,33 +473,69 @@
}
//鎸夐挳瀹℃牳杩囧悗鍙樹负鍙嶅
- if(res.data.order.orderReview === 2){
+ if(Math.abs(res.data.order.orderReview) === 2){
gridOptions.toolbarConfig.buttons[2].disabled = false
gridOptions.toolbarConfig.buttons[2].code='reviews'
- gridOptions.toolbarConfig.buttons[2].name='鍙嶅'
+ gridOptions.toolbarConfig.buttons[2].name=t('basicData.cancelReview')
+ gridOptions.toolbarConfig.buttons[3].disabled = false
+ const button = {'code': 'cancelOrder',
+ status: 'primary',
+ 'name': (res.data.order.orderReview>0?t('basicData.cancel'):t('basicData.restore'))}
+ gridOptions.toolbarConfig.buttons.push(button)
+ if(res.data.order.orderReview===-2){
+ gridOptions.toolbarConfig.buttons[2].disabled = true
+ gridOptions.toolbarConfig.buttons[3].disabled = true
+ gridOptions.toolbarConfig.buttons[4].disabled = true
+ }
}
if(res.data.order.productionOrder !==0 ){
gridOptions.toolbarConfig.buttons[2].disabled = true
}
+ const orderDetails = res.data.orderDetails
+ orderDetails.forEach(item => {
+ item.otherColumns = JSON.parse(item.otherColumns)
+ })
-
- xGrid.value.reloadData(res.data.orderDetails)
+ //鍔犺浇鍓〃鏁版嵁
+ xGrid.value.reloadData(orderDetails)
}else{
ElMessage.error(res.msg)
}
})
})
+const cancelOrder = () => {
+ request.post(`/order/cancelOrder/${titleUploadData.value.orderId}`).then((res) =>{
+ if (res.code== 200){
+ ElMessage.success(t('order.msg.updateOrderState'))
+ router.push({path:'/main/order/createOrder',query:{orderId:titleUploadData.value.orderId,random:Math.random()}})
+ }else{
+ ElMessage.error(res.msg)
+ }
+ })
+}
+
+
//椤甸潰绗竴娆″姞杞芥墽琛�
request.get(`/basicData/orderBasicData`).then((res) => {
-
if(res.code==200){
titleSelectJson.value=deepClone(res.data)
+ //鍏朵粬閲戦
+ otherMoney.value = titleSelectJson.value.orderOtherMoney[0]
+ //let columns = []
+ otherMoney.value.forEach(item => {
+ let column = {field: `otherColumns.${item.column}`,width:50, title: item.alias,editRender: { name: 'input'}}
+ //columns.push(column)
+ gridOptions.columns.push(column)
+ })
+
+ //杩涘叆椤甸潰涓嬫媺妗嗚缃粯璁ゅ��
titleUploadData.value.orderType = titleSelectJson.value.orderType[0].basicName
titleUploadData.value.orderClassify = titleSelectJson.value.orderClassify[0].basicName
titleUploadData.value.icon = titleSelectJson.value.icon[0].basicName
titleUploadData.value.packType = titleSelectJson.value.packType[0].basicName
titleUploadData.value.alType = titleSelectJson.value.alType[0].basicName
+ titleUploadData.value.calculateType=1
const today = new Date
today.setTime(today.getTime() + (15 * 24 * 60 * 60 * 1000))
titleUploadData.value.deliveryDate = today.getFullYear() +
@@ -355,26 +550,49 @@
const saveOrder = (order) => {
request.post(`/order/saveOrder`,order).then((res) => {
if(res.code==200){
- ElMessage.success('淇濆瓨鎴愬姛')
+ ElMessage.success(t('basicData.msg.saveSuccess'))
router.push({path:'/main/order/selectOrder'})
}else {
ElMessage.error(res.msg)
}
})
}
+
+//鏇存柊閲戦
+const updateMoney = () => {
+ const updateData = {
+ order: titleUploadData.value,
+ detail: xGrid.value.getTableData().fullData
+ }
+ request.post(`/order/updateOrderMoney`,updateData).then(res => {
+ if (res.code == 200){
+ ElMessage.success( t('order.msg.updateAmountSuccessfully') )
+ router.push({path:'/main/order/createOrder',
+ query:{
+ orderId:titleUploadData.value.orderId,
+ random:Math.random()
+ }
+ })
+ }
+
+ })
+
+}
+
+
// 瀹℃牳璁㈠崟
const reviewOrder = (state) => {
request.post(`/order/reviewOrderById/${titleUploadData.value.orderId}/${state}`).then(res =>{
if(res.code==200){
gridOptions.toolbarConfig.buttons[2].disabled = true
if(state==2){
- ElMessage.success('瀹℃牳鎴愬姛锛�')
+ ElMessage.success(t('basicData.msg.ReviewSuccess') )
}else if (state==0){
- ElMessage.success('鍙嶅鎴愬姛锛�')
+ ElMessage.success(t('basicData.msg.cancelReviewSuccess'))
}
- setTimeout(() =>{
- location.reload()
- },1500)
+ router.push({path:'/main/order/createOrder',query:{
+ orderId:titleUploadData.value.orderId,
+ random:Math.random()}})
}else{
ElMessage.error(res.msg)
@@ -402,13 +620,16 @@
const area = parseFloat((row.width * row.height/1000000).toFixed(2))
return parseFloat((area * row.quantity).toFixed(2))
}
-
+//璁＄畻閲戦挶
const countMoney = (list) => {
let countMoney = 0
list.forEach((item)=>{
countMoney += parseFloat(item.grossAmount)
})
- return countMoney
+ otherMoney.value.forEach(item => {
+ countMoney+=item.quantity*item.price
+ })
+ return parseFloat((countMoney).toFixed(2))
}
//瀵煎叆鍔熻兘
const importEvent = async () => {
@@ -422,7 +643,10 @@
const workbook = XLXS.read(data, { type: 'binary' })
let jsonData = XLXS.utils.sheet_to_json(workbook.Sheets.Sheet1).slice(1)
if(jsonData.length>240){
- ElMessage.error(`瀵煎叆${jsonData.length}鏉�,鏁版嵁涓嶈兘瓒呰繃240鏉�,璇峰垎璁㈠崟瀵煎叆`)
+ ElMessage.error(`${t('order.msg.importMaxCheckFailFirst')}
+ ${jsonData.length}
+ ${t('order.msg.importMaxCheckFailMid')}
+ ${t('order.msg.importMaxCheckFailLast')}`)
return
}
jsonData.forEach((item,index) => {
@@ -441,6 +665,21 @@
fileReader.readAsBinaryString(files[0])
}
+//妯℃澘涓嬭浇
+const importTemplate = () => {
+ downLoadFile('/importTemplate.xlsx','importTemplate.xlsx')
+}
+
+//瀛楃涓茶浆object
+
+function getNestedProperty(obj, path) {
+ return path.split('.').reduce(function(o, p) {
+ if(o && o.hasOwnProperty(p)) {
+ return o[p];
+ }
+ }, obj);
+}
+
//琛屽崟鍏冩牸淇敼淇敼瑙﹀彂姝や簨浠�
const editClosedEvent = ({ row, column }) => {
//鍒ゆ柇淇敼鐩稿簲鐨勬暟鍊间慨鏀归潰绉笌閲戦
@@ -453,17 +692,57 @@
}else if(column.property === 'computeArea'){
row.computeGrossArea=parseFloat((row.computeArea*row.quantity).toFixed(2))
row.grossAmount=parseFloat((row.price * row.computeGrossArea).toFixed(2))
+ }else if(column.property.indexOf('otherColumns.M')>-1){
+ let quantity = 0
+ xGrid.value.getTableData().fullData.forEach(item => {
+ quantity += item.quantity*(getNestedProperty(item,column.property)*1)
+ })
+ if(!isNaN(quantity)){
+ otherMoney.value.forEach(item => {
+ if(item.column===column.property.split('.')[1]){
+ item.quantity = quantity
+ }
+ })
+ }
}
+ titleUploadData.value.money=countMoney(xGrid.value.getTableData().fullData).toString()
+
+}
+
+//璇樊闈㈢Н璁＄畻鏂规硶
+const errorAreaComputed = () => {
+ const regex = /^(0(\.\d{1,2})?|([1-9]\d{0,4})(\.\d{1,2})?|99999(\.9{1,2})?)$/
+ if (!regex.test(errorArea.value)) {
+ ElMessage.warning(t('basicData.msg.range99999Dec2'))
+ return
+ }
+ const fullData = xGrid.value.getTableData().fullData
+ if (!fullData.length){
+ ElMessage.warning("琛ㄦ牸涓棤浜у搧鏁版嵁")
+ }
+ fullData.forEach((item,index) => {
+ if( !isNaN(item.computeArea*1) && item.computeArea != null && item.computeArea*1 < errorArea.value){
+ item.computeArea = errorArea.value
+ item.computeGrossArea = parseFloat((item.computeArea*item.quantity).toFixed(2))
+ item.grossAmount=parseFloat((item.price * item.computeGrossArea).toFixed(2))
+ }
+ })
+ titleUploadData.value.money=countMoney(xGrid.value.getTableData().fullData).toString()
+ errorAreaVisible.value= false
+}
+
+
+
+//鍏抽棴鍏朵粬閲戦鐣岄潰
+const refOtherMoney = ref()
+const closeOtherMoneyDialog = async (done) => {
+ const flag = await refOtherMoney.value.validate()
+ if(flag){
+ done()
titleUploadData.value.money=countMoney(xGrid.value.getTableData().fullData).toString()
+ }
}
-
-// 鎵嬪姩瑙﹀彂绛涢��
-const changeFilterEvent = (event, option, $panel) => {
- // 鎵嬪姩瑙﹀彂绛涢��
- $panel.changeOption(event, !!option.data, option)
-}
-
</script>
@@ -472,15 +751,15 @@
<div class="main-div">
<div class="order-primary" style="background-color: white">
<el-row>
- <el-col :span="2"><el-text>*椤圭洰鍚嶇О锛�</el-text></el-col>
+ <el-col :span="2"><el-text>*{{$t('order.project')}}锛�</el-text></el-col>
<el-col :span="2"><el-input v-model="titleUploadData.project"/></el-col>
- <el-col :span="2"><el-text>*瀹㈡埛閫夋嫨锛�</el-text></el-col>
+ <el-col :span="2"><el-text>*{{$t('order.customers')}}锛�</el-text></el-col>
<el-col :span="2">
<el-select v-model="titleUploadData.customerId"
@change="changeCustomer"
filterable
clearable
- placeholder="" >
+ placeholder=" " >
<el-option v-for="item in titleSelectJson['customer']"
:key="item.id"
:label="item.id+' '+item.customerName"
@@ -488,7 +767,7 @@
/>
</el-select>
</el-col>
- <el-col :span="2"><el-text>*璁㈠崟绫诲瀷锛�</el-text></el-col>
+ <el-col :span="2"><el-text>*{{$t('order.orderType')}}锛�</el-text></el-col>
<el-col :span="2">
<el-select v-model="titleUploadData.orderType" clearable placeholder="" >
<el-option
@@ -499,7 +778,7 @@
/>
</el-select>
</el-col>
- <el-col :span="2"><el-text>璁㈠崟鍒嗙被锛�</el-text></el-col>
+ <el-col :span="2"><el-text>{{$t('order.orderClassify')}}锛�</el-text></el-col>
<el-col :span="2">
<el-select v-model="titleUploadData.orderClassify" clearable placeholder=" " >
<el-option
@@ -510,7 +789,7 @@
/>
</el-select>
</el-col>
- <el-col :span="2"><el-text>鍟嗘爣閫夐」锛�</el-text></el-col>
+ <el-col :span="2"><el-text>{{$t('order.icon')}}锛�</el-text></el-col>
<el-col :span="2">
<el-select v-model="titleUploadData.icon" clearable placeholder=" " >
<el-option v-for="item in titleSelectJson['icon']"
@@ -519,7 +798,7 @@
:value="item.basicName"/>
</el-select>
</el-col>
- <el-col :span="2"><el-text>鍖呰鏂瑰紡锛�</el-text></el-col>
+ <el-col :span="2"><el-text>{{$t('order.packType')}}锛�</el-text></el-col>
<el-col :span="2">
<el-select v-model="titleUploadData.packType" clearable placeholder=" " >
<el-option v-for="item in titleSelectJson['packType']"
@@ -531,9 +810,9 @@
<!-- <el-col :span="2"><el-text /></el-col>-->
</el-row>
<el-row>
- <el-col :span="2"><el-text>閿�鍞崟鍙凤細</el-text></el-col>
+ <el-col :span="2"><el-text>{{$t('order.orderId')}}锛�</el-text></el-col>
<el-col :span="2"><el-text >{{titleUploadData.orderId}}</el-text></el-col>
- <el-col :span="2"><el-text>浜よ揣鏃ユ湡锛�</el-text></el-col>
+ <el-col :span="2"><el-text>{{$t('order.deliveryDate')}}锛�</el-text></el-col>
<el-col :span="2">
<el-date-picker
v-model="titleUploadData.deliveryDate"
@@ -541,15 +820,15 @@
placeholder=""
/>
</el-col>
- <el-col :span="2"><el-text>鎵规锛�</el-text></el-col>
+ <el-col :span="2"><el-text>{{$t('order.batch')}}锛�</el-text></el-col>
<el-col :span="2"><el-input v-model="titleUploadData.batch"/></el-col>
- <el-col :span="2"><el-text>璁＄畻鏂瑰紡锛�</el-text></el-col>
+ <el-col :span="2"><el-text>{{$t('order.calculateType')}}锛�</el-text></el-col>
<el-col :span="2">
<el-select v-model="titleUploadData.calculateType" clearable placeholder=" " >
- <el-option value="1" label="闈㈢Н閲戦锛堝崟鐗囷級"/>
+ <el-option :value="1" label="闈㈢Н閲戦锛堝崟鐗囷級"/>
</el-select>
</el-col>
- <el-col :span="2"><el-text>*涓氬姟鍛橈細</el-text></el-col>
+ <el-col :span="2"><el-text>*{{$t('order.salesman')}}锛�</el-text></el-col>
<el-col :span="2">
<el-select
v-model="titleUploadData.salesmanId"
@@ -563,7 +842,7 @@
:value="item.id"/>
</el-select>
</el-col>
- <el-col :span="2"><el-text>閾濇潯鏂瑰紡锛�</el-text></el-col>
+ <el-col :span="2"><el-text>{{$t('order.alType')}}</el-text></el-col>
<el-col :span="2">
<el-select v-model="titleUploadData.alType" clearable placeholder=" " >
<el-option v-for="item in titleSelectJson['alType']"
@@ -574,17 +853,17 @@
</el-col>
</el-row>
<el-row>
- <el-col :span="2"><el-text>鎬婚噾棰濓細</el-text></el-col>
+ <el-col :span="2"><el-text>{{$t('order.money')}}锛�</el-text></el-col>
<el-col :span="2"><el-text >{{titleUploadData.money}}</el-text></el-col>
- <el-col :span="2"><el-text>鍚堝悓缂栧彿锛�</el-text></el-col>
+ <el-col :span="2"><el-text>{{$t('order.contractId')}}锛�</el-text></el-col>
<el-col :span="2"><el-input v-model="titleUploadData.contractId"/></el-col>
- <el-col :span="2"><el-text>瀹㈡埛鎵规锛�</el-text></el-col>
+ <el-col :span="2"><el-text>{{$t('order.customerBatch')}}:</el-text></el-col>
<el-col :span="2"><el-input v-model="titleUploadData.customerBatch"/></el-col>
- <el-col :span="2"><el-text>鑱旂郴浜猴細</el-text></el-col>
+ <el-col :span="2"><el-text>{{$t('order.contacts')}}:</el-text></el-col>
<el-col :span="2"><el-input v-model="titleUploadData.contacts" /></el-col>
- <el-col :span="2"><el-text>鑱旂郴鐢佃瘽锛�</el-text></el-col>
+ <el-col :span="2"><el-text>{{$t('order.contactNumber')}}:</el-text></el-col>
<el-col :span="2"><el-input v-model="titleUploadData.contactNumber"/></el-col>
- <el-col :span="2"><el-text >閫佽揣鍦板潃锛�</el-text></el-col>
+ <el-col :span="2"><el-text >{{$t('order.deliveryAddress')}}:</el-text></el-col>
<el-col :span="2"><el-input v-model="titleUploadData.deliveryAddress"/></el-col>
</el-row>
<!-- <el-row>-->
@@ -614,19 +893,54 @@
</div>
</template>
<template #toolbar_buttons>
- <vxe-button @click="importEvent">瀵煎叆</vxe-button>
+ <vxe-button @click="importTemplate">{{$t('order.template')}}</vxe-button>
+ <vxe-button @click="importEvent">{{$t('order.import')}}</vxe-button>
+ </template>
+ <template #shape_edit="{ row }">
+ <vxe-select v-model="row.shape" transfer>
+ <vxe-option v-for="item in shapeList" :key="item" :value="item" :label="item" />
+ </vxe-select>
</template>
</vxe-grid>
</div>
- <el-dialog v-model="dialogTableVisible" title="鍔犲伐瑕佹眰" style="width: 60%;height:75% ">
+ <el-dialog v-model="dialogTableVisible" :title="$t('order.processingNote')" style="width: 60%;height:75% ">
<el-input
v-model="titleUploadData.processingNote"
type="textarea"
:autosize="{ minRows: 2, maxRows: 20 }"
/>
</el-dialog>
+ <el-dialog v-model="productVisible" style="width: 80%;height:75% ">
+ <select-product :rowIndex="rowIndex" @getProductRow="getProductRow" style="width: 100%;height: 100%" />
+ </el-dialog>
+<!--璇樊缁撶畻-->
+ <el-dialog v-model="errorAreaVisible" style="width: 300px;height:150px ">
+ <el-row>
+ <el-col :span="10">
+ <el-input
+ v-model="errorArea"
+ :placeholder="'璇樊鍊�'"
+ />
+ </el-col>
+ <el-col :span="6">
+ <el-button @click="errorAreaComputed">纭</el-button>
+ </el-col>
+ </el-row>
+ </el-dialog>
+ <el-dialog v-model="otherMoneyVisible"
+ :title="'鍏朵粬閲戦'"
+ :close-on-click-modal="false"
+ :close-on-press-escape="false"
+ :before-close="closeOtherMoneyDialog"
+ style="width: 614px;height:445px ">
+ <order-other-money
+ ref="refOtherMoney"
+ :otherMoney="otherMoney"
+ style="width: 100%;height: 100%" />
+ </el-dialog>
+
</div>
</template>
@@ -652,5 +966,12 @@
width: 100%;
height: 85%;
}
+ .vxe-grid {
+ /* 绂佺敤娴忚鍣ㄩ粯璁ら�変腑 */
+ -webkit-user-select: none;
+ -moz-user-select: none;
+ -ms-user-select: none;
+ user-select: none;
+ }
</style>
\ No newline at end of file
--
Gitblit v1.8.0