From de2c3068cdea54ffa36d2359b32abd9b8a144cde Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期一, 09 十二月 2024 14:49:47 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/pp/processCard/SelectDetailProcessCard.vue | 137 ++++++++++++++++++++++++++++++++++++---------
1 files changed, 109 insertions(+), 28 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectDetailProcessCard.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectDetailProcessCard.vue
index 6db7477..884f4b5 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectDetailProcessCard.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectDetailProcessCard.vue
@@ -2,7 +2,7 @@
import request from "@/utils/request"
import deepClone from "@/utils/deepClone"
-import {ElDatePicker, ElMessage} from "element-plus"
+import {ElDatePicker, ElMessage, ElMessageBox} from "element-plus"
import useProductGlassTypeStore from "@/stores/sd/product/productGlassType"
import footSum from "@/hook/footSum"
import {nextTick, onMounted, onUnmounted, reactive, ref, watch} from "vue"
@@ -14,6 +14,8 @@
import {VXETable} from "vxe-table";
import useUserInfoStore from '@/stores/userInfo'
import {useI18n} from "vue-i18n";
+import UpdateOrderCraft from "@/components/sd/order/UpdateOrderCraft.vue";
+import {filterChanged} from "@/hook";
let productGlassTypeStore = useProductGlassTypeStore()
const { t } = useI18n()
const userStore = useUserInfoStore()
@@ -62,8 +64,57 @@
let pageNum=ref(1)
let pageState = null
+let craftVisible = ref(false)
+
+const craftObj = reactive({
+ newCraft: [],
+ oldCraft: [],
+})
+
+const numberList = reactive({
+ technologyNumber:[],
+})
+
+const saveCraft = () => {
+ //rowIndex.value.process = craftObj.newCraft.join('->')
+ let orderProcess= craftObj.newCraft.join('->')
+ request.post(`/processCard/updateProcess/${rowIndex.value.process_id}/${rowIndex.value.technology_number}/${rowIndex.value.order_id}/${orderProcess}`, craftObj).then((res) => {
+ if (res.code == 200 && res.data === true) {
+ ElMessage.success(t('basicData.msg.saveSuccess'))
+ router.push({
+ path: '/main/processCard/SelectDetailProcessCard',
+ query: {processId: processId,random: Math.random()}
+ })
+ } else {
+
+ ElMessage.warning('淇濆瓨澶辫触锛屾鏌ユ槸鍚︽姤宸�')
+
+ }
+ })
+ craftVisible.value= false
+}
+let process = ref([])
+request.get(`/basicData/BasicDataByType/product/process`).then((res) =>{
+ if (res.code==200){
+ process.value=res.data
+ }
+})
+
+let rowIndex = ref({})
+const updateCraft = (row) => {
+ craftVisible.value= true
+ Object.keys(craftObj).forEach((key) =>{
+ craftObj[key] = row['process'].split('->')
+ })
+ Object.keys(numberList).forEach((key) =>{
+ numberList[key] = row['concatNumber'].split(',')
+ })
+ craftObj.technologyNumber=[]
+ craftObj.technologyNumber.push(...numberList.technologyNumber);
+ rowIndex.value = row
+}
//绗竴娆″姞杞�
const {currentRoute} = useRouter()
@@ -136,24 +187,29 @@
},//琛ㄥご鍙傛暟
columns:[
{type:'expand',fixed:"left",slots: { content:'content' },width: 50},
+ {title: t('basicData.operate'), width: 100, slots: { default: 'button_slot' },fixed:"left",},
{ type: 'seq',fixed:"left", title: t('basicData.Number'), width: 50 },
- {field: 'order_id', title: t('order.orderId'),filters:[{ data: '' }],slots: { filter: 'num1_filter' },width: 80 },
+ {field: 'order_id', title: t('order.orderId'),filters:[{ data: '' }],slots: { filter: 'num1_filter' },width: 110 },
{field: 'process_id', width: 140, title: t('processCard.processId') ,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
- {field: 'order_number', title: t('order.OrderNum') ,filters:[{ data: '' }],slots: { filter: 'num1_filter' },},
- {field: 'technology_number', title: t('processCard.technologyNumber') ,filters:[{ data: '' }],slots: { filter: 'num1_filter' },},
+ {field: 'order_number', title: t('order.OrderNum') ,filters:[{ data: '' }],slots: { filter: 'num1_filter' },width: 100},
+ {field: 'technology_number', title: t('processCard.technologyNumber') ,filters:[{ data: '' }],slots: { filter: 'num1_filter' },width: 100},
{field: 'quantity', title: t('order.quantity'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, width: 80},
- {field: 'child_width', title: t('order.width'), },
- {field: 'child_height', title: t('order.height'), },
- {field: 'area', title: t('order.area') ,showOverflow:"ellipsis"},
- {field: 'product_name', title: t('order.product'), },
- {field: 'glass_child', title: t('reportingWorks.glassChild'), },
- {field: 'founder', title: t('processCard.founder'), },
- {field: 'splitFrame_time', title: t('processCard.splitFrameTime'), },
+ {field: 'child_width', title: t('order.width'),width: 80 },
+ {field: 'child_height', title: t('order.height'),width: 80 },
+ {field: 'area', title: t('order.area') ,showOverflow:"ellipsis",width: 70},
+ {field: 'process',width:250, title: t('craft.process'),filters:[{ data: '' }],slots: { filter: 'num1_filter' },},
+ {field: 'product_name', title: t('order.product'),width: 310 },
+ {field: 'glass_child', title: t('reportingWorks.glassChild'),width: 200 },
+ {field: 'founder', title: t('processCard.founder'),width: 110 },
+ {field: 'splitFrame_time', title: t('processCard.splitFrameTime'),width: 110 },
+ {field: 'concatNumber', title: '鎬诲簭鍙�',width: 110},
+
],//琛ㄥご鎸夐挳
toolbarConfig: {
buttons: [
- {'code': 'add', 'name': "鍚堝苟",status: 'primary'}
+ {'code': 'add', 'name': t('processCard.merge'),status: 'primary'},
+
],
import: false,
// export: true,
@@ -208,18 +264,32 @@
flowCard: selectRecords
})
- request.post("/processCard/mergeFlowCard", flowData.value).then((res) => {
- if(res.code==200 && res.data==="true"){
- ElMessage.success(t('basicData.msg.saveSuccess'))
- router.push({path: '/main/processCard/SelectProcessCard', query:{random:Math.random()}})
- }else{
- ElMessage.warning(t('basicData.msg.saveFail'))
- }
- }).catch((err)=>{
- ElMessage.error(t('basicData.msg.ServerConnectionError'))
- router.push("/login")
+ ElMessageBox.confirm(
+ "鏄惁鍚堝苟锛�",
+ {
+ confirmButtonText: t('basicData.confirmButtonText'),
+ cancelButtonText: t('basicData.cancelButtonText'),
+ distinguishCancelAndClose: true,
+ type: 'warning',
+ }
+ ).then(()=>{
+ request.post("/processCard/mergeFlowCard", flowData.value).then((res) => {
+ if(res.code==200 && res.data==="true"){
+ ElMessage.success(t('basicData.msg.saveSuccess'))
+ router.push({path: '/main/processCard/SelectProcessCard', query:{random:Math.random()}})
+ }else{
+ ElMessage.warning(t('basicData.msg.saveFail'))
+ }
+ }).catch((err)=>{
+ ElMessage.error(t('basicData.msg.ServerConnectionError'))
+ router.push("/login")
+ })
+
})
break
+
+
+
}
}
}
@@ -258,16 +328,27 @@
<!--宸﹁竟鍥哄畾鏄剧ず鐨勬彃妲�-->
- <template #num1_filter="{ column, $panel }">
- <div>
- <div v-for="(option, index) in column.filters" :key="index">
- <input type="type" v-model="option.data" @input="changeFilterEvent($event, option, $panel)"/>
- </div>
- </div>
+ <!--宸﹁竟鍥哄畾鏄剧ず鐨勬彃妲�-->
+ <template #button_slot="{ row }">
+ <el-button @click="updateCraft(row)" link type="primary" size="small">{{$t('craft.updateCraft')}}</el-button>
</template>
</vxe-grid>
+
+ <el-dialog id="processChange"
+ v-model="craftVisible"
+ :title="$t('craft.technologicalProcess')"
+ :close-on-click-modal="false"
+ :close-on-press-escape="false"
+ style="width: 60%;height:60% ;position: relative;" >
+
+ <update-order-craft
+ :craftObj="craftObj"
+ :process="process"
+ @saveCraft="saveCraft"
+ />
+ </el-dialog>
</div>
</template>
--
Gitblit v1.8.0