BUG修改

src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue

@@ -87,16 +87,13 @@
           available: 'TRUE',
           // poLine: row['lineNumber'],
         }).then(res => {
-          // if (formField == 'poLine') {
+          if (formField == 'poLine') {
-          //   row['itemCode'] = res.list[0].itemCode
+            row['itemCode'] = res.list[0].itemCode
-          //   row['uom'] = res.list[0].uom
+            row['uom'] = res.list[0].uom
-          // }
+            row['orderQty'] = res.list[0].orderQty
-          if (res) tableData.value = res.list;
+            row['planQty'] = res.list[0].orderQty-res.list[0].plannedQty
-          tableData.value.forEach(item => {
+            row['available'] = res.list[0].available
-            item.poNumber = item.number
+          }
-            item.poLine = item.lineNumber
-            item.planQty =item.orderQty-item.plannedQty
-          })
         })
       } else {
         const setV = {}
@@ -178,7 +175,7 @@
   // 列表-操作按钮
   const butttondata = (row) => {
     return [
-      defaultButtons.mainListPurchasePlanOpeBtn({ hide: isShowMainButton(row, ['5']) }), // 打开
+      defaultButtons.mainListPurchasePlanOpeBtn({ hide: isShowMainButton(row, ['2']) }), // 打开
       defaultButtons.mainListPurchasePlanCloBtn({ hide: isShowMainButton(row, ['1']) }), // 关闭
       defaultButtons.mainListPurchasePlanPubBtn({ hide: isShowMainButton(row, ['1']) }), // 发布
       defaultButtons.mainListPurchasePlanAccBtn({ hide: isShowMainButton(row, ['3']) }), // 接受

src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts

@@ -306,12 +306,28 @@ export const PurchasePlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
     form: {
+      // labelMessage: '信息提示说明！！！',
       componentProps: {
-        disabled: true
+        isSearchList: true,
+        searchListPlaceholder: '请选择订单行',
+        searchField: 'lineNumber',
+        searchTitle: '采购订单信息',
+        searchAllSchemas: PurchaseDetail.allSchemas,
+        searchPage: PurchaseDetailApi.getPurchaseDetailPage,
       }
     },
     tableForm: {
-      disabled: true
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择订单行',
+      searchField: 'lineNumber',
+      searchTitle: '采购订单信息',
+      searchAllSchemas: PurchaseDetail.allSchemas,
+      searchPage: PurchaseDetailApi.getPurchaseDetailPage,
+      searchCondition: [ {
+        key: 'number',
+        value: 'poNumber',
+        isMainValue: true
+      }]
     }
   },
   {
@@ -362,23 +378,22 @@ export const PurchasePlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
     }
 
   },
-
+  // {
-  {
+  //   label: '已计划数量',
-    label: '已计划数量',
+  //   field: 'plannedQty',
-    field: 'plannedQty',
+  //   sort: 'custom',
-    sort: 'custom',
+  //   table: {
-    table: {
+  //     width: 150
-      width: 150
+  //   },
-    },
+  //   form: {
-    form: {
+  //     componentProps: {
-      componentProps: {
+  //       disabled: true
-        disabled: true
+  //     }
-      }
+  //   },
-    },
+  //   tableForm: {
-    tableForm: {
+  //     disabled: true
-      disabled: true
+  //   }
-    }
+  // },
-  },
   {
     label: '已发货数量',
     field: 'shippedQty',

src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue

@@ -21,8 +21,8 @@
           <span>{{ row.number }}</span>
         </el-button>
       </template>
-      <template #action="{ row }" >
+      <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event, row)"/>
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event, row)" />
       </template>
     </Table>
   </ContentWrap>
@@ -103,23 +103,14 @@
       if (type == 'tableForm') {
         // 明细查询页赋值
         row[formField] = val[0][searchField]
+        if (formField == 'poNumber') {
+          row['itemCode'] = val[0]['itemCode']
+          row['poLine'] = val[0]['poLine']
+          row['uom'] = val[0]['uom']
+        }
       } else {
         const setV = {}
         setV[formField] = val[0][searchField]
-       
-       if(formField=='ppNumber'){
-         // 获取子表数据 getBomDisassemble
-       PurchasePlanDetailApi.getPurchasePlanDetailList({
-         number: val[0]['number']}).then(res => {
-           if (res) tableData.value = res;
-           tableData.value.forEach(item=>{
-             item.batch = item.toBatch
-             item.qty = 1
-           })
-         }).catch(err => {
-            console.log(err)
-          })
-       }
         formRef.setValues(setV)
       }
     })
@@ -189,7 +180,7 @@
   const butttondata = (row) => {
     return [
       defaultButtons.mainListPurchasePlanOpeBtn({ hide: isShowMainButton(row, ['5']) }), // 打开
-      defaultButtons.mainListPurchasePlanCloBtn({ hide: isShowMainButton(row, ['1', '2',  '4']) }), // 关闭
+      defaultButtons.mainListPurchasePlanCloBtn({ hide: isShowMainButton(row, ['1', '2', '4']) }), // 关闭
       defaultButtons.mainListPlanSubBtn({ hide: isShowMainButton(row, ['1']) }), // 提交审批
       defaultButtons.mainListPlanAppBtn({ hide: isShowMainButton(row, ['2']) }), // 审批通过
       defaultButtons.mainListPlanTurBtn({ hide: isShowMainButton(row, ['2']) }), // 驳回按钮
@@ -205,8 +196,8 @@
         hasPermi: '',
         link: true, // 文本展现按钮
       },
-      defaultButtons.mainListPointBtn(null), // 标签打印
+      defaultButtons.mainListPointBtn({ hide: isShowMainButton(row, ['3']) }), // 标签打印
-      defaultButtons.mainListDocumentPrintBtn(null), // 单据打印
+      defaultButtons.mainListDocumentPrintBtn({ hide: isShowMainButton(row, ['3']) }), // 单据打印
       // 生成记录
       {
         label: '处理',
@@ -233,9 +224,9 @@
       handleApp(row.id)
     } else if (val == 'mainPlanTur') { // 驳回按钮
       handleTur(row.id)
-    }else if (val == 'genRecords') { // 处理
+    } else if (val == 'genRecords') { // 处理
       genRecords(row.id)
-    }else if (val == 'edit') { // 编辑
+    } else if (val == 'edit') { // 编辑
       openForm('update', row)
     } else if (val == 'delete') { // 删除
       handleDelete(row.id)
@@ -247,15 +238,15 @@
       handleDocumentPrint(row.id)
     }
   }
-  
+
   /** 详情操作 */
   const detailRef = ref()
   const openDetail = (row : any, titleName : any, titleValue : any) => {
     detailRef.value.openDetail(row, titleName, titleValue)
   }
   //添加/修改操作
-   const formRef = ref()
+  const formRef = ref()
-  const openForm = async (type: string, row?: number) => {
+  const openForm = async (type : string, row ?: number) => {
     tableData.value = [] // 重置明细数据
     formRef.value.open(type, row)
   }
@@ -337,7 +328,7 @@
       await getList()
     } catch { }
   }
-  
+
   /** 处理按钮操作 */
   const genRecords = async (id : number) => {
     try {
@@ -394,7 +385,7 @@
 
   const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL
   const src = ref(BASE_URL + '/jmreport/view/897700407827668992?token=' + getAccessToken())
-  
+
   const genLabelId = ref();
   // 生成标签
   const pointRef = ref()
@@ -404,7 +395,7 @@
   }
   // 标签打印
   const labelPrint = async (row) => {
-    window.open(src.value+'&asn_number='+row.asnNumber)
+    window.open(src.value + '&asn_number=' + row.asnNumber)
   }
 
   const print = async () => {

src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts

@@ -6,11 +6,13 @@ const { t } = useI18n() // 国际化
 import * as getRequestsettingApi from '@/api/wms/requestsetting/index'
 import * as ItembasicApi from '@/api/wms/itembasic'
 import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data'
-import { PurchasePlanMain } from '../purchasePlanMain/purchasePlanMain.data'
+// import { PurchasePlanMain } from '../purchasePlanMain/purchasePlanMain.data'
 import * as PurchasePlanMainApi from '@/api/wms/purchasePlanMain'
+import * as PurchasePlanDetailApi from '@/api/wms/purchasePlanDetail'
 import * as PurchaseMainApi from '@/api/wms/purchaseMain'
 import * as PurchaseDetailApi from '@/api/wms/purchaseDetail'
 import { PurchaseDetail, PurchaseMain } from '../purchaseMain/purchaseMain.data'
+import { PurchasePlanDetail, PurchasePlanMain } from '../purchasePlanMain/purchasePlanMain.data'
 
 // 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
 const queryParams = {
@@ -509,22 +511,6 @@ export const SupplierdeliverRequestMainRules = reactive({
  * @returns {Array} 供应商发货申请子表
  */
 export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
-  // {
-  //   label: '包装号',
-  //   field: 'packingNumber',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  // },
-  // {
-  //   label: '器具号',
-  //   field: 'containerNumber',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  // },
   {
     label: '批次',
     field: 'batch',
@@ -634,20 +620,27 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
         isSearchList: true,
         searchListPlaceholder: '请选择订单号',
         searchField: 'number',
-        searchTitle: '采购订单信息',
+        searchTitle: '要货计划信息',
-        searchAllSchemas: PurchaseMain.allSchemas,
+        searchAllSchemas: PurchasePlanDetail.allSchemas,
-        searchPage: PurchaseMainApi.getPurchaseMainPage
+        searchPage: PurchasePlanDetailApi.getPurchasePlanDetailPage
       }
     },
     tableForm: {
       isInpuFocusShow: true,
       searchListPlaceholder: '请选择订单号',
       searchField: 'number',
-      searchTitle: '采购订单信息',
+      searchTitle: '要货计划信息',
-      searchAllSchemas: PurchaseMain.allSchemas,
+      searchAllSchemas: PurchasePlanDetail.allSchemas,
-      searchPage: PurchaseMainApi.getPurchaseMainPage
+      searchPage: PurchasePlanDetailApi.getPurchasePlanDetailPage,
+      searchCondition: [
+        {
+          key: 'number',
+          value: 'ppNumber',
+          isMainValue: true
+        }]
     }
   },
+
   {
     label: '订单行',
     field: 'poLine',
@@ -656,23 +649,12 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       width: 150
     },
     form: {
-      // labelMessage: '信息提示说明！！！',
       componentProps: {
-        isSearchList: true,
+        disabled: true
-        searchListPlaceholder: '请选择订单行',
-        searchField: 'lineNumber',
-        searchTitle: '采购订单信息',
-        searchAllSchemas: PurchaseDetail.allSchemas,
-        searchPage: PurchaseDetailApi.getPurchaseDetailPage
       }
     },
     tableForm: {
-      isInpuFocusShow: true,
+      disabled: true
-      searchListPlaceholder: '请选择订单行',
-      searchField: 'lineNumber',
-      searchTitle: '采购订单信息',
-      searchAllSchemas: PurchaseDetail.allSchemas,
-      searchPage: PurchaseDetailApi.getPurchaseDetailPage
     }
   },
   {
@@ -785,6 +767,7 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       }
     }
   },
+
   {
     label: '物品代码',
     field: 'itemCode',
@@ -793,25 +776,15 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       width: 150
     },
     form: {
-      // labelMessage: '信息提示说明！！！',
       componentProps: {
-        isSearchList: true,
+        disabled: true
-        searchListPlaceholder: '请选择物品代码',
-        searchField: 'code',
-        searchTitle: '物品基础信息',
-        searchAllSchemas: Itembasic.allSchemas,
-        searchPage: ItembasicApi.getItembasicPage
       }
     },
     tableForm: {
-      isInpuFocusShow: true,
+      disabled: true
-      searchListPlaceholder: '请选择物品代码',
-      searchField: 'code',
-      searchTitle: '物品基础信息',
-      searchAllSchemas: Itembasic.allSchemas,
-      searchPage: ItembasicApi.getItembasicPage
     }
   },
+
   {
     label: '备注',
     field: 'remark',
@@ -893,15 +866,21 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
   {
     label: '计量单位',
     field: 'uom',
+    sort: 'custom',
     dictType: DICT_TYPE.UOM,
     dictClass: 'string',
+    isSearch: true,
     isTable: true,
-    sort: 'custom',
     table: {
       width: 150
     },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    },
     tableForm: {
-      type: 'Select'
+      disabled: true
     }
   },
   {
@@ -986,7 +965,7 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     isDetail: false,
     isForm: false,
     table: {
-      width: 150,
+      width: 180,
       fixed: 'right'
     },
     isTableForm: false,
@@ -1025,4 +1004,4 @@ export const SupplierdeliverRequestDetailRules = reactive({
   itemCode: [
     { required: true, message: '请选择物品代码', trigger: 'change' }
   ],
-})
+})

src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts

@@ -1,7 +1,9 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter } from '@/utils/formatTime'
 const { t } = useI18n() // 国际化
+const recordTypeList = [{ label:'收货单号', value:'1' },{ label:'退货单号', value:'2' },{ label:'索赔单号', value:'3' }]
 import * as getRequestsettingApi  from '@/api/wms/requestsetting/index'
+import * as supplierinvoiceRequestMainApi from '@/api/wms/supplierinvoiceRequestMain'
 
 // 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
 const queryParams = {
@@ -323,9 +325,43 @@ export const SupplierinvoiceRequestMainRules = reactive({
  */
 export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: '收货单号',
+    label: '单号类型',
-    field: 'recordNumber'
+    field: 'recordType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      type: 'Select',
+      initOptions: recordTypeList,
+    },
   },
+ {
+   label: '单号',
+   field: 'requesNumber',
+   sort: 'custom',
+   table: {
+     width: 150
+   },
+   tableForm: {
+     isInpuFocusShow: true,
+     searchListPlaceholder: '请选择单号',
+     searchField: 'number',
+     searchTitle: '单号信息',
+     searchAllSchemas: SupplierinvoiceRequestMain.allSchemas,
+     searchPage: supplierinvoiceRequestMainApi.getNumber,
+     searchCondition: [{
+       key: 'supplierCode',
+       value: 'supplierCode',
+       isMainValue: true
+     },
+     {
+       key: 'recordType',
+       value: 'recordType',
+       isMainValue: true
+     }]
+   }
+ },
   {
     label: '货主代码',
     field: 'ownerCode'
@@ -477,4 +513,4 @@ export const SupplierinvoiceRequestDetailRules = reactive({
   itemCode: [
     { required: true, message: '请输入物品代码', trigger: 'blur' }
   ],
-})
+})