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{g as E}from"./columns.d0b7f00e.js";import{B as M}from"./basic-descriptions.600049da.js";import"./status.0f771e9a.js";import"./tootip.50a62683.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.eaa2d03d.js";import{B as M}from"./basic-descriptions.17783a41.js";import"./status.0f771e9a.js";import"./tootip.c29898b9.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.600049da.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.17783a41.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.600049da.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.17783a41.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.b21d45df.js";import D from"./BaseForm.7c4831.js";import{P as g}from"./index.d8892d0a.js";import{a as h}from"./index.fcac3003.js";import"./status.0f771e9a.js";import"./InvoiceTitle.77bebe.js";import"./basic-descriptions.600049da.js";import"./index.08977e.js";import"./use-page-search.a9e96e45.js";import"./ChildGoodEditModal.7967d3.js";import"./columns.d0b7f00e.js";import"./tootip.50a62683.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.2f487ca5.js";import D from"./BaseForm.7c4831.js";import{P as g}from"./index.183c593f.js";import{a as h}from"./index.3e4a56da.js";import"./status.0f771e9a.js";import"./InvoiceTitle.77bebe.js";import"./basic-descriptions.17783a41.js";import"./index.08977e.js";import"./use-page-search.496e3eda.js";import"./ChildGoodEditModal.7967d3.js";import"./columns.eaa2d03d.js";import"./tootip.c29898b9.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,bu as ve,bv 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.e37201e8.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.ab3cca28.js";/*!
  * is-plain-object <https://github.com/jonschlinkert/is-plain-object>
  *
  * Copyright (c) 2014-2017, Jon Schlinkert.

src/components/Input/src/number.vue

@@ -17,14 +17,7 @@ function valid(value) {
 
 watch(
   () => modelValue.value,
-  value => {
-    const num =  valid(value)
-    if(props.max > num){
-      modelValue.value = props.max
-    } else {
-      modelValue.value = modelValue.value
-    }
-  }
+  value =>  modelValue.value = valid(value)
 );
 </script>
 

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

@@ -111,7 +111,7 @@ function handleEditGood(index: number, data: any) {
 async function submitForm(){
     try{
         await formRef.value?.validate()
-        const { orders, goods, month} = formData.value
+        const { orders, goods, month } = formData.value
 
         const parameter = {
             manager_id: orders.map(item => item.id),

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

@@ -0,0 +1,158 @@
+const columns = [
+  {
+    type: "index",
+    fixed: "left",
+    label: "序号",
+    width: "50"
+  },
+  {
+    label: '确认单编号',
+    prop: 'orderCode',
+    minWidth: '100px',
+    required: true,
+    defaultData: ''
+  },
+  {
+    label: '销售主单号',
+    prop: 'cxCode',
+    minWidth: '100px',
+    required: true,
+    defaultData: ''
+  },
+  {
+    label:'业务类型',
+    prop: 'type',
+    minWidth: '100px',
+    required: true,
+    defaultData: ''
+  },
+  {
+    label: '平台订单号',
+    prop: 'poCode',
+    minWidth: '120px',
+    required: true,
+    defaultData: ''
+  },
+  {
+    label: '销售方公司纳税号',
+    prop: 'seller_code',
+    minWidth: '130px',
+    required: true,
+    defaultData: ''
+  },
+  {
+    label: '销售方公司名称',
+    prop: 'seller_name',
+    minWidth: '130px',
+    required: true,
+    defaultData: ''
+  },
+  {
+    label: '购买方公司编号',
+    prop: 'buyer_code',
+    minWidth: '120px',
+    required: true,
+    defaultData: ''
+  },
+  {
+    label: '购买方公司名称',
+    prop: 'buyer_name',
+    minWidth: '120px',
+    required: true,
+    defaultData: ''
+  },
+  {
+    label: '商品类型',
+    prop: 'goodNo',
+    minWidth: '100px',
+    required: true,
+    defaultData: ''
+  },
+  {
+    label: '商品编号',
+    prop: 'goodNo',
+    minWidth: '100px',
+    defaultData: ''
+  },
+  {
+    label: '商品名称',
+    prop: 'goodName',
+    minWidth: '100px',
+    required: true,
+    defaultData: ''
+  },
+  {
+    label: '下单数量',
+    prop: 'num',
+    minWidth: '110px',
+    required: true,
+    defaultData: ''
+  },
+  {
+    label:'销售单价',
+    prop: 'goodPrice',
+    minWidth: '110px',
+    required: true,
+    defaultData: ''
+  },
+  {
+    label: '销售合计',
+    prop: 'totalPrice',
+    minWidth: '110px',
+    required: true,
+    defaultData: ''
+  },
+  {
+    label: '出库月份',
+    prop: 'fz_date',
+    minWidth: '80px',
+    required: true,
+    defaultData: ''
+  },
+  {
+    label: '关联商品ID',
+    prop: 'relaGoodNo',
+    minWidth: '110px',
+    required: true,
+    defaultData: ''
+  },
+  {
+    label: '操作数量',
+    prop: 'relaGoodNo',
+    minWidth: '100px',
+    required: true,
+    defaultData: ''
+  },
+  {
+    label: '子商品编号',
+    minWidth: '100px',
+    prop: 'childGoodNo',
+    defaultData: ''
+  },
+  {
+    label: '子商品数量',
+    minWidth: '100px',
+    prop: 'childGoodNo',
+    defaultData: ''
+  }
+]
+
+const notOrderTemplate = [columns.slice(1).reduce((prev, current) => {
+  return { ...prev, [current.label]: current.defaultData ? current.defaultData : '' }
+}, {})]
+
+
+export const mapLabelToProp = columns.reduce((prev, current) => ({
+  ...prev,
+  [current.label]: current.prop
+}), {})
+
+
+export const mapPropertyToLabel = columns.reduce((prev, current) => ({
+  ...prev,
+  [current.prop]: current.label
+}), {})
+
+export const requiredProps = columns.filter(column => !!column.required).map(item => item.prop)
+
+export { columns, notOrderTemplate };

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

@@ -0,0 +1,173 @@
+<script setup lang="ts">
+import { ref } from "vue";
+import { columns, mapLabelToProp } from "./columns-config";
+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 { isImportDataValid } from "./validator";
+import { useResponseHandle } from "/@/hooks";
+import { useVModel } from "@vueuse/core";
+
+
+const props = defineProps<{ visible: boolean }>()
+const emit = defineEmits(["refresh"]);
+
+const tableData = ref([]);
+const loading = ref(false);
+
+const visible = useVModel(props, 'visible')
+const responseHandle = useResponseHandle();
+
+const Uploadsuccess = ({ results, header }) => {
+  loading.value = true;
+  if (results.length === 0) {
+    ElMessage.error("表格无有效数据！");
+    loading.value = false;
+    return;
+  }
+
+  let headok = true;
+
+  if (header.length !== columns.length - 1) {
+    headok = false;
+  } else {
+    columns.slice(1).forEach((si, sii) => {
+      if (si.label !== header[sii]) { 
+        headok = false; 
+      }
+    });
+  }
+
+  if (!headok) {
+    ElMessage.error("表头与导入模板不匹配！");
+    loading.value = false;
+    return;
+  }
+
+  tableData.value = [];
+
+  const result = []
+  for(const tableItem of results){
+    const item = {}
+    Object.keys(tableItem).forEach(label => {
+      const prop = mapLabelToProp[label]
+      item[prop] = tableItem[label]
+    })
+    result.push(item)
+  }
+
+  if(isImportDataValid(result)){ tableData.value = result }
+  loading.value = false;
+};
+
+//提交
+const handleSubmit = async () => {
+  try {
+    if (loading.value) return;
+    loading.value = true;
+
+    const list = [];
+
+    tableData.value.forEach(item => {
+      list.push({ 
+        ...item, 
+        inv_type: mapLabelToInvtype[item.inv_type],
+        relaArr: [{ id: 1, num: item.num }],
+        type: mapLabelToType[item.type],
+        platform_type: '2',
+        goodType: '1',
+        cat_code: '0',
+        cat_name: '0',
+        channel: '3',
+        source: '1',
+        unit: '0',
+        tax: '0',
+        inv_tax: '0',
+        inv_cat_code: '0'
+      })
+    })
+
+    const { code, message, data: _d } = await httpAdd({ list });
+
+    loading.value = false;
+
+    responseHandle({
+      code,
+      message,
+      noMessage: false,
+      handler: () => {
+        ElMessage.success("数据导入成功！");
+        emit("refresh");
+        visible.value = false;
+      }
+    });
+  } catch (err) { 
+    console.log(err)
+  }
+};
+const cancel = () => {
+  tableData.value = [];
+};
+</script>
+
+<template>
+  <ElDialog
+    v-model="visible"
+    :close-on-click-modal="false"
+    title="C端无发票非订单出库"
+    width="1040px"
+    top="8vh"
+    center
+  >
+    <execlUpload style="margin-bottom: 10px" @on-success="Uploadsuccess" v-if="tableData.length === 0" />
+
+    <el-table
+      :data="tableData"
+      stripe
+      border
+      max-height="500px"
+      size="small"
+      style="width: 100%"
+    >
+      <el-table-column
+        v-for="(si, sii) in columns"
+        :minWidth="si.minWidth"
+        show-overflow-tooltip
+        :fixed="si.fixed"
+        :prop="si.prop"
+        :type="si.type"
+        :key="sii"
+      >
+        <template #header>
+          <span v-if="!si.required">
+            {{ si.label }}
+          </span>
+          
+          <p v-else>
+            <span style="color: #f56c6c; font-size: 14px">* </span>
+            {{ si.label }}
+          </p>
+        </template>
+      </el-table-column>
+    </el-table>
+    <div
+      flex
+      justify-end
+      gap-2
+      v-if="tableData.length !== 0"
+      style="padding: 10px 0 0 0"
+    >
+      <ElButton size="small" @click="cancel">取消</ElButton>
+      <ElButton
+        size="small"
+        type="primary"
+        :loading="loading"
+        @click="handleSubmit"
+      >保存</ElButton>
+    </div>
+  </ElDialog>
+</template>
+
+<style lang="scss" scoped></style>

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

@@ -0,0 +1,76 @@
+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"
+
+function onDisplayErrorMessage(errors) {
+    ElMessageBox({
+        type: 'warning',
+        title: '数据校验失败',
+        message: h('div', { style: 'display: flex, flex-direction: column' }, {
+            default: () => Object.keys(errors).reduce((prev, index) => {
+                return [
+                    ...prev,
+                    h('p', {}, '第' + index  + '行,' + errors[index])
+                ]
+            }, [])
+        })
+    })
+}
+
+
+export function isValidRequired(results: any[]) {
+    const errors = {}
+
+    let isTypeError = false
+    let isSourceError = false
+    let isInvError = false
+
+    for (const sourceIndex in results) {
+        const item = results[sourceIndex];
+        const index = Number(sourceIndex) + 1;
+
+        for (const key in item) {
+            const value = String(item[key]).trim()
+            if (requiredProps.includes(key) && (!value || !String(value).trim())) {
+                if (errors[index]) {
+                    errors[index] = errors[index] += '、' + mapPropertyToLabel[key]
+                } else {
+                    errors[index] = mapPropertyToLabel[key]
+                }
+            } else if (key === 'type' && !mapLabelToType[value]){
+                isTypeError = true
+            } else if (key === 'source' && !mapLabelToSource[value]) {
+                isSourceError = true
+            } else if (key === 'inv_type' && !mapLabelToInvtype[value]){
+                isInvError = true
+            }
+        }
+
+        if (errors[index]) {
+            errors[index] += '不能为空'
+            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('、')
+        } 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 (Object.keys(errors).length === 0) {
+        return true
+    } else {
+        onDisplayErrorMessage(errors)
+        return false
+    }
+}
+
+export function isImportDataValid(results: any[]) {
+    /* 校验必填字段是否填入 */
+    if (!isValidRequired(results)) { return false }
+    return true
+}

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

@@ -61,6 +61,13 @@ const columns = [
     required: true,
     defaultData: ''
   },
+  {
+    label: '商品类型',
+    prop: 'goodNo',
+    minWidth: '100px',
+    required: true,
+    defaultData: ''
+  },
   {
     label: '商品编号',
     prop: 'goodNo',

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

@@ -62,14 +62,14 @@ const columns = [
     }
   },
   {
-    label: "卖出方公司",
+    label: "销售方公司",
     width: 160,
-    ...renderIconLabelLeft('seller_code', 'seller_name', '卖出方公司编号：')
+    ...renderIconLabelLeft('seller_code', 'seller_name', '销售方公司编号:')
   },
   {
-    label: "客户公司",
+    label: "购买方公司",
     width: 160,
-    ...renderIconLabelLeft('buyer_code', 'buyer_name', '客户公司编号:')
+    ...renderIconLabelLeft('buyer_code', 'buyer_name', '购买方公司编号:')
   },
   {
     label: '商品名称',

src/views/invoiceInOut/clientC/index.vue

@@ -3,14 +3,17 @@ import { reactive, ref } from "vue";
 import { useRouter } from "vue-router";
 import { usePageSearch, type PageHooks, type PageEvents } from "/@/hooks/page";
 import OrderImportModal from "./components/OrderImportModal/index.vue"
-import { orderTemplate } from "./components/OrderImportModal/columns-config"
+import NotOrderImportModal from "./components/NotOrderImportModal/index.vue"
 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 } from "element-plus";
+import { ElButton, ElDropdown } from "element-plus";
 import { useUserInfo } from "/@/hooks/core/useUser";
 
+import { orderTemplate } from "./components/OrderImportModal/columns-config"
+import { notOrderTemplate } from "./components/NotOrderImportModal/columns-config"
+
 
 const PageName = "inOutManager";
 const router = useRouter();
@@ -29,55 +32,52 @@ const events: PageEvents = {
   }
 };
 
-function handleDownloadTemplate(){
+function handleDownloadTemplate(isOrder = false){
+  const data = isOrder ? orderTemplate : notOrderTemplate
+  const name = isOrder ? 'C端无发票订单出库模板.xlsx' : 'C端无发票非订单出库模板.xlsx'
+
   const workBook = utils.book_new()
-  const workSheet = utils.json_to_sheet(orderTemplate)
+  const workSheet = utils.json_to_sheet(data)
   utils.book_append_sheet(workBook, workSheet, 'sheet');
-  writeFile(workBook, 'C端无发票订单出库模板.xlsx', { bookType: 'xlsx' })
+  writeFile(workBook, name, { bookType: 'xlsx' })
 }
 </script>
 
 <template>
   <PageAuth :pageName="PageName">
-    <PageContainer 
-      :hooks="hooks" 
-      :events="events" 
-      :searchConfig="searchConfig" 
-      :contentConfig="contentConfig"
+    <PageContainer :hooks="hooks" :events="events" :searchConfig="searchConfig" :contentConfig="contentConfig"
       :get-content-ref="ref => pageContentRef = ref">
       <template #content_header>
-        <ElButton
-          v-if="!isSuperUser"
-          size="small" 
-          type="primary" 
-          style="margin-right: 10px;margin-top:1px"
-          :icon="useRenderIcon('arrow-up-line')" 
-          @click="state.orderImportVisible = true"
-        >C端无发票订单出库导入
-        </ElButton>
+        <ElDropdown>
+          <ElButton v-if="!isSuperUser" size="small" type="primary" style="margin-right: 10px;margin-top:1px"
+            :icon="useRenderIcon('arrow-up-line')">C端无发票订单出库导入
+          </ElButton>
 
-        <ElButton 
-          size="small" 
-          style="margin-right: 10px;margin-top:1px" 
-          @click="handleDownloadTemplate"
-          :icon="useRenderIcon('arrow-down-line')"
-        >C端无发票订单出库模板
-        </ElButton>
- 
-        <ElButton
-         v-if="!isSuperUser"
-          size="small" 
-          type="primary"
-          @click="router.push('/invoiceInOut/clinetCDetail')"
-        >批量审核
+          <template #dropdown>
+            <ElDropdownItem @click="state.orderImportVisible = true">订单导入</ElDropdownItem>
+            <ElDropdownItem @click="state.notOrderImportVisible = true">非订单导入</ElDropdownItem>
+          </template>
+        </ElDropdown>
+
+        <ElDropdown>
+          <ElButton size="small" style="margin-right: 10px;margin-top:1px" :icon="useRenderIcon('arrow-down-line')">
+            C端无发票订单出库模板
+          </ElButton>
+
+          <template #dropdown>
+            <ElDropdownItem @click="handleDownloadTemplate(true)">订单导入</ElDropdownItem>
+            <ElDropdownItem @click="handleDownloadTemplate(false)">非订单导入</ElDropdownItem>
+          </template>
+        </ElDropdown>
+
+        <ElButton v-if="!isSuperUser" size="small" type="primary" @click="router.push('/invoiceInOut/clinetCDetail')">
+          批量审核
         </ElButton>
       </template>
-
-      <!-- <template #content_action="{ row }">
-        <ElButton type="danger" :icon="useRenderIcon('delete')" />
-      </template> -->
     </PageContainer>
 
     <OrderImportModal v-model:visible="state.orderImportVisible" @refresh="pageContentRef?.onSearch()" />
+
+    <NotOrderImportModal v-model:visible="state.notOrderImportVisible" @refresh="pageContentRef?.onSearch()" />
   </PageAuth>
 </template>

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

@@ -77,7 +77,7 @@ const Uploadsuccess = ({ results, header }) => {
       // } else {
       // }
 
-      item[prop] = value
+      item[prop] = value.trim()
     })
 
     result.push(item)

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

@@ -68,7 +68,7 @@ const Uploadsuccess = ({ results, header }) => {
         value = value.replace(')', '）')
       }
 
-      item[prop] = value
+      item[prop] = value.trim()
     })
 
     result.push(item)

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

@@ -312,7 +312,7 @@ const contentConfig: ContentConfig = {
   columns,
   title: "商品管理",
   permissions: ['007'],
-  companyProp: 'inv_buyer_code',
+  companyProp: 'buyer_code',
   apis: { 
     httpList: (parameter = {}) => httpList({ ...parameter, channel: [1, 2], type: [1, 3] }),
     httpAdd: true

src/views/invoiceInOut/inManager/index.vue

@@ -50,16 +50,16 @@ function onDownload(type = 'notOrder'){
 }
 
 
-function handleRefresh(){
-  if(selection.value.length === 0){
-    ElMessage.warning('请选择至少一条状态为 "待审核" 的数据')
+function handleRefresh() {
+  if (selection.value.length === 0) {
+    ElMessage.warning('请选择至少一条状态为 "待审核" 或 "异常" 的数据')
     return
   }
 
-  const isStatusNotOk = selection.value.some(({ status }) => status != '1')
+  const isStatusNotOk = selection.value.some(({ status }) => status != '1' && status != '4')
 
-  if(isStatusNotOk){
-    ElMessage.warning('只能选择状态为 "待审核" 的数据')
+  if (isStatusNotOk) {
+    ElMessage.warning('只能选择状态为 "待审核" 或 "异常" 的数据')
     return
   }
 

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

@@ -65,9 +65,11 @@ const columns = [
     prop: "status",
     width: 80,
     cellRenderer({ row }){
-      return h(ElTag, { size: 'small', type: statusList.find(item => item.value == row.status)?.type || 'warning' }, {
-        default: () => statusList.find(item => item.value == row.status)?.label || '--'
-      })
+      return h(
+        ElTag, 
+        { size: 'small', type: statusList.find(item => item.value == row.status)?.type || 'warning' }, 
+        { default: () => statusList.find(item => item.value == row.status)?.label || '--' }
+    )
     }
   },
   {
@@ -104,7 +106,7 @@ const columns = [
 
 const contentConfig: ContentConfig = {
   columns,
-  companyProp: 'seller_code',
+  companyProp: 'buyer_code',
   apis: { 
     httpList: (parameter = {}) => httpList({ ...parameter, status: '1' })
   }

src/views/invoiceInOut/outManager/detail.vue

@@ -137,15 +137,27 @@ async function onSubmit() {
       }
     }
 
-    loading.value = true
+    if( Number(detailTask.data.balance_num) !== Number(total.value)){
+      ElMessage.warning('操作数量必须等于待处理数量')
+      return
+    }
+
+    const list = formData.value.goods.filter(item => !!item.num)
+
 
+    if(list.length !== 0){
+      ElMessage.warning('商品操作数量不能为空')
+      return
+    }
+
+
+    loading.value = true
     const { code, message } = await httpStatus({ 
       relaArr, 
       manager_id: id.value,
       is_checkOrder: hasJT.value ? '1' : '0',
       fz_date: formData.value.month
     })
-   
     loading.value = false
 
     if (code == 0) {
@@ -164,30 +176,22 @@ function handleEditGood(index, data) {
   formData.value.goods.forEach((item, index) => {
     if (item.id === id) {
       formData.value.goods[index].goodNum = data.goodNum
+      const { goodNum, residue_stock } = data
+      formData.value.goods[index].isJT = goodNum > residue_stock
       if (formData.value.goods[index].childNum) { 
+        formData.value.goods[index].isJT = goodNum > residue_stock
         formData.value.goods[index].childActionNum = formData.value.goods[index].childNum * data.goodNum 
       }
     }
   })
 }
 
-
 function handleShowDetail(id, index){
   productVisible.value = true
   productIndex.value = index
   productDetailTask.run(httpProductDetail({ id }))
 }
 
-function handleAddTJProduct(){
-  if(hasJT.value){
-    ElMessage.warning('只能添加一条计提商品')
-    return
-  } else {
-    isJT.value = true
-    visible.value = true
-  }
-}
-
 function handleDelete(index) {
   const { id } = formData.value.goods[index]
   formData.value.goods = formData.value.goods.filter((item) => item.id !== id)
@@ -204,7 +208,7 @@ id.value && detailTask.run(httpDetail({ id: id.value }))
         <BasicDescriptions :columns="orderGoodColumns" :data="detailTask.data" v-if="detailTask.data" />
       </ElCollapseItem>
 
-      <ElCollapseItem :title="'订单详情'" name="2">
+      <ElCollapseItem title="订单详情" name="2">
         <BasicDescriptions v-if="detailTask.data" :columns="importOrderGoodColumns" :data="detailTask.data" />
       </ElCollapseItem>
 
@@ -217,7 +221,7 @@ id.value && detailTask.run(httpDetail({ id: id.value }))
           <ElTableColumn label="商品ID" prop="product_id" width="60px" show-overflow-tooltip />
           <ElTableColumn label="商品编号" prop="skuCode" show-overflow-tooltip />
           <ElTableColumn label="商品名称" prop="goodName" show-overflow-tooltip />
-          <ElTableColumn label="操作数量" prop="num" show-overflow-tooltip />
+          <ElTableColumn label="操作数量" prop="num" width="60px" show-overflow-tooltip />
           <ElTableColumn label="创建时间" prop="create_time" show-overflow-tooltip />
           <ElTableColumn label="操作" width="100px">
             <template #="scope">
@@ -233,7 +237,7 @@ id.value && detailTask.run(httpDetail({ id: id.value }))
       <ElCollapseItem name="5" title="待处理信息" v-if="!isSuperUser && detailTask.data && (detailTask.data.status == '1' || detailTask.data.status == '4')">
         <div class="w-full flex justify-between mb-[10px]">
           <p>待处理 {{ Number(detailTask.data.balance_num) }} / {{ total }}</p>
-          <ElButton type="primary" size="small" @click="handleAddTJProduct">添加计提商品</ElButton>
+          <!-- <ElButton type="primary" size="small" @click="handleAddTJProduct">添加计提商品</ElButton> -->
         </div>
 
         <ElForm ref="formRef" :rules="rules" :model="formData">
@@ -242,7 +246,6 @@ id.value && detailTask.run(httpDetail({ id: id.value }))
               <ElTableColumn label="商品ID" prop="id" width="60px" show-overflow-tooltip />
               <ElTableColumn label="商品编号" prop="skuCode" show-overflow-tooltip />
               <ElTableColumn label="商品名称" prop="goodName" show-overflow-tooltip />
-              <ElTableColumn label="操作数量" prop="goodNum" show-overflow-tooltip />
 
               <ElTableColumn label="是否为计提" prop="residue_stock" width="80px" show-overflow-tooltip>
                 <template #="{ row }">
@@ -251,8 +254,10 @@ id.value && detailTask.run(httpDetail({ id: id.value }))
               </ElTableColumn>
 
               <ElTableColumn label="结存数" prop="residue_stock" width="80px" show-overflow-tooltip />
+              <ElTableColumn label="操作数量" prop="goodNum" show-overflow-tooltip />
+
               <ElTableColumn label="子商品编号" prop="childCode" show-overflow-tooltip />
-              <ElTableColumn label="销售方公司纳税识别号" width="140px" prop="seller_code" 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 />
 
@@ -282,7 +287,6 @@ id.value && detailTask.run(httpDetail({ id: id.value }))
             </ElTable>
           </ElFormItem>
 
-          <!-- :company_code="detailTask.data.buyer_code" -->
           <ElFormItem label="入账月份" prop="month">
             <SealMonthPicker placeholder="入账月份" v-model="formData.month" />
           </ElFormItem>
@@ -294,10 +298,16 @@ id.value && detailTask.run(httpDetail({ id: id.value }))
       </ElCollapseItem>
     </ElCollapse>
 
-    <ChooseGoodModal v-model:visible="visible" :isJT="isJT" :otherSearchParameter="searchParameter"
+    <ChooseGoodModal 
+      v-model:visible="visible" 
+      :isJT="isJT" 
+      :otherSearchParameter="searchParameter"
       @submit="handleGoodComfirm" :skuCode="notJTList.length === 0 ? '' : notJTList[0].skuCode" />
 
-    <ChildGoodEditModal :data="state.data" :index="state.index" v-model:visible="state.editVisible"
+    <ChildGoodEditModal 
+      :data="state.data" 
+      :index="state.index" 
+      v-model:visible="state.editVisible"
       @submit="handleEditGood" />
 
     <ElDialog center title="商品详情" v-model="productVisible" style="overflow: hidden">

src/views/invoiceInOut/outManager/index.vue

@@ -51,14 +51,14 @@ function onDownload(type = 'notOrder'){
 
 function handleRefresh() {
   if (selection.value.length === 0) {
-    ElMessage.warning('请选择至少一条状态为 "待审核" 的数据')
+    ElMessage.warning('请选择至少一条状态为 "待审核" 或 "异常" 的数据')
     return
   }
 
-  const isStatusNotOk = selection.value.some(({ status }) => status != '1')
+  const isStatusNotOk = selection.value.some(({ status }) => status != '1' && status != '4')
 
   if (isStatusNotOk) {
-    ElMessage.warning('只能选择状态为 "待审核" 的数据')
+    ElMessage.warning('只能选择状态为 "待审核" 或 "异常" 的数据')
     return
   }