buikd

dist/assets/ChildGoodEditModal.7967d3.js

@@ -1 +1 @@
-import{_ as B,d as _,a_ as C,w as x,z as V,r as y,o as i,G as d,C as n,l as a,a as h,h as s,j as r,aO as b,M as w,ah as D,a$ as k}from"./index.js";import{g as E}from"./columns.1182f372.js";import{B as M}from"./basic-descriptions.963d3d7f.js";import"./status.0f771e9a.js";import"./tootip.a84a1bff.js";const F={class:"flex justify-between mt-[10px]"},N={class:"flex items-center"},g=_({__name:"ChildGoodEditModal",props:{visible:{type:Boolean,required:!0},index:{type:null,required:!0},data:{type:null,required:!0}},emits:["submit"],setup(m,{emit:p}){const t=m,c=p,o=C(t,"visible"),l=x(0);V(()=>o.value,()=>{!o.value||(l.value=t.data.child_num)});function f(){c("submit",t.index,{...t.data,child_num:l.value}),o.value=!1}return(G,e)=>{const v=y("ElButton");return i(),d(a(k),{modelValue:a(o),"onUpdate:modelValue":e[1]||(e[1]=u=>D(o)?o.value=u:null),title:"\u7F16\u8F91\u5B50\u5546\u54C1",center:""},{default:n(()=>[t.data?(i(),d(a(M),{key:0,style:{overflow:"hidden"},data:t.data,columns:a(E)},null,8,["data","columns"])):h("v-if",!0),s("div",F,[s("div",N,[e[2]||(e[2]=s("p",{style:{width:"110px"}},"\u5B50\u5546\u54C1\u6BD4\u4F8B:",-1)),r(a(b),{modelValue:l.value,"onUpdate:modelValue":e[0]||(e[0]=u=>l.value=u),placeholder:"\u5B50\u5546\u54C1\u6BD4\u4F8B"},null,8,["modelValue"])]),r(v,{type:"primary",onClick:f},{default:n(()=>e[3]||(e[3]=[w("\u4FDD\u5B58")])),_:1})])]),_:1},8,["modelValue"])}}});var z=B(g,[["__file","C:/Users/89793/Desktop/projects/ticket-system/src/views/invoiceInOut/productManager/components/ChildGoodEditModal.vue"]]);export{z as default};
+import{_ as B,d as _,a_ as C,w as x,z as V,r as y,o as i,G as d,C as n,l as a,a as h,h as s,j as r,aO as b,M as w,ah as D,a$ as k}from"./index.js";import{g as E}from"./columns.5d764429.js";import{B as M}from"./basic-descriptions.a391601a.js";import"./status.0f771e9a.js";import"./tootip.82efc6cd.js";const F={class:"flex justify-between mt-[10px]"},N={class:"flex items-center"},g=_({__name:"ChildGoodEditModal",props:{visible:{type:Boolean,required:!0},index:{type:null,required:!0},data:{type:null,required:!0}},emits:["submit"],setup(m,{emit:p}){const t=m,c=p,o=C(t,"visible"),l=x(0);V(()=>o.value,()=>{!o.value||(l.value=t.data.child_num)});function f(){c("submit",t.index,{...t.data,child_num:l.value}),o.value=!1}return(G,e)=>{const v=y("ElButton");return i(),d(a(k),{modelValue:a(o),"onUpdate:modelValue":e[1]||(e[1]=u=>D(o)?o.value=u:null),title:"\u7F16\u8F91\u5B50\u5546\u54C1",center:""},{default:n(()=>[t.data?(i(),d(a(M),{key:0,style:{overflow:"hidden"},data:t.data,columns:a(E)},null,8,["data","columns"])):h("v-if",!0),s("div",F,[s("div",N,[e[2]||(e[2]=s("p",{style:{width:"110px"}},"\u5B50\u5546\u54C1\u6BD4\u4F8B:",-1)),r(a(b),{modelValue:l.value,"onUpdate:modelValue":e[0]||(e[0]=u=>l.value=u),placeholder:"\u5B50\u5546\u54C1\u6BD4\u4F8B"},null,8,["modelValue"])]),r(v,{type:"primary",onClick:f},{default:n(()=>e[3]||(e[3]=[w("\u4FDD\u5B58")])),_:1})])]),_:1},8,["modelValue"])}}});var z=B(g,[["__file","C:/Users/89793/Desktop/projects/ticket-system/src/views/invoiceInOut/productManager/components/ChildGoodEditModal.vue"]]);export{z as default};

dist/assets/InvoiceTitle.77bebe.js

@@ -1 +1 @@
-import{_ as s,d as _,o as l,G as d,l as r,a as u}from"./index.js";import{B as v}from"./basic-descriptions.963d3d7f.js";const y=o=>{const{company_address:e,mobile:i,registercode:n,bank_name:c,bankNo:t,name:a}=o;return{invoice_addr:e,invoice_mobile:i,invoice_code:n,invoice_bank:c,invoice_bankNo:t,invoice_title:a}},g=o=>{const{invoice_addr:e,invoice_mobile:i,invoice_code:n,invoice_bank:c,invoice_bankNo:t,invoice_title:a}=o;return{invoice_code:n,invoice_title:a,addrAndmobile:e+" "+i,bankAndBankNo:c+" "+t}},B=o=>{const{invoice_addr:e,invoice_mobile:i,company_license:n,invoice_bank:c,invoice_bankNo:t,invoice_title:a}=o;return{invoice_code:n,invoice_title:a,addrAndmobile:e+" "+i,bankAndBankNo:c+" "+t}},b=[{label:"\u62AC\u5934",span:24,field:"invoice_title"},{label:"\u7EB3\u7A0E\u4EBA\u8BC6\u522B\u53F7",span:24,field:"invoice_code"}],I=()=>({buyer_code:"",buyer_name:"",seller_code:"",seller_name:"",good_source:"1",good_code:"",good_type:"",is_combind:"0",inv_good_name:"",subunit_price:"",basic_status:"",unit_price:"",goodName:"",skuCode:"",cat_code:"",inv_type:"",cat_tax:"",spec:"",unit:"",unit_weight:"",spectral:"",childArr:[]}),m=_({__name:"InvoiceTitle",props:{detail:{type:Object,required:!0}},setup(o){return(e,i)=>Object.keys(e.detail).length!==0?(l(),d(r(v),{key:0,"px-8":"","pb-5":"",data:e.detail,columns:r(b),"col-number":1,"label-width":"130"},null,8,["data","columns"])):u("v-if",!0)}});var p=s(m,[["__file","C:/Users/89793/Desktop/projects/ticket-system/src/views/invoiceInOut/productManager/components/InvoiceTitle.vue"]]),A=Object.freeze(Object.defineProperty({__proto__:null,default:p},Symbol.toStringTag,{value:"Module"}));export{p as I,g as a,B as b,I as c,y as d,A as e};
+import{_ as s,d as _,o as l,G as d,l as r,a as u}from"./index.js";import{B as v}from"./basic-descriptions.a391601a.js";const y=o=>{const{company_address:e,mobile:i,registercode:n,bank_name:c,bankNo:t,name:a}=o;return{invoice_addr:e,invoice_mobile:i,invoice_code:n,invoice_bank:c,invoice_bankNo:t,invoice_title:a}},g=o=>{const{invoice_addr:e,invoice_mobile:i,invoice_code:n,invoice_bank:c,invoice_bankNo:t,invoice_title:a}=o;return{invoice_code:n,invoice_title:a,addrAndmobile:e+" "+i,bankAndBankNo:c+" "+t}},B=o=>{const{invoice_addr:e,invoice_mobile:i,company_license:n,invoice_bank:c,invoice_bankNo:t,invoice_title:a}=o;return{invoice_code:n,invoice_title:a,addrAndmobile:e+" "+i,bankAndBankNo:c+" "+t}},b=[{label:"\u62AC\u5934",span:24,field:"invoice_title"},{label:"\u7EB3\u7A0E\u4EBA\u8BC6\u522B\u53F7",span:24,field:"invoice_code"}],I=()=>({buyer_code:"",buyer_name:"",seller_code:"",seller_name:"",good_source:"1",good_code:"",good_type:"",is_combind:"0",inv_good_name:"",subunit_price:"",basic_status:"",unit_price:"",goodName:"",skuCode:"",cat_code:"",inv_type:"",cat_tax:"",spec:"",unit:"",unit_weight:"",spectral:"",childArr:[]}),m=_({__name:"InvoiceTitle",props:{detail:{type:Object,required:!0}},setup(o){return(e,i)=>Object.keys(e.detail).length!==0?(l(),d(r(v),{key:0,"px-8":"","pb-5":"",data:e.detail,columns:r(b),"col-number":1,"label-width":"130"},null,8,["data","columns"])):u("v-if",!0)}});var p=s(m,[["__file","C:/Users/89793/Desktop/projects/ticket-system/src/views/invoiceInOut/productManager/components/InvoiceTitle.vue"]]),A=Object.freeze(Object.defineProperty({__proto__:null,default:p},Symbol.toStringTag,{value:"Module"}));export{p as I,g as a,B as b,I as c,y as d,A as e};

dist/assets/InvoiceTitle.7eecae.js

@@ -1 +1 @@
-import{_ as o,d as s,o as i,G as n,l as t,a as r}from"./index.js";import{i as a}from"./shared.80186348.js";import{B as c}from"./basic-descriptions.963d3d7f.js";const l=s({__name:"InvoiceTitle",props:{detail:{type:Object,required:!0}},setup(p){return(e,m)=>Object.keys(e.detail).length!==0?(i(),n(t(c),{key:0,"px-8":"","pb-5":"",data:e.detail,columns:t(a),"col-number":1,"label-width":"130"},null,8,["data","columns"])):r("v-if",!0)}});var f=o(l,[["__file","C:/Users/89793/Desktop/projects/ticket-system/src/views/invoiceInOut/inventoryCheck/components/InvoiceTitle.vue"]]);export{f as default};
+import{_ as o,d as s,o as i,G as n,l as t,a as r}from"./index.js";import{i as a}from"./shared.80186348.js";import{B as c}from"./basic-descriptions.a391601a.js";const l=s({__name:"InvoiceTitle",props:{detail:{type:Object,required:!0}},setup(p){return(e,m)=>Object.keys(e.detail).length!==0?(i(),n(t(c),{key:0,"px-8":"","pb-5":"",data:e.detail,columns:t(a),"col-number":1,"label-width":"130"},null,8,["data","columns"])):r("v-if",!0)}});var f=o(l,[["__file","C:/Users/89793/Desktop/projects/ticket-system/src/views/invoiceInOut/inventoryCheck/components/InvoiceTitle.vue"]]);export{f as default};

dist/assets/detail.48dab8.js

@@ -1 +1 @@
-import{_ as p,d as n,aY as m,at as d,H as _,l as e,o as a,c as u,h as f,L as v,G as o,a as i}from"./index.js";import{u as k}from"./useDetail.dfd230ac.js";import D from"./BaseForm.a7e0bd.js";import{P as g}from"./index.6c7a4d12.js";import{a as h}from"./index.4864b43a.js";import"./status.0f771e9a.js";import"./InvoiceTitle.77bebe.js";import"./basic-descriptions.963d3d7f.js";import"./index.08977e.js";import"./use-page-search.91bab1a3.js";import"./ChildGoodEditModal.7967d3.js";import"./columns.1182f372.js";import"./tootip.a84a1bff.js";import"./query-category.fa03a8.js";const y={class:"padding__container"},x={class:"my-[5px]",style:{"font-size":"14px"}},B=n({__name:"detail",setup(C){const t=m(),{title:r,isDetail:c,collapses:N,id:s}=k({baseName:"\u5546\u54C1",collapseLen:2});return s.value&&t.run(h({id:s.value})),(w,L)=>{const l=d("loading");return _((a(),u("div",y,[f("p",x,v(e(r)),1),e(c)?i("v-if",!0):(a(),o(D,{key:0})),e(t).data?(a(),o(g,{key:1,data:e(t).data},null,8,["data"])):i("v-if",!0)])),[[l,e(t).loading]])}}});var U=p(B,[["__file","C:/Users/89793/Desktop/projects/ticket-system/src/views/invoiceInOut/productManager/detail.vue"]]);export{U as default};
+import{_ as p,d as n,aY as m,at as d,H as _,l as e,o as a,c as u,h as f,L as v,G as o,a as i}from"./index.js";import{u as k}from"./useDetail.12872bd2.js";import D from"./BaseForm.a7e0bd.js";import{P as g}from"./index.d588dadf.js";import{a as h}from"./index.68080548.js";import"./status.0f771e9a.js";import"./InvoiceTitle.77bebe.js";import"./basic-descriptions.a391601a.js";import"./index.08977e.js";import"./use-page-search.5f76ca6a.js";import"./ChildGoodEditModal.7967d3.js";import"./columns.5d764429.js";import"./tootip.82efc6cd.js";import"./query-category.fa03a8.js";const y={class:"padding__container"},x={class:"my-[5px]",style:{"font-size":"14px"}},B=n({__name:"detail",setup(C){const t=m(),{title:r,isDetail:c,collapses:N,id:s}=k({baseName:"\u5546\u54C1",collapseLen:2});return s.value&&t.run(h({id:s.value})),(w,L)=>{const l=d("loading");return _((a(),u("div",y,[f("p",x,v(e(r)),1),e(c)?i("v-if",!0):(a(),o(D,{key:0})),e(t).data?(a(),o(g,{key:1,data:e(t).data},null,8,["data"])):i("v-if",!0)])),[[l,e(t).loading]])}}});var U=p(B,[["__file","C:/Users/89793/Desktop/projects/ticket-system/src/views/invoiceInOut/productManager/detail.vue"]]);export{U as default};

dist/assets/qrCode.be32d8.js

@@ -1,4 +1,4 @@
-import{d as Ht,w as Ot,a7 as Lt,z as me,j as P,H as pe,at as we,l as R,aE as be,F as Jt,y as Ce,bv as ve,bw as Dt,aw as Ee,_ as Te,r as jt,o as Be,c as Ae,C as W,h as Se,au as Ne,M as Pe}from"./index.js";import{M as ht}from"./motion.00b04b0a.js";/*!
+import{d as Ht,w as Ot,a7 as Lt,z as me,j as P,H as pe,at as we,l as R,aE as be,F as Jt,y as Ce,bv as ve,bw as Dt,aw as Ee,_ as Te,r as jt,o as Be,c as Ae,C as W,h as Se,au as Ne,M as Pe}from"./index.js";import{M as ht}from"./motion.11b463f1.js";/*!
  * is-plain-object <https://github.com/jonschlinkert/is-plain-object>
  *
  * Copyright (c) 2014-2017, Jon Schlinkert.

src/views/invoiceInOut/clientC/detail.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { reactive, ref } from "vue";
+import { computed, reactive, ref } from "vue";
 import { orderGoodColumns } from "./config/columns";
 import { useDetail } from "/@/hooks/core/useDetail";
 import BasicDescriptions from "/@/components/BasicDescriptions";
@@ -26,6 +26,7 @@ const state = reactive({ editVisible: false, index: -1, data: {} });
 
 const formData = ref({ goods: [], month: "" });
 
+
 function handleGoodComfirm(values: any[]) {
   const ids = formData.value.goods.map(({ id }) => id);
   const list = values.filter(item => !ids.includes(item.id));

src/views/invoiceInOut/inManager/components/ChooseGoodModal/config/search.config.ts

@@ -3,17 +3,17 @@ import { goodTypeOptions } from "/@/utils/status";
 
 const searchFormConfig: FormConfig = {
   formItems: [
-    {
-      field: 'skuCode',
-      type: 'input',
-      placeholder: '商品编码'
-    },
-    {
-      field: 'good_type',
-      type: 'select',
-      options: goodTypeOptions,
-      placeholder: '商品类型'
-    },
+    // {
+    //   field: 'skuCode',
+    //   type: 'input',
+    //   placeholder: '商品编码'
+    // },
+    // {
+    //   field: 'good_type',
+    //   type: 'select',
+    //   options: goodTypeOptions,
+    //   placeholder: '商品类型'
+    // },
     {
       field: "timer",
       type: "date_picker",

src/views/invoiceInOut/inManager/components/NotOrderImportModal/validator.ts

@@ -2,7 +2,7 @@ import { h } from "vue"
 import { ElMessageBox } from "element-plus"
 import { mapPropertyToLabel, requiredProps } from "./columns-config"
 import { diffOptions, mapDiffOptions, mapLabelToSource, mapLabelToType, sourceOptions, typeOptions } from "../../config/shared"
-import { mapGoodTypeToLabel, mapLabelToInvtype, xs_inv_type_list } from "/@/utils/status"
+import { cg_order_type_options, mapGoodTypeToLabel, mapLabelToInvtype, xs_inv_type_list } from "/@/utils/status"
 
 function onDisplayErrorMessage(errors) {
     ElMessageBox({
@@ -52,8 +52,8 @@ export function isValidRequired(results: any[]) {
                 isTaxDiffError = true
             } else if (key === 'cat_diff' && !mapDiffOptions[value]) {
                 isCatDiffError = true
-            } else if (key === 'goodType' && mapGoodTypeToLabel[value]){
-                isGoodType =  false
+            } else if (key === 'goodType' && !mapGoodTypeToLabel[value]){
+                isGoodType =  true
             }
         }
 
@@ -71,7 +71,7 @@ export function isValidRequired(results: any[]) {
             if (isSourceError) errors[index] = ' 订单来源必须为' + sourceOptions.map(({ label }) => label).join('、')
             if (isInvError) errors[index] = ' 类目编号状态必须为' + diffOptions.map(({ label }) => label).join('、')
             if (isCatDiffError) errors[index] = ' 税率状态必须为' + diffOptions.map(({ label }) => label).join('、')
-            if (isGoodType) errors[index] = ' 商品类型必须为' + diffOptions.map(({ label }) => label).join('、')
+            if (isGoodType) errors[index] = ' 商品类型必须为' + cg_order_type_options.map(({ label }) => label).join('、')
         }
     }
 

src/views/invoiceInOut/inManager/components/OrderImportModal/validator.ts

@@ -2,7 +2,7 @@ import { h } from "vue"
 import { ElMessageBox } from "element-plus"
 import { mapPropertyToLabel, requiredProps } from "./columns-config"
 import { diffOptions, mapDiffOptions, mapLabelToSource, mapLabelToType, sourceOptions, typeOptions } from "../../config/shared"
-import { mapGoodTypeToLabel, mapLabelToInvtype, xs_inv_type_list } from "/@/utils/status"
+import { cg_order_type_options, mapGoodTypeToLabel, mapLabelToInvtype, xs_inv_type_list } from "/@/utils/status"
 
 function onDisplayErrorMessage(errors) {
     ElMessageBox({
@@ -52,9 +52,10 @@ export function isValidRequired(results: any[]) {
                 isTaxDiffError = true
             } else if (key === 'cat_diff' && !mapDiffOptions[value]) {
                 isCatDiffError = true
-            } else if (key === 'goodType' && mapGoodTypeToLabel[value]) {
-                isGoodType = false
+            } else if (key === 'goodType' && !mapGoodTypeToLabel[value]) {
+                isGoodType = true
             }
+
         }
 
         if (errors[index]) {
@@ -71,7 +72,7 @@ export function isValidRequired(results: any[]) {
             if (isSourceError) errors[index] = ' 订单来源必须为' + sourceOptions.map(({ label }) => label).join('、')
             if (isInvError) errors[index] = ' 类目编号状态必须为' + diffOptions.map(({ label }) => label).join('、')
             if (isCatDiffError) errors[index] = ' 税率状态必须为' + diffOptions.map(({ label }) => label).join('、')
-            if (isGoodType) errors[index] = ' 商品类型必须为' + diffOptions.map(({ label }) => label).join('、')
+            if (isGoodType) errors[index] = ' 商品类型必须为' + cg_order_type_options.map(({ label }) => label).join('、')
         }
     }
 

src/views/invoiceInOut/inManager/detail.vue

@@ -26,8 +26,6 @@ const visible = ref(false)
 
 
 const { isSuperUser } = useUserInfo()
-
-
 const productDetailTask = useTask()
 
 const detailTask = useTask({ success(data) {
@@ -41,10 +39,16 @@ const goodNum = computed(() => {
   if (detailTask.data && detailTask.data.ProductRela){
     return detailTask.data.ProductRela[0].num
   }
-
   return 0
 })
 
+const searchParameter = computed(() => {
+  // 入库、入库红冲和出库红冲 只能选择真实成本的商品，出库类型可以选择预估成本商品
+  if (!detailTask.data) return {}
+  return { basic_status: '1', good_type: detailTask.data?.goodType, skuCode: detailTask.data.goodNo }
+})
+
+
 const state = reactive({
   editVisible: false,
   index: -1,
@@ -54,11 +58,6 @@ const state = reactive({
 const loading = ref(false)
 const formRef = ref<InstanceType<typeof ElForm> | null>(null)
 
-const searchParameter = computed(() => {
-  // 入库、入库红冲和出库红冲 只能选择真实成本的商品，出库类型可以选择预估成本商品
-  if(!detailTask.data) return {}
-  return detailTask.data.type == '2' ? { basic_status: '1'  } : { basic_status: '2' }
-})
 
 const formData = ref({ goods: [], month: '' })
 

src/views/invoiceInOut/outManager/components/ChooseGoodModal/config/search.config.ts

@@ -3,17 +3,17 @@ import { goodTypeOptions } from "/@/utils/status";
 
 const searchFormConfig: FormConfig = {
   formItems: [
-    {
-      field: 'skuCode',
-      type: 'input',
-      placeholder: '商品编码'
-    },
-    {
-      field: 'good_type',
-      type: 'select',
-      options: goodTypeOptions,
-      placeholder: '商品类型'
-    },
+    // {
+    //   field: 'skuCode',
+    //   type: 'input',
+    //   placeholder: '商品编码'
+    // },
+    // {
+    //   field: 'good_type',
+    //   type: 'select',
+    //   options: goodTypeOptions,
+    //   placeholder: '商品类型'
+    // },
     {
       field: "timer",
       type: "date_picker",

src/views/invoiceInOut/outManager/components/NotOrderImportModal/validator.ts

@@ -2,7 +2,7 @@ import { h } from "vue"
 import { ElMessageBox } from "element-plus"
 import { mapPropertyToLabel, requiredProps } from "./columns-config"
 import { diffOptions, mapDiffOptions, mapLabelToSource, mapLabelToType, sourceOptions, typeOptions } from "../../config/shared"
-import { mapGoodTypeToLabel, mapLabelToInvtype, xs_inv_type_list } from "/@/utils/status"
+import { cg_order_type_options, mapGoodTypeToLabel, mapLabelToInvtype, xs_inv_type_list } from "/@/utils/status"
 
 function onDisplayErrorMessage(errors) {
     ElMessageBox({
@@ -52,8 +52,8 @@ export function isValidRequired(results: any[]) {
                 isTaxDiffError = true
             } else if (key === 'cat_diff' && !mapDiffOptions[value]) {
                 isCatDiffError = true
-            } else if (key === 'goodType' && mapGoodTypeToLabel[value]){
-                isGoodType =  false
+            } else if (key === 'goodType' && !mapGoodTypeToLabel[value]){
+                isGoodType =  true
             }
         }
 
@@ -71,7 +71,7 @@ export function isValidRequired(results: any[]) {
             if (isSourceError) errors[index] = ' 订单来源必须为' + sourceOptions.map(({ label }) => label).join('、')
             if (isInvError) errors[index] = ' 类目编号状态必须为' + diffOptions.map(({ label }) => label).join('、')
             if (isCatDiffError) errors[index] = ' 税率状态必须为' + diffOptions.map(({ label }) => label).join('、')
-            if (isGoodType) errors[index] = ' 商品类型必须为' + diffOptions.map(({ label }) => label).join('、')
+            if (isGoodType) errors[index] = ' 商品类型必须为' + cg_order_type_options.map(({ label }) => label).join('、')
         }
     }
 

src/views/invoiceInOut/outManager/components/OrderImportModal/validator.ts

@@ -2,7 +2,7 @@ import { h } from "vue"
 import { ElMessageBox } from "element-plus"
 import { mapPropertyToLabel, requiredProps } from "./columns-config"
 import { diffOptions, mapDiffOptions, mapLabelToSource, mapLabelToType, sourceOptions, typeOptions } from "../../config/shared"
-import { mapGoodTypeToLabel, mapLabelToInvtype, xs_inv_type_list } from "/@/utils/status"
+import { cg_order_type_options, mapGoodTypeToLabel, mapLabelToInvtype, xs_inv_type_list } from "/@/utils/status"
 
 function onDisplayErrorMessage(errors) {
     ElMessageBox({
@@ -52,8 +52,8 @@ export function isValidRequired(results: any[]) {
                 isTaxDiffError = true
             } else if (key === 'cat_diff' && !mapDiffOptions[value]) {
                 isCatDiffError = true
-            } else if (key === 'goodType' && mapGoodTypeToLabel[value]) {
-                isGoodType = false
+            } else if (key === 'goodType' && !mapGoodTypeToLabel[value]) {
+                isGoodType = true
             }
         }
 
@@ -71,7 +71,7 @@ export function isValidRequired(results: any[]) {
             if (isSourceError) errors[index] = ' 订单来源必须为' + sourceOptions.map(({ label }) => label).join('、')
             if (isInvError) errors[index] = ' 类目编号状态必须为' + diffOptions.map(({ label }) => label).join('、')
             if (isCatDiffError) errors[index] = ' 税率状态必须为' + diffOptions.map(({ label }) => label).join('、')
-            if (isGoodType) errors[index] = ' 商品类型必须为' + diffOptions.map(({ label }) => label).join('、')
+            if (isGoodType) errors[index] = ' 商品类型必须为' + cg_order_type_options.map(({ label }) => label).join('、')
         }
     }
 

src/views/invoiceInOut/outManager/detail.vue

@@ -37,11 +37,11 @@ const formRef = ref<InstanceType<typeof ElForm> | null>(null)
 const searchParameter = computed(() => {
   // 入库、入库红冲和出库红冲 只能选择真实成本的商品，出库类型可以选择预估成本商品
   if (!detailTask.data) return {}
-  const baseParameter =  detailTask.data.type == '2' ? { basic_status: '1' } : { basic_status: '2' }
+  const baseParameter = {}
 
   return {
     ...baseParameter,
-    good_type: detailTask.data?.goodType
+    good_type: detailTask.data?.goodType, skuCode: detailTask.data.goodNo
   }
 })
 

src/views/invoiceInOut/provisionOut/detail.vue

@@ -180,6 +180,11 @@ function handleShowDetail(id, index) {
 watch(() =>formData.value.goods, () => {
   if(!detailTask.data) return
 
+  formData.value.goods.forEach(item => {
+    // item.goodNum * 
+    // console.log(item)
+  })
+
   console.log(detailTask.data.out_fee)
 }, {
   deep: true,