build

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{a as E}from"./columns.0d0dcd02.js";import{B as M}from"./basic-descriptions.cc97c023.js";import"./status.0f771e9a.js";import"./tootip.7e677fab.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{a as E}from"./columns.3129b278.js";import{B as M}from"./basic-descriptions.b613ec84.js";import"./status.b7512d56.js";import"./tootip.88cca741.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.cc97c023.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.b613ec84.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.4f9e44f6.js";import{B as c}from"./basic-descriptions.cc97c023.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.4f9e44f6.js";import{B as c}from"./basic-descriptions.b613ec84.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.89d1b16f.js";import D from"./BaseForm.46b546.js";import{P as g}from"./index.85538f4b.js";import{a as h}from"./index.0823e041.js";import"./status.0f771e9a.js";import"./InvoiceTitle.77bebe.js";import"./basic-descriptions.cc97c023.js";import"./index.ba4b19.js";import"./use-page-search.f6b81937.js";import"./columns.0d0dcd02.js";import"./tootip.7e677fab.js";import"./ChildGoodEditModal.7967d3.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.caa33b7d.js";import D from"./BaseForm.46b546.js";import{P as g}from"./index.c64a331f.js";import{a as h}from"./index.1ba04f31.js";import"./status.b7512d56.js";import"./InvoiceTitle.77bebe.js";import"./basic-descriptions.b613ec84.js";import"./index.ba4b19.js";import"./use-page-search.88230d59.js";import"./columns.3129b278.js";import"./tootip.88cca741.js";import"./ChildGoodEditModal.7967d3.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/index.26e23e6f.js → dist/assets/index.b17c7226.js

@@ -1 +1 @@
-import{aF as n,ab as e}from"./index.js";const{VITE_PROXY_DOMAIN_REAL:c,VITE_PROXY_USER_REAL:i,VITE_WORKORDER_REAL:s}=e(),a=s,o=t=>n.request("post",`${a}/cxinv/FinancialManager/create`,{data:t}),u=t=>n.request("post",`${a}/cxinv/FinancialProducts/CheckBatch`,{data:t}),p=t=>n.request("post",`${a}/cxinv/FinancialManager/list`,{data:t}),h=t=>n.request("post",`${a}/cxinv/FinancialManager/info`,{data:t}),l=t=>n.request("post",`${a}/cxinv/adjust/info`,{data:t}),v=t=>n.request("post",`${a}/cxinv/FinancialManager/delete`,{data:t}),x=t=>n.request("post",`${a}/cxinv/adjust/status`,{data:t}),E=t=>n.request("post",`${a}/cxinv/FinancialManager/CheckSure`,{data:t});export{o as a,E as b,p as c,v as d,u as e,l as f,x as g,h};
+import{aF as n,ab as e}from"./index.js";const{VITE_PROXY_DOMAIN_REAL:c,VITE_PROXY_USER_REAL:i,VITE_WORKORDER_REAL:s}=e(),a=s,o=t=>n.request("post",`${a}/cxinv/FinancialManager/create`,{data:t}),u=t=>n.request("post",`${a}/cxinv/FinancialProducts/CheckBatch`,{data:t}),p=t=>n.request("post",`${a}/cxinv/FinancialManager/list`,{data:t}),h=t=>n.request("post",`${a}/cxinv/FinancialManager/info`,{data:t}),l=t=>n.request("post",`${a}/cxinv/adjust/info`,{data:t}),v=t=>n.request("post",`${a}/cxinv/FinancialManager/delete`,{data:t}),x=t=>n.request("post",`${a}/cxinv/adjust/status`,{data:t}),E=t=>n.request("post",`${a}/cxinv/FinancialManager/CheckSure`,{data:t});export{v as a,o as b,E as c,p as d,u as e,l as f,x as g,h};

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.c5608e6b.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.20586e2d.js";/*!
  * is-plain-object <https://github.com/jonschlinkert/is-plain-object>
  *
  * Copyright (c) 2014-2017, Jon Schlinkert.

src/utils/status.ts

@@ -1,7 +1,7 @@
 export const goodTypeOptions = [
   { value: "1", label: "库存品" },
   { value: "2", label: "非库存品" },
-  { value: "3", label: "反馈商品" }
+  { value: "3", label: "咨询商品" }
 ];
 
 const statusList = [

src/views/invoiceInOut/clientC/components/BaseForm/index.vue

@@ -56,7 +56,7 @@ function getSpanNumber(data, prop) {
 
 
 function spanMethod({ row: _1, column: _2, rowIndex, columnIndex }: any) {
-    if ([0, 1, 2, 7].includes(Number(columnIndex))) {
+    if ([0, 1, 2, 3, 4, 5, 9].includes(Number(columnIndex))) {
         let nameSpan = getSpanNumber(formData.value.goods, "id");
         return { rowspan: nameSpan[rowIndex], colspan: 1 };
     }
@@ -234,10 +234,9 @@ const rules = {
                 </ElTableColumn>
 
                 <ElTableColumn label="结存数" prop="residue_stock" width="80px" show-overflow-tooltip />
-                <ElTableColumn label="操作数量" prop="goodNum" show-overflow-tooltip />
+                <ElTableColumn label="操作数量" prop="goodNum" width="80px" show-overflow-tooltip />
 
                 <ElTableColumn label="子商品编号" prop="childCode" show-overflow-tooltip />
-                <!-- <ElTableColumn label="销售方公司纳税识别号" width="140px" prop="seller_code" show-overflow-tooltip /> -->
                 <ElTableColumn label="子商品比例" prop="childNum" show-overflow-tooltip />
                 <ElTableColumn label="子商品操作数量" prop="childActionNum" width="110px" show-overflow-tooltip />
 
@@ -246,11 +245,7 @@ const rules = {
                         <div class="w-full flex justify-between">
                             <span>操作</span>
                             <ElTooltip content="添加" placement="top">
-                                <ElButton 
-                                    link 
-                                    size="small" 
-                                    type="primary" 
-                                    :icon="useRenderIcon('add')"
+                                <ElButton link size="small" type="primary" :icon="useRenderIcon('add')"
                                     @click="state.goodvisible = true" />
                             </ElTooltip>
                         </div>

src/views/invoiceInOut/clientC/components/ChooseGoodModal/index.vue

@@ -73,7 +73,7 @@ function handleSubmit() {
           isJT: props.isJT,
           goodNum: '',
           childCode: child.products.skuCode,
-          childNum: single.child_num,
+          childNum: child.child_num,
           childActionNum: ''
         })
       })

src/views/invoiceInOut/clientC/components/NotOrderImportModal/columns-config.ts

@@ -63,7 +63,7 @@ const columns = [
   },
   {
     label: '商品类型',
-    prop: 'goodNo',
+    prop: 'goodType',
     minWidth: '100px',
     required: true,
     defaultData: ''
@@ -118,7 +118,7 @@ const columns = [
   },
   {
     label: '操作数量',
-    prop: 'relaGoodNo',
+    prop: 'relaGoodNum',
     minWidth: '100px',
     required: true,
     defaultData: ''

src/views/invoiceInOut/clientC/components/NotOrderImportModal/index.vue

@@ -5,7 +5,7 @@ import { httpAdd } from "/@/api/invoiceInOut/inOutManager";
 import { ElButton, ElDialog, ElMessage } from "element-plus";
 import { execlUpload } from "/@/components/execlUpload";
 import { mapLabelToType } from "../../config/shared";
-import { mapLabelToInvtype } from "/@/utils/status";
+import { mapGoodLabelToType, mapLabelToInvtype } from "/@/utils/status";
 import { isImportDataValid } from "./validator";
 import { useResponseHandle } from "/@/hooks";
 import { useVModel } from "@vueuse/core";
@@ -21,6 +21,7 @@ const visible = useVModel(props, 'visible')
 const responseHandle = useResponseHandle();
 
 const Uploadsuccess = ({ results, header }) => {
+
   loading.value = true;
   if (results.length === 0) {
     ElMessage.error("表格无有效数据！");
@@ -35,6 +36,8 @@ const Uploadsuccess = ({ results, header }) => {
   } else {
     columns.slice(1).forEach((si, sii) => {
       if (si.label !== header[sii]) { 
+
+        console.log(si.label, header[sii])
         headok = false; 
       }
     });
@@ -49,15 +52,25 @@ const Uploadsuccess = ({ results, header }) => {
   tableData.value = [];
 
   const result = []
-  for(const tableItem of results){
+  for (const tableItem of results) {
+
     const item = {}
-    Object.keys(tableItem).forEach(label => {
-      const prop = mapLabelToProp[label]
-      item[prop] = tableItem[label]
+    Object.keys(tableItem).forEach((label, index) => {
+      const prop = mapLabelToProp[label.replace('_1', '')]
+      let value = tableItem[label]
+      if (label === '发票类型') {
+        value = value.replace('(', '（')
+        value = value.replace(')', '）')
+      }
+
+      item[prop] = value ? String(value).trim() : value
     })
+
     result.push(item)
   }
 
+  
+
   if(isImportDataValid(result)){ tableData.value = result }
   loading.value = false;
 };
@@ -73,11 +86,19 @@ const handleSubmit = async () => {
     tableData.value.forEach(item => {
       list.push({ 
         ...item, 
-        inv_type: mapLabelToInvtype[item.inv_type],
-        relaArr: [],
+        inv_price: '',
+        inv_unit: '',
+        inv_subprice: '',
+        inv_type: '',
+        inv_good_name: item.goodName,
+        inv_seller_code: item.seller_code,
+        inv_buyer_code: item.buyer_code,
+        inv_seller_name: item.seller_name,
+        inv_buyer_name: item.buyer_name,
+        relaArr: [{ id: item.relaGoodNo, num: item.relaGoodNum }],
         type: mapLabelToType[item.type],
         platform_type: '2',
-        goodType: '1',
+        goodType: mapGoodLabelToType[item.goodType],
         cat_code: '0',
         cat_name: '0',
         channel: '3',

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

@@ -2,7 +2,7 @@ import { h } from "vue"
 import { ElMessageBox } from "element-plus"
 import { mapPropertyToLabel, requiredProps } from "./columns-config"
 import { mapLabelToSource, mapLabelToType, sourceOptions, typeOptions } from "../../config/shared"
-import { 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({
@@ -26,6 +26,7 @@ export function isValidRequired(results: any[]) {
     let isTypeError = false
     let isSourceError = false
     let isInvError = false
+    let isGoodType = false
 
     for (const sourceIndex in results) {
         const item = results[sourceIndex];
@@ -45,6 +46,8 @@ export function isValidRequired(results: any[]) {
                 isSourceError = true
             } else if (key === 'inv_type' && !mapLabelToInvtype[value]){
                 isInvError = true
+            } else if (key === 'goodType' && !mapGoodTypeToLabel[value]) {
+                isGoodType = true
             }
         }
 
@@ -53,10 +56,12 @@ export function isValidRequired(results: any[]) {
             if (isTypeError) errors[index] += ' , 类型必须为' + typeOptions.map(({ label }) => label).join('、')
             if (isSourceError) errors[index] += ' ,订单来源必须为' + sourceOptions.map(({ label }) => label).join('、')
             if (isInvError) errors[index] += ' ,发票类型必须为' + xs_inv_type_list.map(({ label }) => label).join('、')
+            if (isGoodType) errors[index] += ' ,商品类型必须为' + cg_order_type_options.map(({ label }) => label).join('、')
         } else {
             if (isTypeError) errors[index] = '类型必须为' + typeOptions.map(({ label }) => label).join('、')
             if (isSourceError) errors[index] = ' 订单来源必须为' + sourceOptions.map(({ label }) => label).join('、')
             if (isInvError) errors[index] = ' 发票类型必须为' + xs_inv_type_list.map(({ label }) => label).join('、')
+            if (isGoodType) errors[index] = '商品类型必须为' + cg_order_type_options.map(({ label }) => label).join('、')
         }
     }
 

src/views/invoiceInOut/clientC/components/OrderImportModal/columns-config.ts

@@ -63,7 +63,7 @@ const columns = [
   },
   {
     label: '商品类型',
-    prop: 'goodNo',
+    prop: 'goodType',
     minWidth: '100px',
     required: true,
     defaultData: ''

src/views/invoiceInOut/clientC/components/OrderImportModal/index.vue

@@ -5,7 +5,7 @@ import { httpAdd } from "/@/api/invoiceInOut/inOutManager";
 import { ElButton, ElDialog, ElMessage } from "element-plus";
 import { execlUpload } from "/@/components/execlUpload";
 import { mapLabelToType } from "../../config/shared";
-import { mapLabelToInvtype } from "/@/utils/status";
+import { mapGoodLabelToType, mapLabelToInvtype } from "/@/utils/status";
 import { isImportDataValid } from "./validator";
 import { useResponseHandle } from "/@/hooks";
 import { useVModel } from "@vueuse/core";
@@ -49,12 +49,20 @@ const Uploadsuccess = ({ results, header }) => {
   tableData.value = [];
 
   const result = []
-  for(const tableItem of results){
+  for (const tableItem of results) {
+
     const item = {}
-    Object.keys(tableItem).forEach(label => {
-      const prop = mapLabelToProp[label]
-      item[prop] = tableItem[label]
+    Object.keys(tableItem).forEach((label, index) => {
+      const prop = mapLabelToProp[label.replace('_1', '')]
+      let value = tableItem[label]
+      if (label === '发票类型') {
+        value = value.replace('(', '（')
+        value = value.replace(')', '）')
+      }
+
+      item[prop] = value ? String(value).trim() : value
     })
+
     result.push(item)
   }
 
@@ -73,11 +81,20 @@ const handleSubmit = async () => {
     tableData.value.forEach(item => {
       list.push({ 
         ...item, 
-        inv_type: mapLabelToInvtype[item.inv_type],
+        inv_price: '',
+        inv_unit: '',
+        inv_subprice: '',
+        inv_type: '',
+        inv_good_name: item.goodName,
+        inv_seller_code: item.seller_code,
+        inv_buyer_code: item.buyer_code,
+        inv_seller_name: item.seller_name,
+        inv_buyer_name: item.buyer_name,
+        // inv_type: mapLabelToInvtype[item.inv_type],
         relaArr: [],
         type: mapLabelToType[item.type],
         platform_type: '2',
-        goodType: '1',
+        goodType: mapGoodLabelToType[item.goodType],
         cat_code: '0',
         cat_name: '0',
         channel: '3',
@@ -120,6 +137,7 @@ const cancel = () => {
     width="1040px"
     top="8vh"
     center
+    @close="tableData = []"
   >
     <execlUpload style="margin-bottom: 10px" @on-success="Uploadsuccess" v-if="tableData.length === 0" />
 

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

@@ -2,7 +2,7 @@ import { h } from "vue"
 import { ElMessageBox } from "element-plus"
 import { mapPropertyToLabel, requiredProps } from "./columns-config"
 import { mapLabelToSource, mapLabelToType, sourceOptions, typeOptions } from "../../config/shared"
-import { 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({
@@ -26,6 +26,7 @@ export function isValidRequired(results: any[]) {
     let isTypeError = false
     let isSourceError = false
     let isInvError = false
+    let isGoodType = false
 
     for (const sourceIndex in results) {
         const item = results[sourceIndex];
@@ -45,6 +46,8 @@ export function isValidRequired(results: any[]) {
                 isSourceError = true
             } else if (key === 'inv_type' && !mapLabelToInvtype[value]){
                 isInvError = true
+            } else if (key === 'goodType' && !mapGoodTypeToLabel[value]) {
+                isGoodType = true
             }
         }
 
@@ -53,10 +56,11 @@ export function isValidRequired(results: any[]) {
             if (isTypeError) errors[index] += ' , 类型必须为' + typeOptions.map(({ label }) => label).join('、')
             if (isSourceError) errors[index] += ' ,订单来源必须为' + sourceOptions.map(({ label }) => label).join('、')
             if (isInvError) errors[index] += ' ,发票类型必须为' + xs_inv_type_list.map(({ label }) => label).join('、')
+            if (isGoodType) errors[index] += ' ,商品类型必须为' + cg_order_type_options.map(({ label }) => label).join('、')
         } else {
             if (isTypeError) errors[index] = '类型必须为' + typeOptions.map(({ label }) => label).join('、')
             if (isSourceError) errors[index] = ' 订单来源必须为' + sourceOptions.map(({ label }) => label).join('、')
-            if (isInvError) errors[index] = ' 发票类型必须为' + xs_inv_type_list.map(({ label }) => label).join('、')
+            if (isGoodType) errors[index] = ' 商品类型必须为' + cg_order_type_options.map(({ label }) => label).join('、')
         }
     }
 

src/views/invoiceInOut/clientC/config/content.config.ts

@@ -7,6 +7,10 @@ import { useTypeOptions } from "/@/utils/status";
 import { renderIconLabelLeft } from "/@/utils/columnRenderHelper";
 
 const columns = [
+  {
+    type: 'selection',
+    width: 40
+  },
   { 
     label: "确认单编号",
     prop: "orderCode", 

src/views/invoiceInOut/clientC/index.vue

@@ -8,11 +8,13 @@ import { useRenderIcon } from "/@/components/ReIcon/src/hooks"
 import contentConfig from "./config/content.config";
 import searchConfig from "./config/search.config";
 import { utils, writeFile } from "xlsx";
-import { ElButton, ElDropdown } from "element-plus";
+import { ElButton, ElDropdown, ElMessage } from "element-plus";
 import { useUserInfo } from "/@/hooks/core/useUser";
 
 import { orderTemplate } from "./components/OrderImportModal/columns-config"
 import { notOrderTemplate } from "./components/NotOrderImportModal/columns-config"
+import { useTask } from "/@/hooks/core";
+import { httpDelete } from "/@/api/invoiceInOut/inOutManager";
 
 
 const PageName = "inOutManager";
@@ -23,6 +25,15 @@ const hooks: PageHooks = { pageSearchHook: () => usePageSearch(undefined, undefi
 
 const pageContentRef = ref(null)
 
+const selection = ref([])
+
+const deleteTask = useTask({
+  success() {
+    ElMessage.success('取消成功')
+    pageContentRef?.value.onSearch()
+  }
+})
+
 const { isSuperUser } = useUserInfo()
 
 const events: PageEvents = {
@@ -41,12 +52,28 @@ function handleDownloadTemplate(isOrder = false){
   utils.book_append_sheet(workBook, workSheet, 'sheet');
   writeFile(workBook, name, { bookType: 'xlsx' })
 }
+
+function handleRefresh() {
+  if (selection.value.length === 0) {
+    ElMessage.warning('请选择至少一条状态为 "待审核" 或 "异常" 的数据')
+    return
+  }
+
+  const isStatusNotOk = selection.value.some(({ status }) => status != '1' && status != '4')
+
+  if (isStatusNotOk) {
+    ElMessage.warning('只能选择状态为 "待审核" 或 "异常" 的数据')
+    return
+  }
+
+  deleteTask.run(httpDelete({ id: selection.value.map(({ id }) => id) }))
+}
 </script>
 
 <template>
   <PageAuth :pageName="PageName">
     <PageContainer :hooks="hooks" :events="events" :searchConfig="searchConfig" :contentConfig="contentConfig"
-      :get-content-ref="ref => pageContentRef = ref">
+      :get-content-ref="ref => pageContentRef = ref" @content-select-change="selects => selection = selects">
       <template #content_header>
         <ElDropdown>
           <ElButton v-if="!isSuperUser" size="small" type="primary" style="margin-right: 10px;margin-top:1px"
@@ -70,6 +97,8 @@ function handleDownloadTemplate(isOrder = false){
           </template>
         </ElDropdown>
 
+        <ElButton size="small" type="primary" @click="handleRefresh">批量取消</ElButton>
+
         <ElButton v-if="!isSuperUser" size="small" type="primary" @click="router.push('/invoiceInOut/clinetCDetail')">
           批量处理
         </ElButton>

src/views/invoiceInOut/provisionOut/components/ChooseGoodModal/index.vue

@@ -5,7 +5,7 @@ import { ElDialog, ElMessage } from "element-plus";
 import searchConfig from "./config/search.config";
 import { useVModel } from "@vueuse/core";
 import { useRouter } from "vue-router";
-import { ref } from "vue";
+import { computed, ref } from "vue";
 
 const props = defineProps<{ visible: boolean; otherSearchParameter: any }>()
 const emit = defineEmits(['submit'])
@@ -26,6 +26,7 @@ const events: PageEvents = {
   }
 };
 
+
 function handleSubmit(){
    if(selection.value.length === 0){
        ElMessage.warning('请选择至少一个商品')
@@ -34,13 +35,13 @@ function handleSubmit(){
 
    const result = []
    selection.value.forEach(single => {
-      if (single.ProductsCombind.length === 0) { 
-        result.push({ ...single, goodNum: 1 })
-      } else {
-        single.ProductsCombind.forEach(child => {
-          result.push({ ...single, spbl: 1 ,goodNum: 1, childCode: child.products.skuCode, childNum: single.child_num, childActionNum: single.child_num })
-        })
-      }
+     result.push({ ...single, goodNum: 1 })
+      // if (single.ProductsCombind.length === 0) { 
+      // } else {
+      //   single.ProductsCombind.forEach(child => {
+      //     result.push({ ...single, spbl: 1 ,goodNum: 1, childCode: child.products.skuCode, childNum: single.child_num, childActionNum: single.child_num })
+      //   })
+      // }
    })
 
    visible.value = false

src/views/invoiceInOut/provisionOut/detail.vue

@@ -198,6 +198,19 @@ function handleShowDetail(id, index) {
   productDetailTask.run(httpProductDetail({ id }))
 }
 
+const total = computed(() => {
+  const relaArrCopy = formData.value.goods.map(({ id, goodNum }) => ({ id, num: goodNum }))
+  const mapId = {}
+  let total = 0
+  for (const item of relaArrCopy) {
+    if (!mapId[item.id]) {
+      mapId[item.id] = true
+      const { num = '0' } = item
+      total = addition(num, total)
+    }
+  }
+  return total
+})
 
 watch(() =>formData.value.goods, () => {
   if(!detailTask.data) return
@@ -269,18 +282,17 @@ id.value && detailTask.run(httpJTDetail({ id: id.value }))
           </ElCollapseItem>
 
           <!-- && detailTask.data.type == '1' -->
-          <ElCollapseItem title="出入库信息确认" name="2"
-            v-if="detailTask.data && detailTask.data.status == '1' && !isSuperUser">
+
+          
+          <ElCollapseItem title="出入库信息确认" name="2"  v-if="detailTask.data && detailTask.data.status == '1' && !isSuperUser">
+            计提待处理数量 {{ Number(detailTask.data.num) }} / {{ total }}, 未处理数量 {{ detailTask.data.num - total  }}
+            
             <ElForm ref="formRef" :rules="rules" :model="formData" label-width="140px">
               <ElFormItem label="关联凭证" prop="goods">
                 <ElTable :span-method="spanMethod" border size="small" :data="formData.goods">
                   <ElTableColumn label="商品ID" prop="id" width="60" show-overflow-tooltip />
                   <ElTableColumn label="商品编号" prop="skuCode" show-overflow-tooltip />
-
-
                   <ElTableColumn label="商品名称" prop="goodName" show-overflow-tooltip />
-
-
                   <ElTableColumn label="账面数量" prop="total_stock" show-overflow-tooltip />
                   <ElTableColumn label="目标商品比例" prop="spbl" show-overflow-tooltip />
                   <ElTableColumn label="关联数量" prop="goodNum" show-overflow-tooltip />