Merge branch 'master' of https://git.7in6.com/Minong/mes-admin-backend-ui

src/view/yunyin/shengchanguanli/components/addGongYi.vue

@@ -137,8 +137,9 @@
 
 <script setup>
 import {ref, reactive} from 'vue'
-import {gdzl_MachineList, PrintDetailList, WastageList,getDepartName, capacityList,ProcessDetailAdd,
-} from "@/api/yunyin/yunying";
+import {
+  gdzl_MachineList, PrintDetailList, WastageList, getDepartName, capacityList, ProcessDetailAdd, workOrderListDetail,
+} from '@/api/yunyin/yunying'
 import { ElMessage } from 'element-plus'
 
 const form = reactive({})
@@ -221,6 +222,7 @@ const open = async (gdbh, gxlist) => {
   initChejian(chejian.data['标准工艺'])
   yjList.value = res.data
   gxList.value = gxlist
+  console.log("打开了弹窗")
   visible.value = true
 }
 
@@ -375,8 +377,10 @@ const add_gdgyenterDialog = async () => {
   const ProcessDetailAdd_add = await ProcessDetailAdd(formattedData);
   console.log(ProcessDetailAdd_add)
   if (ProcessDetailAdd_add.code === 0) {
+    const workOrderListDetail_data = await workOrderListDetail({Gd_gdbh:id.value});
+    gytableData.value = workOrderListDetail_data.data.processList;
     ElMessage({type: 'success', message: '新增成功'})
-    add_gdgydialogFormVisible.value = false
+    visible.value = false
   } else {
     ElMessage({type: 'error',message: '新增失败'})
   }

src/view/yunyin/shengchanguanli/gongdanshengchan.vue

@@ -617,6 +617,7 @@ const treeData = ref([]);
 const workbenchdata = async () => {
   try {
     const data = await workbench();
+    console.log(data)
     const rawData = data.data;
     const dataArray =Object.keys(rawData).map(key => ({
       label: key,

src/view/yunyin/shengchanguanli/gongdanziliao.vue

@@ -2359,13 +2359,14 @@ const add_gdzlyjent = async (event,id1,id2,id3,idx) => {
 const add_gdgydialogFormVisible = ref(false)
 const add_gdgyformData = reactive({});
 //清空对象的属性值
-const gdgy_clearFormData = () => {
-  Object.keys(add_gdgyformData).forEach(key => {
-    add_gdgyformData[key] = '';
-  });
-};
-//新增工艺资料弹窗
+// const gdgy_clearFormData = () => {
+//   Object.keys(add_gdgyformData).forEach(key => {
+//     add_gdgyformData[key] = '';
+//   });
+// };
+//新增工艺资料弹窗//
 const addgdgy_onclick = () => {
+  console.log("点击了新增工艺资料按钮")
   if(_Gd_gdbh.value == null){
     cgugdlist.value = false;
     ElMessage({
@@ -2906,7 +2907,6 @@ const _ProductInformationEdit = async ()=>{
     return false;
   }
   let params = {}
-  // params.workorder = yycpzlformData['gdbh'];
   params.workorder = _Gd_gdbh.value;
   params.productCode = yycpzlformData['cpdh'];
   params.option = yycpzlformData['fangan'];
@@ -2914,6 +2914,8 @@ const _ProductInformationEdit = async ()=>{
   try {
     const ProductInformationEditdata = await WorkOrderDetailListCope(params);
     if (ProductInformationEditdata.code === 0) {
+      const workOrderListDetail_data = await workOrderListDetail({Gd_gdbh:_Gd_gdbh.value});
+      yjtableData.value = workOrderListDetail_data.data.printList;
       ElMessage({type: 'success', message: '更新成功'})
       onyycpzllist.value = false;
     }
@@ -2984,8 +2986,13 @@ const handleNodeClick = async (node) => {
 };
 //工单资料
 const _WorkList_page = async () => {
+  console.log(_Gd_khdh.value)
+  // if(_Gd_khdh.value === '' || _Gd_khdh.value === null){
+  //   _Gd_khdh.value = '';
+  // }
   try {
     const WorkListdata = await WorkList({Gd_khdh:_Gd_khdh.value,limit:pageSize.value,page:page.value});
+    console.log(WorkListdata)
     tableData.splice(0,tableData.length,...WorkListdata.data.data);//表格数据
     total.value =WorkListdata.data.total;//共多少条
   } catch (error) {
@@ -3064,6 +3071,7 @@ const _Gd_cpdh = ref(null)
 const _Gd_cpmc = ref(null)
 //工单印件、工艺、BOM详情
 const tableRowClick = async (row) => {
+  console.log(row.工单编号)
   _Gd_gdbh.value = row.工单编号;
   _Gd_cpdh.value = row.产品代号;
   _Gd_cpmc.value = row.产品名称;