Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into master_hella

src/api/wms/deliverRecordDetail/index.ts

@@ -73,4 +73,9 @@ export const exportDeliverRecordDetail = async (params) => {
 // 下载用户导入模板
 export const importTemplate = () => {
   return request.download({ url: '/wms/deliver-record-detail/get-import-template' })
+}
+
+// 查询发货记录子列表
+export const getDeliverRecordDetailListToRepeat = async (params) => {
+  return await request.get({ url: `/wms/deliver-record-detail/listToRepeat`, params })
 }

src/views/mes/process/process.data.ts

@@ -423,10 +423,10 @@ export const TabsList = [
     label: "模具",
     prop: 'PatternTab',
   },
-  {
+  // {
-    label: "物料",
+  //   label: "物料",
-    prop: 'ItembasicTab',
+  //   prop: 'ItembasicTab',
-  }
+  // }
 
 ]
 

src/views/mes/processroute/components/configDialog.vue

@@ -259,7 +259,7 @@ const deleteNode=(row)=>{
 
 const openDetail =  (row: any) => {
   rowData.value = row
-  console.log('rowData',rowData.value)
+  //console.log('rowData',rowData.value)
   titleNameRef.value = rowData.value.processName
   titleValueRef.value =rowData.value.processrouteCode
   processRouteId.value = rowData.value.id
@@ -498,33 +498,26 @@ const deleteAnnexSuccess = async () => {
 const handleCurrentChange=(value: number)=>{
       let index=(value-1)*page.value.size
       page.value.current=value
-      //console.log('index',index)
       showProcessNodeData.value=processData.value.slice(index,index+page.value.size)
-      //console.log('processData.value-472',processData.value)
+
-      //console.log('showProcessNodeData.value-472',showProcessNodeData.value)
 }
 const handlePrevClick=(value: number)=>{
       page.value.current=value-1
       if(page.value.current==0) {
         page.value.current=1
       }
-      // let index=(value-1)*page.value.size
+    
-      // showProcessNodeData.value=processData.value.slice(index,page.value.size)
-      // console.log('showProcessNodeData.value-472',showProcessNodeData.value)
 }
 const handleNextClick=(value: number)=>{
      page.value.current=value+1
      if(page.value.current>page.value.total/page.value.size) {
         page.value.current=page.value.total/page.value.size -1
       }
-      // let index=(value+1)*page.value.size
+
-      // showProcessNodeData.value=processData.value.slice(index,page.value.size)
-      // console.log('showProcessNodeData.value-472',showProcessNodeData.value)
 }
 const handleCurrentChangeM=(value: number)=>{
       let index=(value-1)*pageM.value.size
       pageM.value.current=value
-      //console.log('index',index)
       showMaterialsData.value=materialData.value.slice(index,index+pageM.value.size)
       
 }
@@ -533,18 +526,13 @@ const handlePrevClickM=(value: number)=>{
       if(pageM.value.current==0) {
         pageM.value.current=1
       }
-      // let index=(value-1)*page.value.size
+
-      // showProcessNodeData.value=processData.value.slice(index,page.value.size)
-      // console.log('showProcessNodeData.value-472',showProcessNodeData.value)
 }
 const handleNextClickM=(value: number)=>{
   pageM.value.current=value+1
      if(pageM.value.current>pageM.value.total/page.value.size) {
       pageM.value.current=page.value.total/pageM.value.size -1
       }
-      // let index=(value+1)*page.value.size
-      // showProcessNodeData.value=processData.value.slice(index,page.value.size)
-      // console.log('showProcessNodeData.value-472',showProcessNodeData.value)
 }       
 // 验证图形
 onUnmounted?.(() => {})

src/views/mes/workScheduling/index.vue

@@ -29,7 +29,7 @@
     >
       <template #schedulingCode="{row}">
         <el-button type="primary" link @click="openDetail(row, '工单详情', row.schedulingCode)">
-          <span>{{ row.planMasterCode }}</span>
+          <span>{{ row.schedulingCode }}</span>
         </el-button>
       </template>
       <template #action="{ row }">

src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts

@@ -552,9 +552,9 @@ export const CustomerreturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
 
 //表单校验
 export const CustomerreturnRequestMainRules = reactive({
-  // deliverRecordNumber: [
+  deliverRecordNumber: [
-  //   { required: true, message: '请选择发货记录单号', trigger: 'change' }
+    { required: true, message: '请选择发货记录单号', trigger: 'change' }
-  // ],
+  ],
   customerCode: [
     { required: true, message: '请选择客户代码', trigger: 'blur' }
   ],
@@ -1051,6 +1051,7 @@ export const CustomerreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       fixed: 'right'
     },
     isTableForm:false,
+    hiddenInMain:true
   }
 ]))
 

src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts

@@ -1072,6 +1072,7 @@ export const DeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150,
       fixed: 'right'
     },
+    hiddenInMain:true,
     isTableForm:false,
   }
 ]))

src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts

@@ -1028,7 +1028,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   },
   {
     label: '收货数量',
-    field: 'receivedQty',
+    field: 'qty',
     sort: 'custom',
     table: {
       width: 150

src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts

@@ -677,7 +677,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
   },
   {
     label: '收货数量',
-    field: 'receivedQty',
+    field: 'qty',
     sort: 'custom',
     table: {
       width: 150

src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue

@@ -210,7 +210,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
             tableData.value.forEach((item) => {
               item.batch = item.toBatch
 
-              item.packingNumber = ''
+              item.packingNumber = item.toPackingNumber
               item.containerNumber = item.toContainerNumber
               item.receiptQty = item.qty
               item.toLocationGroupCode = null

src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/sparereceiptJobMain.data.ts

@@ -1026,7 +1026,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   },
   {
     label: '收货数量',
-    field: 'receivedQty',
+    field: 'qty',
     sort: 'custom',
     table: {
       width: 150

src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRecordMain/sparereceiptRecordMain.data.ts

@@ -676,7 +676,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
   },
   {
     label: '收货数量',
-    field: 'receivedQty',
+    field: 'qty',
     sort: 'custom',
     table: {
       width: 150

src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/sparereceiptRequestMain.data.ts

@@ -803,7 +803,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
   },
   {
     label: '收货数量',
-    field: 'receivedQty',
+    field: 'qty',
     sort: 'custom',
     table: {
       width: 150