From 9b9fdcb4711279a303cf8da9ce9e3ff30b1bf6e0 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 20 三月 2025 16:45:06 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue | 462 +++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 349 insertions(+), 113 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 0c870cc..0f3d636 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
@@ -1,5 +1,5 @@
<script lang="ts" setup>
-import {onMounted, reactive, ref, watch} from "vue"
+import {nextTick, onMounted, reactive, ref, watch} from "vue"
import {useRouter,useRoute} from "vue-router"
import * as XLXS from "xlsx"
import {ElMessage, ElMessageBox} from "element-plus"
@@ -8,6 +8,8 @@
import useUserInfoStore from '@/stores/userInfo'
import companyInfo from "@/stores/sd/companyInfo"
import SelectProduct from "@/views/sd/product/SelectProduct.vue"
+import CreateProduct from "@/views/sd/product/CreateProduct.vue"
+import CreateCustomer from "@/views/sd/customer/CreateCustomer.vue"
import OrderOtherMoney from "@/components/sd/order/OrderOtherMoney.vue"
import OrderSizeCheck from "@/components/sd/order/OrderSizeCheck.vue"
import {changeFilterEvent,filterChanged} from "@/hook"
@@ -25,9 +27,9 @@
let sizeCheckVisible = ref(false)
let orderIdVisible = ref(false)
const maxTableLen =ref(500)
-let errorArea = ref(0.4)
const userStore = useUserInfoStore()
const company = companyInfo()
+let errorArea = ref(company.errorArea)
const router = useRouter()
const route = useRoute()
const xGrid = ref()
@@ -134,7 +136,7 @@
keyboardConfig:{
isArrow: true,
isDel: true,
- isEnter: true,
+ //isEnter: true,
isTab: true,
isEdit: true,
isChecked: true
@@ -143,7 +145,7 @@
trigger: 'dblclick',
mode: 'cell',
showStatus: true,
- showIcon:false
+ showIcon:false,
},//琛ㄥご鍙傛暟
columns:[
{type: 'seq',fixed:"left", title: t('basicData.Number'), width: 80 },
@@ -159,6 +161,7 @@
{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: 'monolithicPerimeter',width:200, title: t('order.perimeter'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
{field: 'shape',width:120,
title: t('order.shape'),
editRender: { name: 'input'},
@@ -323,9 +326,8 @@
}
const project = titleUploadData.value.project
- if(project === null || project === undefined || project === ''){
- ElMessage.error(t('order.msg.projectCheck'))
- return
+ if(project === null || project === undefined ){
+ titleUploadData.value.project=''
}
const customer = titleUploadData.value.customerId
if(customer === null || customer === undefined || customer === ''){
@@ -422,11 +424,6 @@
return
}
- const project = titleUploadData.value.project
- if(project === null || project === undefined || project === ''){
- ElMessage.error(t('order.msg.projectCheck'))
- return
- }
const customer = titleUploadData.value.customerId
if(customer === null || customer === undefined || customer === ''){
ElMessage.error(t('order.msg.customerCheck'))
@@ -631,29 +628,62 @@
if(result){
const dataList = xGrid.value.getTableData().visibleData
const val = getNestedProperty(dataList[result.start],result.cell)+""
+ if(!/\d$/.test(val)){
+ const matches = val.match(/\D/g);
+ const b= val.lastIndexOf(matches[matches.length-1])
- const numbersArr = []
- const regex = /\d+/g
- let match
- while ((match = regex.exec(val))) {
- numbersArr.push({ number: match[0], index: match.index });
- }
- let numbers=numbersArr[numbersArr.length-1]
- var subStr1 = val.substring(numbers.index);
- var subStr2 = val.substring(0, numbers.index);
- let number = parseInt(subStr1)
- var reg =new RegExp(number,"g")
- dataList.forEach((item,index) =>{
- if(index>=result.start ){
- let newStr = subStr1.replace(reg, number);
- if(parseInt(newStr)>9){
- newStr=parseInt(newStr)
- }
- setNestedValue(item,result.cell,subStr2+newStr)
- number=number+1
+ const numbersArr = []
+ const regex = /\d+/g
+ let match
+ while ((match = regex.exec(val))) {
+ numbersArr.push({ number: match[0], index: match.index });
}
+ let numbers=numbersArr[numbersArr.length-1]
+ var subStr1 = val.substring(numbers.index);
+ const matche = subStr1.match(/(\d+)([^0-9]|$)/);
+ const a= val.lastIndexOf(matche[2])
+ var subStr2 = val.substring(0, numbers.index);
+ var subStr3 = val.substring(a,b+1);
+ let number = parseInt(subStr1)
+ var reg =new RegExp(number,"g")
+ dataList.forEach((item,index) =>{
+ if(index>=result.start ){
+ let newStr = subStr1.replace(reg, number);
+ if(parseInt(newStr)>9){
+ newStr=parseInt(newStr)
+ if(!/\d$/.test(val)){
+ newStr=newStr+subStr3
+ }
+ }
+ setNestedValue(item,result.cell,subStr2+newStr)
+ number=number+1
+ }
- })
+ })
+ }else{
+ const numbersArr = []
+ const regex = /\d+/g
+ let match
+ while ((match = regex.exec(val))) {
+ numbersArr.push({ number: match[0], index: match.index });
+ }
+ let numbers=numbersArr[numbersArr.length-1]
+ var subStr1 = val.substring(numbers.index);
+ var subStr2 = val.substring(0, numbers.index);
+ let number = parseInt(subStr1)
+ var reg =new RegExp(number,"g")
+ dataList.forEach((item,index) =>{
+ if(index>=result.start ){
+ let newStr = subStr1.replace(reg, number);
+ if(parseInt(newStr)>9){
+ newStr=parseInt(newStr)
+ }
+ setNestedValue(item,result.cell,subStr2+newStr)
+ number=number+1
+ }
+
+ })
+ }
}
computedMoney(result.cell)
@@ -665,36 +695,62 @@
if (result) {
const dataList = xGrid.value.getTableData().visibleData
const val = getNestedProperty(dataList[result.start], result.cell)+""
- const numbersArr = []
- const regex = /\d+/g
- let match
- while ((match = regex.exec(val))) {
- numbersArr.push({ number: match[0], index: match.index });
- }
- let numbers=numbersArr[numbersArr.length-1]
- var subStr1 = val.substring(numbers.index);
- var subStr2 = val.substring(0, numbers.index);
- let number = parseInt(subStr1)
- var reg =new RegExp(number,"g")
- dataList.forEach((item,index) =>{
- if(index >= result.start && index <= result.end){
- let newStr = subStr1.replace(reg, number);
- if(parseInt(newStr)>9){
- newStr=parseInt(newStr)
- }
- setNestedValue(item,result.cell,subStr2+newStr)
- number=number+1
- }
+ if(!/\d$/.test(val)){
+ const matches = val.match(/\D/g);
+ const b= val.lastIndexOf(matches[matches.length-1])
- })
- /*let numbers = parseInt(val.match(/(\d+)$/))
- const string=val.replace(/\d+$/, '')
- dataList.forEach((item, index) => {
- if (index >= result.start && index <= result.end) {
- setNestedValue(item, result.cell, string + numbers)
- numbers = numbers + 1
+ const numbersArr = []
+ const regex = /\d+/g
+ let match
+ while ((match = regex.exec(val))) {
+ numbersArr.push({ number: match[0], index: match.index });
}
- })*/
+ let numbers=numbersArr[numbersArr.length-1]
+ var subStr1 = val.substring(numbers.index);
+ const matche = subStr1.match(/(\d+)([^0-9]|$)/);
+ const a= val.lastIndexOf(matche[2])
+ var subStr2 = val.substring(0, numbers.index);
+ var subStr3 = val.substring(a,b+1);
+ let number = parseInt(subStr1)
+ var reg =new RegExp(number,"g")
+ dataList.forEach((item,index) =>{
+ if(index >= result.start && index <= result.end){
+ let newStr = subStr1.replace(reg, number);
+ if(parseInt(newStr)>9){
+ newStr=parseInt(newStr)
+ newStr=newStr+subStr3
+ }
+ setNestedValue(item,result.cell,subStr2+newStr)
+ number=number+1
+ }
+
+ })
+ }else{
+ const numbersArr = []
+ const regex = /\d+/g
+ let match
+ while ((match = regex.exec(val))) {
+ numbersArr.push({ number: match[0], index: match.index });
+ }
+ let numbers=numbersArr[numbersArr.length-1]
+ var subStr1 = val.substring(numbers.index);
+ var subStr2 = val.substring(0, numbers.index);
+ let number = parseInt(subStr1)
+ var reg =new RegExp(number,"g")
+ dataList.forEach((item,index) =>{
+ if(index >= result.start && index <= result.end){
+ let newStr = subStr1.replace(reg, number);
+ if(parseInt(newStr)>9){
+ newStr=parseInt(newStr)
+ }
+ setNestedValue(item,result.cell,subStr2+newStr)
+ number=number+1
+ }
+
+ })
+ }
+
+
}
computedMoney(result.cell)
@@ -739,13 +795,18 @@
//鍒濆鍖栧垽鏂槸鍚︽湁id浼犲叆
onMounted(async ()=>{
gridOptions.loading = true
- await initOrder()
+ await initOrder(0)
//鍚敤琛ㄦ牸鎷栧姩閫変腑
addListener(xGrid.value,gridOptions)
+ let productData = route.query.produceList
+ if (!(typeof productData === 'undefined' || productData == null || productData === '' || productData === '\n' || productData === '\r')){
+ xGrid.value.insertAt(JSON.parse(productData))
+ }
+
const str = route.query.orderId || history.state.orderId
if (typeof str === 'undefined' || str === null || str === '' || str === '\n' || str === '\r'){
-
+ gridOptions.menuConfig.body.options[0][11].disabled = true
gridOptions.loading = false
return
}
@@ -753,6 +814,8 @@
request.post(`/order/getOrderById/${str}`).then((res) => {
if(res.code==200){
titleUploadData.value = res.data.order
+ const customer = titleSelectJson.value.customer.filter(item => item.id === titleUploadData.value.customerId)
+ projects.value = customer[0].projectList
newOrderId.value=titleUploadData.value.orderId
if(history.state.orderId!=null){
titleUploadData.value.orderId=''
@@ -772,6 +835,10 @@
if(history.state.type=='copy'){
xGrid.value.reloadData(orderDetails)
+ gridOptions.menuConfig.body.options[0][11].disabled = true
+ }
+ if(history.state.type=='copyTitle'){
+ gridOptions.menuConfig.body.options[0][11].disabled = true
}
gridOptions.loading = false
@@ -867,6 +934,8 @@
if(titleUploadData.value.calculateType===3){
item.grossAmount=multiply(item.price,item.quantity)
+ }else if(titleUploadData.value.calculateType===4){
+ item.grossAmount=parseFloat(divideAuto(item.width * item.height* item.quantity*item.price,1000000,company.decValue))
}else{
item.grossAmount=multiply(item.price,item.computeGrossArea)
}
@@ -880,47 +949,48 @@
//椤甸潰绗竴娆″姞杞芥墽琛�
-const initOrder = async ()=>{
+const initOrder = async (val)=>{
await 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:100,
- title: item.alias,
- editRender: {
- name: 'input',
+ if(val===0){
+ //鍏朵粬閲戦
+ otherMoney.value = titleSelectJson.value.orderOtherMoney[0]
+ //let columns = []
+ otherMoney.value.forEach(item => {
+ let column = {
+ field: `otherColumns.${item.column}`,
+ width:100,
+ title: item.alias,
+ editRender: {
+ name: 'input',
+ }
}
- }
- //鍒ゆ柇 鍏朵粬鍒楁槸鍚︽槸鏁板瓧
- if(item.column.indexOf('M')>-1){
- gridOptions.editRules[`otherColumns.${item.column}`] = [
- {
- validator ({ cellValue }) {
- const regex = /^(0(\.\d{1,2})?|([1-9]\d{0,4})(\.\d{1,2})?|99999(\.9{1,2})?)$/
- if (cellValue && !regex.test(cellValue)) {
- return new Error(t('basicData.msg.range99999Dec2'))
+ //鍒ゆ柇 鍏朵粬鍒楁槸鍚︽槸鏁板瓧
+ if(item.column.indexOf('M')>-1){
+ gridOptions.editRules[`otherColumns.${item.column}`] = [
+ {
+ validator ({ cellValue }) {
+ const regex = /^(0(\.\d{1,3})?|([1-9]\d{0,4})(\.\d{1,3})?|99999(\.9{1,3})?)$/
+ if (cellValue && !regex.test(cellValue)) {
+ return new Error(t('basicData.msg.range99999Dec3'))
+ }
}
}
- }
- ]
- }else{
- gridOptions.editRules[`otherColumns.${item.column}`] = [
- { required: false},
- { min: 0, max: 255, message: t('basicData.msg.max255') }
- ]
- }
+ ]
+ }else{
+ gridOptions.editRules[`otherColumns.${item.column}`] = [
+ { required: false},
+ { min: 0, max: 255, message: t('basicData.msg.max255') }
+ ]
+ }
- //columns.push(column)
- gridOptions.columns.push(column)
+ //columns.push(column)
+ gridOptions.columns.push(column)
- })
-
+ })
+ }
//杩涘叆椤甸潰涓嬫媺妗嗚缃粯璁ゅ��
titleUploadData.value.orderType = titleSelectJson.value.orderType[0].basicName
titleUploadData.value.orderClassify = titleSelectJson.value.orderClassify[0].basicName
@@ -929,7 +999,7 @@
titleUploadData.value.alType = titleSelectJson.value.alType[0].basicName
titleUploadData.value.calculateType = company.calculateType
const today = new Date
- today.setTime(today.getTime() + (7 * 24 * 60 * 60 * 1000))
+ today.setTime(today.getTime() + (company.deliveryDate * 24 * 60 * 60 * 1000))
titleUploadData.value.deliveryDate = today.getFullYear() +
'-' + ("0" + (today.getMonth() + 1)).slice(-2)
+ '-' + ("0" + today.getDate()).slice(-2)
@@ -995,7 +1065,9 @@
request.post(`/order/saveOrderTitle`,order).then((res) => {
if(res.code==200){
ElMessage.success(t('basicData.msg.saveSuccess'))
- router.push({path:'/main/order/selectOrder'})
+ router.push({path:'/main/order/createOrder',query:{
+ orderId:titleUploadData.value.orderId,
+ random:Math.random()}})
}else {
ElMessage.error(res.msg)
}
@@ -1006,7 +1078,9 @@
const updateOrderId = () => {
let orderId ={
oldOrderId:titleUploadData.value.orderId,
- newOrderId:newOrderId.value
+ newOrderId:newOrderId.value,
+ orderIdType:company.orderIdType,
+ creator:userStore.user.userName,
}
request.post(`/order/updateOrderId`,orderId).then((res) => {
if(res.code==200 && res.data==="true"){
@@ -1024,6 +1098,8 @@
ElMessage.warning("杈撳叆璁㈠崟鍙烽暱搴︿笉绗�")
}else if(res.data==="false5"){
ElMessage.warning("璇疯緭鍏ユ暟瀛�")
+ }else if(res.data==="false6"){
+ ElMessage.warning("涓嶈兘淇敼绗竴涓崟瀛�")
}
})
}
@@ -1054,7 +1130,35 @@
// 瀹℃牳璁㈠崟
-const reviewOrder = (state) => {
+const reviewOrder = async (state) => {
+ let differentSize = null
+ if(state===0){
+ await request.post(`/order/selectDifferentSize/${titleUploadData.value.orderId}`).then(res =>{
+ differentSize = res.data
+ })
+ }
+ let orderGlassState = null
+ if(differentSize===true){
+ await ElMessageBox.confirm(
+ t('order.msg.differentSize'),
+ t('order.msg.warning'),
+ {
+ confirmButtonText: t('basicData.confirmButtonText'),
+ cancelButtonText: t('basicData.cancelButtonText'),
+ type: 'warning',
+ }
+ )
+ .then(async () => {
+
+ })
+ .catch(async () => {
+ orderGlassState = false
+ })
+ }
+ if (orderGlassState===false){
+ return
+ }
+
request.post(`/order/reviewOrderById/${titleUploadData.value.orderId}/${state}/${userStore.user.userId}/${userStore.user.userName}`).then(res =>{
if(res.code==200){
gridOptions.toolbarConfig.buttons[2].disabled = true
@@ -1077,6 +1181,20 @@
reviewOrder(2)
}
+let projects = ref([])
+
+const changeProject = (item) => {
+ if(typeof item === 'string'){
+ titleUploadData.value.project = item
+ return
+ }
+ titleUploadData.value.project = item.project
+ titleUploadData.value.salesmanId = parseInt(item.salesmanId)
+ titleUploadData.value.salesman = item.salesman
+ titleUploadData.value.contacts = item.contacts
+ titleUploadData.value.contactNumber = item.contactNumber
+}
+
const changeCustomer = () => {
const changedCustomerId = titleUploadData.value.customerId
const customer = titleSelectJson.value.customer.filter(item => item.id === changedCustomerId)
@@ -1084,12 +1202,15 @@
titleUploadData.value.project = customer[0].project
titleUploadData.value.salesmanId = customer[0].salesmanId
titleUploadData.value.salesman = customer[0].salesman
+ titleUploadData.value.contacts = customer[0].contacts
+ titleUploadData.value.contactNumber = customer[0].contactNumber
+ projects.value = customer[0].projectList
}
const changeSaleMan = () => {
const changedSaleManId = titleUploadData.value.salesmanId
const SaleMan = titleSelectJson.value.saleMan.filter(item => item.id === changedSaleManId)
- titleUploadData.value.salesman = SaleMan[0].basicName
+ titleUploadData.value.salesman = SaleMan[0]['basicName']
}
const area = (row) => {
@@ -1101,7 +1222,11 @@
// 鑾峰彇淇濈暀闈㈢Н,
const decValue = company.decValue
switch (titleUploadData.value.calculateType){
- case 2:{
+ case 2 :{
+ areaSum = parseFloat(divideAuto(row.width * row.height* row.quantity,1000000,company.decValue))
+ break
+ }
+ case 4:{
areaSum = parseFloat(divideAuto(row.width * row.height* row.quantity,1000000,company.decValue))
break
}
@@ -1164,6 +1289,8 @@
}
if(titleUploadData.value.calculateType===3){
item.grossAmount=multiply(item.price , item.quantity)
+ }else if(titleUploadData.value.calculateType===4){
+ item.grossAmount=parseFloat(divideAuto(item.width * item.height* item.quantity*item.price,1000000,company.decValue))
}else{
item.grossAmount=multiply(item.price * 1 , item.computeGrossArea)
}
@@ -1215,7 +1342,6 @@
//琛屽崟鍏冩牸淇敼淇敼瑙﹀彂姝や簨浠�
const editClosedEvent = ({ row, column }) => {
-
//鍒ゆ柇淇敼鐩稿簲鐨勬暟鍊间慨鏀归潰绉笌閲戦
if (['width', 'height', 'quantity', 'price'].includes(column.property)) {
if(titleUploadData.value?.orderReview!==2){
@@ -1226,6 +1352,8 @@
}
if(titleUploadData.value.calculateType===3){
row.grossAmount=multiply(row.price ,row.quantity)
+ }else if(titleUploadData.value.calculateType===4){
+ row.grossAmount=parseFloat(divideAuto(row.width * row.height* row.quantity*row.price,1000000,company.decValue))
}else{
row.grossAmount=multiply(row.price , row.computeGrossArea)
}
@@ -1255,7 +1383,6 @@
// }
// }
titleUploadData.value.money=countMoney(xGrid.value.getTableData().fullData).toString()
-
}
@@ -1326,6 +1453,10 @@
if( !isNaN(item.computeArea*1) && item.computeArea != null ){
if(titleUploadData.value.calculateType===3){
item.grossAmount=parseFloat(multiply(item.price , item.quantity))
+ }else if(titleUploadData.value.calculateType===4){
+ item.grossArea = countArea(item)
+ item.computeGrossArea = item.grossArea
+ item.grossAmount=parseFloat(divideAuto(item.width * item.height* item.quantity*item.price,1000000,company.decValue))
}else{
item.grossArea = countArea(item)
item.computeGrossArea = item.grossArea
@@ -1338,7 +1469,7 @@
}
//琛ㄦ牸鍥炶溅锛屽湪琛ㄦ牸鏈�鍚庝竴琛屾坊鍔犱竴琛岀┖鏁版嵁
-const handleKeyDown = (evnt) =>{
+const handleKeyDown =async (evnt) =>{
//鍒ゆ柇琛ㄧず鏄惁涓虹瓫閫夌姸鎬�
if(xGrid.value.isFilter()){
return
@@ -1350,13 +1481,50 @@
}
if(evnt.$event.keyCode === 13 ){
const { rowIndex,row,column } = xGrid.value.getSelectedCell() || xGrid.value.getEditRecord()
- let nextRowIndex = xGrid.value.getRowIndex(row) + 1;
- if (nextRowIndex < xGrid.value.getTableData().fullData.length) {
+ let nextRowIndex = xGrid.value.getRowIndex(row) + 1
+
+
+ switch (column.field){
+ case 'width':
+ xGrid.value.setSelectCell(row, 'height')
+ break;
+ case 'height':
+ xGrid.value.setSelectCell(row, 'quantity')
+ break;
+ case 'quantity':
+ if(nextRowIndex === length){
+ await editClosedEvent({row,column})
+ xGrid.value.clearEdit()
+ let rowNext = row
+ delete rowNext._X_ROW_KEY
+ //xGrid.value.insertAt(rowNext, xGrid.value.getTableData.length || -1)
+ xGrid.value.insertAt({}, xGrid.value.getTableData.length || -1)
+ }
+ const nextRow = xGrid.value.getTableData().fullData[nextRowIndex]
+ xGrid.value.setCurrentRow(nextRow)
+ xGrid.value.scrollToRow(nextRow)
+ xGrid.value.setSelectCell(nextRow, 'width')
+ break;
+ default:
+ if(nextRowIndex === length){
+ xGrid.value.insertAt({}, xGrid.value.getTableData.length || -1)
+ }
+ const nextRow1 = xGrid.value.getTableData().fullData[nextRowIndex]
+ xGrid.value.setCurrentRow(nextRow1)
+ xGrid.value.scrollToRow(nextRow1)
+ xGrid.value.setSelectCell(nextRow1, column.field)
+ break;
+
+ }
+
+
+
+ /*if (nextRowIndex < xGrid.value.getTableData().fullData.length) {
xGrid.value.setCurrentRow(xGrid.value.getTableData().fullData[nextRowIndex]);
}
if(rowIndex === length-1){
xGrid.value.insertAt({}, xGrid.value.getTableData.length || -1)
- }
+ }*/
}
if(evnt.$event.keyCode === 38 ){
@@ -1381,6 +1549,27 @@
xGrid.value.clearSelected()
}
+//鍒囨崲浜у搧鐣岄潰
+const productFlag = ref(true)
+const changeProduct = (val)=>{
+ productFlag.value = val
+}
+const closeProductDialog = ()=>{
+ productFlag.value = true
+}
+//鏀瑰彉浜у搧椤甸潰鍒囨崲
+const changePage = () => {
+ productFlag.value = true
+}
+// 鍒涘缓瀹㈡埛鏄剧ず
+let createCustomerVisible = ref(false)
+
+//鍒涘缓瀹㈡埛鎴愬姛杩斿洖鏂规硶
+const createCustomerSuccess = async () => {
+ await initOrder(1)
+ createCustomerVisible.value = false
+}
+
</script>
<template>
@@ -1388,7 +1577,18 @@
<div class="order-primary" style="background-color: white">
<el-row>
<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-input v-model.trim="titleUploadData.project"/>-->
+ <el-select v-model.trim="titleUploadData.project"
+ @change="changeProject"
+ clearable placeholder=" " allow-create filterable >
+ <el-option v-for="item in projects"
+ :label="item.project"
+ :value="item"/>
+ </el-select>
+
+
+ </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"
@@ -1401,6 +1601,11 @@
:label="item.id+' '+item.customerName"
:value="item.id"
/>
+ <template #footer>
+ <el-button @click="createCustomerVisible=true" text bg size="small" >
+ {{$t('basicData.create')}}
+ </el-button>
+ </template>
</el-select>
</el-col>
<el-col :span="2"><el-text>*{{$t('order.orderType')}}锛�</el-text></el-col>
@@ -1466,6 +1671,7 @@
<el-option :value="1" :label="t('order.areaAmountPerPiece')"/>
<el-option :value="2" :label="t('order.areaAmountAge')"/>
<el-option :value="3" :label="t('order.quantityMount')"/>
+ <el-option :value="4" :label="t('order.allAmount')"/>
</el-select>
</el-col>
<el-col :span="2"><el-text>*{{$t('order.salesman')}}锛�</el-text></el-col>
@@ -1531,6 +1737,7 @@
<input type="text"
v-model="option.data"
@focus="inputFocus"
+ @keyup.enter.native="$panel.confirmFilter()"
@input="changeFilterEvent($event, option, $panel)"/>
</div>
</div>
@@ -1549,15 +1756,29 @@
</vxe-grid>
</div>
- <el-dialog v-model="dialogTableVisible" :title="$t('order.processingNote')" style="width: 60%;height:75% ">
+ <el-dialog v-model="dialogTableVisible" :draggable="true" :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 id="product" v-model="productVisible" style="width: 80%;height:75% ">
- <select-product :rowIndex="rowIndex" @getProductRow="getProductRow" style="width: 100%;height: 100%" />
+ <el-dialog id="product"
+ class="product1"
+ v-model="productVisible"
+ @closed="closeProductDialog"
+ style="width: 80%;height:75%; ">
+ <template #header >
+ <div class="my-header">
+ <el-button @click="changeProduct(true)">{{$t('basicData.search')}}</el-button>
+ <el-button @click="changeProduct(false)">{{$t('basicData.create')}}</el-button>
+ </div>
+ </template>
+ <select-product v-if="productFlag" :rowIndex="rowIndex" @getProductRow="getProductRow" style="width: 100%;height: 100%" />
+ <create-product v-else
+ :productFlag="productFlag"
+ @changePage="changePage"
+ style="text-align: left;background-color: #D5EAFF;"/>
</el-dialog>
<!--璇樊缁撶畻-->
<el-dialog v-model="errorAreaVisible" style="width: 300px;height:150px ">
@@ -1609,7 +1830,18 @@
@getParent="gaveOrderSizeCheck"
:orderId="titleUploadData.orderId"
:OrderDetail="xGrid"/>
+<!-- <create-customer/>-->
</el-dialog>
+ <!-- 瀹㈡埛鍒涘缓绐楀彛-->
+ <el-dialog
+ id="createCustomer"
+ :title="$t('customer.page.createCustomer')"
+ v-model="createCustomerVisible"
+ style="width: 700px;height:445px;text-align: left "
+ >
+ <create-customer :getOrderPage="'order'" @getOrderFunction="createCustomerSuccess" />
+ </el-dialog>
+
</div>
</template>
@@ -1623,7 +1855,7 @@
.el-col{
border: #181818 1px solid;
}
- :deep(.el-input__wrapper) {
+ :deep(.order-primary .el-input__wrapper) {
box-shadow: 0 0 0 0 var(--el-input-border-color, var(--el-border-color)) inset;
cursor: default;
border: none !important;
@@ -1649,9 +1881,13 @@
width: 100%;
}
- :deep(#sizeCheck .el-dialog__body){
+ :deep(#sizeCheck .el-dialog__body,#createCustomer .el-dialog__body){
height: 90%;
width: 100%;
}
-
+ .my-header {
+ display: flex;
+ /*flex-direction : row;
+ justify-content: space-between;*/
+ }
</style>
\ No newline at end of file
--
Gitblit v1.8.0