修改Q2通知单的销售价格取值方式 HL-5882

src/views/qms/inspectionQ2/index.vue

@@ -142,10 +142,62 @@ const clearSearchInput = (formField) => {
         item.componentProps.options = []
       }
     })
+    if (basicFormRef.value.formRef.formModel.lightItemCode) {
+      basicFormRef.value.formRef.setValues({
+        lightQty: 0,
+        claimAmount: '',
+        otherClaimAmount: 0,
+        summaryAmount: 0,
+        disbursementAmount: 0,
+        remainingAmount: 0
+      })
+
+      const params2 = {
+        by: 'ASC',
+        filters: [
+          {
+            column: 'itemCode',
+            action: '==',
+            value: basicFormRef.value.formRef.formModel.lightItemCode
+          }
+        ],
+        pageNo: 1,
+        pageSize: 500,
+        sort: ''
+      }
+      params2.isSearch = true
+      SalepriceApi.getSalepricePage(params2).then((res) => {
+        if (res.list?.length > 0) {
+          priceObj.value = res.list[0]
+
+          basicFormRef.value.formRef.setValues({
+            standardCostPrice: priceObj.value.price
+          })
+        } else {
+          params2.isSearch = true
+          StdcostpriceApi.getStdcostpricePage(params2).then((res) => {
+            if (res.list?.length > 0) {
+              priceObj.value = res.list[0]
+
+              basicFormRef.value.formRef.setValues({
+                standardCostPrice: priceObj.value.price
+              })
+            } else {
+              basicFormRef.value.formRef.setValues({
+                standardCostPrice: 0
+              })
+            }
+          })
+        }
+      })
+    } else {
+      basicFormRef.value.formRef.setValues({
+        standardCostPrice: ''
+      })
+    }
   }
   if (formField == 'lightItemCode') {
     basicFormRef.value.formRef.setValues({
-      standardCostPrice: '',
       lightItemName: '',
       lightQty: 0,
       claimAmount: '',
@@ -154,47 +206,47 @@ const clearSearchInput = (formField) => {
       disbursementAmount: 0,
       remainingAmount: 0
     })
-    const params2 = {
+
-      by: 'ASC',
+    if (basicFormRef.value.formRef.formModel.itemCode) {
-      filters: [
+      const params2 = {
-        { column: 'itemCode', action: '==', value: basicFormRef.value.formRef.formModel.itemCode }
+        by: 'ASC',
-      ],
+        filters: [
-      pageNo: 1,
+          { column: 'itemCode', action: '==', value: basicFormRef.value.formRef.formModel.itemCode }
-      pageSize: 500,
+        ],
-      sort: ''
+        pageNo: 1,
-    }
+        pageSize: 500,
-    params2.isSearch = true
+        sort: ''
-    StdcostpriceApi.getStdcostpricePage(params2).then((res) => {
-      if (res.list?.length > 0) {
-        priceObj.value = res.list[0]
-        basicFormRef.value.formRef.setValues({
-          standardCostPrice: priceObj.value.price
-        })
       }
-    })
+      params2.isSearch = true
-    SalepriceApi.getSalepricePage(params2).then((res) => {
+      SalepriceApi.getSalepricePage(params2).then((res) => {
-      if (res.list?.length > 0) {
+        if (res.list?.length > 0) {
-        priceObj.value = res.list[0]
+          priceObj.value = res.list[0]
 
-        basicFormRef.value.formRef.setValues({
+          basicFormRef.value.formRef.setValues({
-          standardCostPrice: priceObj.value.price
+            standardCostPrice: priceObj.value.price
-        })
+          })
-      } else {
+        } else {
-        StdcostpriceApi.getStdcostpricePage(params2).then((res) => {
+          params2.isSearch = true
-          if (res.list?.length > 0) {
+          StdcostpriceApi.getStdcostpricePage(params2).then((res) => {
-            priceObj.value = res.list[0]
+            if (res.list?.length > 0) {
+              priceObj.value = res.list[0]
 
-            basicFormRef.value.formRef.setValues({
+              basicFormRef.value.formRef.setValues({
-              standardCostPrice: priceObj.value.price
+                standardCostPrice: priceObj.value.price
-            })
+              })
-          } else {
+            } else {
-            formRef.setValues({
+              basicFormRef.value.formRef.setValues({
-              standardCostPrice: 0
+                standardCostPrice: 0
-            })
+              })
-          }
+            }
-        })
+          })
-      }
+        }
-    })
+      })
+    } else {
+      basicFormRef.value.formRef.setValues({
+        standardCostPrice: ''
+      })
+    }
   }
 }
 // 查询页面返回
@@ -261,6 +313,7 @@ const searchTableSuccess = (formField, searchField, val, formRef) => {
             standardCostPrice: priceObj.value.price
           })
         } else {
+          params2.isSearch = true
           StdcostpriceApi.getStdcostpricePage(params2).then((res) => {
             if (res.list?.length > 0) {
               priceObj.value = res.list[0]
@@ -360,14 +413,16 @@ const searchTableSuccess = (formField, searchField, val, formRef) => {
           sort: ''
         }
         params2.isSearch = true
-
+        console.log(123)
         SalepriceApi.getSalepricePage(params2).then((res) => {
+          console.log(456)
           if (res.list?.length > 0) {
             priceObj.value = res.list[0]
             formRef.setValues({
               standardCostPrice: priceObj.value.price
             })
           } else {
+            params2.isSearch = true
             StdcostpriceApi.getStdcostpricePage(params2).then((res) => {
               if (res.list?.length > 0) {
                 priceObj.value = res.list[0]

src/views/qms/inspectionQ3/index.vue

@@ -106,6 +106,7 @@ import * as InspectionQ3MainApi from '@/api/qms/inspectionQ3/inspectionQ3Main'
 import * as InspectionQ3DetailApi from '@/api/qms/inspectionQ3/inspectionQ3Detail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import * as ProductionlineitemApi from '@/api/wms/productionlineitem'
+import * as ProductionlineApi from '@/api/wms/productionline'
 import * as StdcostpriceApi from '@/api/wms/stdcostprice'
 import { formatDate } from '@/utils/formatTime'
 import { async } from '@antv/x6/lib/registry/marker/async'
@@ -173,7 +174,7 @@ const setTableFormsValues = async (val, index1) => {
     newRow['uom'] = val[index1]['uom']
     newRow['qty'] = 0
     newRow.defectLocation = val[index1]['productionLineCode']
-    await ProductionlineitemApi.selectItemCodeToProductionLineCode(val[index1].itemCode).then(
+    await ProductionlineApi.getProductionlineNoPage({}).then(
       (res) => {
         console.log(res)
         if (res?.length > 0) {
@@ -419,7 +420,6 @@ const submitForm = async (formType, submitData) => {
         return;
       }
       let flag = false;
-      console.log(1111)
       data.subList.forEach((item) => {
           if(item.qty == 0){
             message.warning("数量不能为0")

src/views/qms/inspectionQ3/inspectionQ3.data.ts

@@ -485,16 +485,16 @@ export const InspectionQ3Detail = useCrudSchemas(
           filterable: true,
           options: [],
           optionsAlias: {
-            labelField: 'productionLineName',
+            labelField: 'name',
-            valueField: 'productionLineCode'
+            valueField: 'code'
           }
         }
       },
       tableForm: {
         type: 'Select',
         filterable: true,
-        valueField: 'productionLineName',
+        valueField: 'name',
-        labelField: 'productionLineCode'
+        labelField: 'code'
       }
     },
     {