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.74e1d0e1.js";import{B as M}from"./basic-descriptions.a5cba8df.js";import"./status.0f771e9a.js";import"./tootip.a6be8195.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.ed9d6b16.js";import{B as M}from"./basic-descriptions.2096329f.js";import"./status.0f771e9a.js";import"./tootip.b7af089c.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.a5cba8df.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.2096329f.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.a5cba8df.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.2096329f.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.5366cdd6.js";import D from"./BaseForm.a7e0bd.js";import{P as g}from"./index.6d6428f7.js";import{a as h}from"./index.bca9d5b5.js";import"./status.0f771e9a.js";import"./InvoiceTitle.77bebe.js";import"./basic-descriptions.a5cba8df.js";import"./index.08977e.js";import"./use-page-search.557115d0.js";import"./ChildGoodEditModal.7967d3.js";import"./columns.74e1d0e1.js";import"./tootip.a6be8195.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.7deb0644.js";import D from"./BaseForm.b62d36.js";import{P as g}from"./index.e06f236f.js";import{a as h}from"./index.e803b35d.js";import"./status.0f771e9a.js";import"./InvoiceTitle.77bebe.js";import"./basic-descriptions.2096329f.js";import"./index.7b02df.js";import"./use-page-search.feedadc7.js";import"./ChildGoodEditModal.7967d3.js";import"./columns.ed9d6b16.js";import"./tootip.b7af089c.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.4d99830a.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.8c131975.js";/*!
  * is-plain-object <https://github.com/jonschlinkert/is-plain-object>
  *
  * Copyright (c) 2014-2017, Jon Schlinkert.

dist/assets/shared.4f9e44f6.js

@@ -0,0 +1 @@
+const e=[{label:"\u62AC\u5934",span:24,field:"invoice_title"},{label:"\u7EB3\u7A0E\u4EBA\u8BC6\u522B\u53F7",span:24,field:"invoice_code"}],u=()=>({product_id:"",check_type:"1",check_num:"0",fz_date:""}),r={product_id:[{required:!0,message:"\u8BF7\u9009\u62E9\u5546\u54C1",trigger:"change"}],check_type:[{required:!0,message:"\u8BF7\u9009\u62E9\u7ED3\u679C\u7C7B\u578B",trigger:"change"}],check_num:[{required:!0,message:"\u8BF7\u8F93\u5165\u76D8\u70B9\u6570\u91CF",trigger:"change"}],fz_date:[{required:!0,message:"\u8BF7\u9009\u62E9\u5165\u8D26\u6708\u4EFD",trigger:"change"}]};export{u as c,e as i,r};

dist/assets/shared.80186348.js

@@ -1 +0,0 @@
-const e=[{label:"\u62AC\u5934",span:24,field:"invoice_title"},{label:"\u7EB3\u7A0E\u4EBA\u8BC6\u522B\u53F7",span:24,field:"invoice_code"}],u=()=>({product_id:"",check_type:"",check_num:"0",fz_date:""}),r={product_id:[{required:!0,message:"\u8BF7\u9009\u62E9\u5546\u54C1",trigger:"change"}],check_type:[{required:!0,message:"\u8BF7\u9009\u62E9\u7ED3\u679C\u7C7B\u578B",trigger:"change"}],check_num:[{required:!0,message:"\u8BF7\u8F93\u5165\u76D8\u70B9\u6570\u91CF",trigger:"change"}],fz_date:[{required:!0,message:"\u8BF7\u9009\u62E9\u5165\u8D26\u6708\u4EFD",trigger:"change"}]};export{u as c,e as i,r};

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

@@ -4,7 +4,7 @@ import ChooseOrderModal from "./../ChooseOrderModal/index.vue"
 import { statusOptions, typeOptions } from '../../config/shared';
 import { ElButton, ElForm, ElMessage, ElTooltip } from 'element-plus';
 import { useTypeOptions } from '/@/utils/status';
-import { reactive, ref } from 'vue';
+import { computed, reactive, ref } from 'vue';
 
 import ChooseGoodModal from "./../ChooseGoodModal/index.vue"
 import ChildGoodEditModal from "./../ChildGoodEditModal.vue";
@@ -127,9 +127,16 @@ async function submitForm(){
             return
         }
 
+        const list = formData.value.goods.filter(item => !!item.goodNum)
+        if (list.length === 0) {
+            ElMessage.warning('商品操作数量不能为空')
+            return
+        }
+
         const parameter = {
             manager_id: orders.map(item => item.id),
-            idArr: goods.map(item => ({ id: item.id, num: item.goodNum, unit_price: item.unit_price, subunit_price: item.subunit_price })),
+            is_checkOrder: hasJT.value ? '1' : '0',
+            relaArr: goods.map(item => ({ id: item.id, num: item.goodNum, unit_price: item.unit_price, subunit_price: item.subunit_price })),
             fz_date: month,
 
         }
@@ -140,6 +147,11 @@ async function submitForm(){
     }
 }
 
+const hasJT = computed(() => {
+    const relaArrCopy = formData.value.goods.map(({ id, goodNum, isJT }) => ({ id, num: goodNum, isJT }))
+    return relaArrCopy.some(({ isJT }) => isJT)
+})
+
 
 const rules = {
     orders: [{ required: true, message: '请选择toC订单信息', trigger: 'change' }],
@@ -211,21 +223,34 @@ const rules = {
 
         <ElFormItem label="操作商品" prop="goods">
             <ElTable :span-method="spanMethod" border size="small" :data="formData.goods">
+                <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="residue_stock" width="80px" show-overflow-tooltip>
+                    <template #="{ row }">
+                        {{ row.isJT ? '是' : '否' }}
+                    </template>
+                </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="是否计提" show-overflow-tooltip />
                 <!-- <ElTableColumn label="销售方公司纳税识别号" width="140px" prop="seller_code" show-overflow-tooltip /> -->
                 <ElTableColumn label="子商品比例" prop="childNum" show-overflow-tooltip />
-                <ElTableColumn label="子商品操作数量" prop="childActionNum" show-overflow-tooltip />
+                <ElTableColumn label="子商品操作数量" prop="childActionNum" width="110px" show-overflow-tooltip />
 
                 <ElTableColumn width="70px" label="操作">
                     <template #header>
                         <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>
@@ -237,7 +262,6 @@ const rules = {
                                 @click="handleChildGoodEdit($index)" />
                         </ElTooltip>
 
-
                         <ElTooltip content="删除" placement="top">
                             <ElButton :icon="useRenderIcon('delete')" type="danger" size="small" link
                                 @click="handleDelete($index)" />

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

@@ -7,7 +7,13 @@ import { useVModel } from "@vueuse/core";
 import { useRouter } from "vue-router";
 import { ref } from "vue";
 
-const props = defineProps<{ visible: boolean }>()
+const props = defineProps<{
+  visible: boolean;
+  otherSearchParameter: any;
+  skuCode?: string
+  isJT: boolean
+}>()
+
 const emit = defineEmits(['submit'])
 
 const visible = useVModel(props, 'visible')
@@ -17,7 +23,7 @@ const hooks: PageHooks = {
   pageSearchHook: () => usePageSearch(undefined, undefined, searchConfig)
 };
 
-const selection= ref([])
+const selection = ref([])
 
 const events: PageEvents = {
   content: {
@@ -26,43 +32,64 @@ const events: PageEvents = {
   }
 };
 
-function handleSubmit(){
-   if(selection.value.length === 0){
-       ElMessage.warning('请选择至少一个商品')
-       return
-   }
+function handleSubmit() {
+  if (selection.value.length === 0) {
+    ElMessage.warning('请选择至少一个商品')
+    return
+  }
+
+  // const selectNoTotal = selection.value.filter(({ residue_stock }) => !residue_stock)
+  // if (selectNoTotal.length !== 0) {
+  //   ElMessage.warning(`商品${selectNoTotal.map(({ skuCode }) => skuCode).join('、')}结存数量为空`)
+  //   return
+  // }
+
+  if (props.isJT) {
+    if (selection.value.length > 1) {
+      ElMessage.warning('只能选择一条计提商品')
+      return
+    }
+  } else {
+    const skuCodes = [...new Set(selection.value.map(({ skuCode }) => skuCode))]
+    if (skuCodes.length !== 1) {
+      ElMessage.warning('选择的商品的商品编号必须一致')
+      return
+    }
+
+    if (props.skuCode && skuCodes[0] !== props.skuCode) {
+      ElMessage.warning('选择的商品的商品编号必须和当前选择商品的商品编号必须一致')
+      return
+    }
+  }
 
-   const result = []
-   selection.value.forEach(single => {
-      if (single.ProductsCombind.length === 0) { 
-        result.push({ ...single, goodNum: 1 })
-      } else {
-        single.ProductsCombind.forEach(child => {
-          result.push({ ...single, goodNum: 1 ,childCode: child.products.skuCode, childNum: single.child_num, childActionNum: single.child_num })
+  const result = []
+  selection.value.forEach(single => {
+    if (single.ProductsCombind.length === 0) {
+      result.push({ ...single, goodNum: '', isJT: props.isJT })
+    } else {
+      single.ProductsCombind.forEach(child => {
+        result.push({
+          ...single,
+          isJT: props.isJT,
+          goodNum: '',
+          childCode: child.products.skuCode,
+          childNum: single.child_num,
+          childActionNum: ''
         })
-      }
-   })
+      })
+    }
+  })
 
-   visible.value = false
-   emit('submit', result)
+  visible.value = false
+  emit('submit', result)
 }
 </script>
 
 <template>
-    <ElDialog class="relative" v-model="visible" title="选择商品" center top="10px">
-      <PageContainer
-        v-if="visible"
-        :hooks="hooks"
-        :events="events"
-        :searchConfig="searchConfig"
-        :contentConfig="contentConfig"
-        :isPageStart="true"
-        @content-select-change="values => selection = values.map(item => ({ ...item, child_num: '1', child_id: item.id }))"
-      />
-      <ElButton 
-        class="absolute bottom-[30px] right-[20px]" 
-        type="primary"
-        @click="handleSubmit"
-       >保存 </ElButton>
-    </ElDialog>
+  <ElDialog class="relative" v-model="visible" :title="isJT ? '添加计提商品' : '选择商品'" center top="10px">
+    <PageContainer :only-self="true" v-if="visible" :hooks="hooks" :events="events" :searchConfig="searchConfig"
+      :contentConfig="contentConfig" :isPageStart="true" :other-search-parameter="otherSearchParameter"
+      @content-select-change="values => selection = values.map(item => ({ ...item, child_num: '1', child_id: item.id }))" />
+    <ElButton class="absolute bottom-[30px] right-[20px]" type="primary" @click="handleSubmit">保存 </ElButton>
+  </ElDialog>
 </template>

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

@@ -32,7 +32,13 @@ function handleSubmit(){
        return
    }
 
-   visible.value = false
+  const skuCodes = [...new Set(selection.value.map(({ goodNo }) => goodNo))]
+  if (skuCodes.length !== 1) {
+    ElMessage.warning('选择的订单的商品编号必须一致')
+    return
+  }
+
+  visible.value = false
    emit('submit', selection.value)
 }
 </script>

src/views/invoiceInOut/clientC/detail.vue

@@ -12,6 +12,7 @@ import { useTask } from "/@/hooks/core";
 import { useRenderIcon } from "/@/components/ReIcon/src/hooks";
 import { httpProductDetail } from "/@/api/invoiceInOut/inventoryCheck";
 import ProductDetail from "/@/components/ProductDetail/index.vue"
+import { ElTableColumn } from "element-plus";
 
 const { title, collapses, id, isDetail } = useDetail({ baseName: "C端无发票订单出库", collapseLen: 2 });
 

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

@@ -29,6 +29,7 @@ export function isValidRequired(results: any[]) {
     let isTaxDiffError = false
     let isCatDiffError = false
     let isGoodType = false
+    let isNumberError = false
 
     for (const sourceIndex in results) {
         const item = results[sourceIndex];

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

@@ -76,6 +76,10 @@ const Uploadsuccess = ({ results, header }) => {
 
   const license = getCurrentLicense()
   const inv_buyer_codes = [...new Set(result.map(({ inv_buyer_code }) => inv_buyer_code))]
+
+  console.log(inv_buyer_codes[0],license )
+
+  
   if(inv_buyer_codes.length !== 1){
     ElMessage.warning('导入数据的购买方公司必须一致')
     return

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

@@ -29,6 +29,7 @@ export function isValidRequired(results: any[]) {
     let isTaxDiffError = false
     let isCatDiffError = false
     let isGoodType = false
+    let isNumberError = false
 
     for (const sourceIndex in results) {
         const item = results[sourceIndex];
@@ -54,6 +55,8 @@ export function isValidRequired(results: any[]) {
                 isCatDiffError = true
             } else if (key === 'goodType' && !mapGoodTypeToLabel[value]) {
                 isGoodType = true
+            } else if (key === 'inv_num' && (!value || Number(value) === 0)){
+                isNumberError = true
             }
 
         }
@@ -67,12 +70,14 @@ export function isValidRequired(results: any[]) {
             if (isCatDiffError) 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 (isNumberError) errors[index] += ' ,订单商品发票数量不能为0'
         } else {
             if (isTypeError) errors[index] = '类型必须为' + typeOptions.map(({ label }) => label).join('、')
             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] = ' 商品类型必须为' + cg_order_type_options.map(({ label }) => label).join('、')
+            if (isNumberError) errors[index] = ' 订单商品发票数量不能为0'
         }
     }
 

src/views/invoiceInOut/inventoryCheck/components/BaseForm.vue

@@ -34,6 +34,11 @@ const disabledDate = (time) => {
   return time.getTime() > now.setHours(0, 0, 0, 0);
 };
 
+const rulesRef = computed(() => ({
+  ...rules,
+  fz_date: [{ required: formData.value.check_type == '2', message: '请选择调整单入账月份', trigger: 'change' }]
+}))
+
 const router = useRouter()
 const formRef = ref<InstanceType<typeof ElForm> | null>(null)
 
@@ -98,7 +103,7 @@ function handleChoose(){
 </script>
 
 <template>
-  <ElForm ref="formRef" :rules="rules" :model="formData" v-loading="createTask.loading" label-width="140px">
+  <ElForm ref="formRef" :rules="rulesRef" :model="formData" v-loading="createTask.loading" label-width="78px">
     <ElRow>
       <ElCol :span="24">
         <ElFormItem label="商品信息" prop="product_id">
@@ -116,39 +121,39 @@ function handleChoose(){
         </ElFormItem>
       </ElCol>
 
-      <ElCol :span="6" v-if="detail">
+
+
+      <ElCol :span="6">
         <ElFormItem label="账面数量">
-          {{ detail?.residue_stock || 0 }}
-        </ElFormItem>
-      </ElCol>
-      <ElCol :span="6" v-if="detail">
-        <ElFormItem label="税前单价">
-          {{ detail?.subunit_price || 0 }}
+          {{ detail?.residue_stock || '' }}
         </ElFormItem>
       </ElCol>
 
-      <ElCol :span="12"></ElCol>
 
-      <ElCol :span="24">
+      <ElCol :span="6">
         <ElFormItem label="盘点数量" prop="check_num">
           <NumberInput v-model="formData.check_num" placeholder="盘点数量" />
         </ElFormItem>
       </ElCol>
 
-      <ElCol :span="24">
+
+      <ElCol :span="6">
         <ElFormItem label="盈亏数量" prop="ykNum">
           {{ reComputedNumber.ykNum }}
         </ElFormItem>
       </ElCol>
 
-      <ElCol :span="24">
+
+      <ElCol :span="6">
         <ElFormItem label="盈亏金额" prop="ykPrice">
           <!-- =(账面数量-盘点数量) * 税前单价 -->
           {{ reComputedNumber.yKPrice }}
         </ElFormItem>
       </ElCol>
 
-      <ElCol :span="24">
+
+
+      <ElCol :span="12">
         <ElFormItem label="结果类型" prop="check_type">
           <ElSelect v-model="formData.check_type" placeholder="结果类型">
             <ElOption :disabled="reComputedNumber.yKPrice == 0" label="调整单" value="2" />
@@ -158,10 +163,11 @@ function handleChoose(){
         </ElFormItem>
       </ElCol>
 
-      <ElCol :span="24">
-        <ElFormItem label="调整单入账月份" prop="fz_date">
-          <ElDatePicker type="month" placeholder="入账月份" v-model="formData.fz_date" :disabledDate="disabledDate"
-            value-format="YYYY-MM" />
+      <ElCol :span="12" v-if="formData.check_type == '2'">
+        <ElFormItem 
+          label=" 调整单入账月份" label-width="140px" prop="fz_date">
+        <ElDatePicker type="month" placeholder="入账月份" v-model="formData.fz_date" :disabledDate="disabledDate"
+          value-format="YYYY-MM" />
         </ElFormItem>
       </ElCol>
     </ElRow>

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

@@ -4,6 +4,8 @@ import { httpList } from "/@/api/invoiceInOut/productManager";
 import { cg_order_type_options, statusList } from "/@/utils/status";
 import { ElTag } from "element-plus";
 import { h } from "vue";
+import { renderIconLabelLeft } from "/@/utils/columnRenderHelper";
+import { basicStatusOptions } from "/@/views/invoiceInOut/productManager/config/columns";
 
 const columns = [
   {
@@ -11,55 +13,57 @@ const columns = [
     type: 'selection',
     fixed: 'left'
   },
+  {
+    label: "ID",
+    prop: "id",
+    width: 80
+  },
   {
     label: "商品编码",
     prop: "skuCode",
     width: 150
   },
   {
-    label: "销售方公司",
-    prop: "seller_name",
-    width: 160
-  },
-  {
-    label: "购买方公司",
-    prop: "buyer_name",
-    width: 160
+    label: '商品名称',
+    prop: 'goodName',
+    width: 150
   },
   {
     label: '商品类型',
     width: 100,
-    cellRenderer({ row }){
+    cellRenderer({ row }) {
       return h(ElTag, { size: 'small' }, {
         default: () => cg_order_type_options.find(item => item.value == row.good_type)?.label || '--'
       })
     }
   },
   {
-    label: '商品名称',
-    prop: 'goodName',
-    width: 150
-  },
-  {
-    label: "规格",
-    prop: "spec",
-    width: 80
-  },
-  {
-    label: "单位",
-    prop: "unit",
+    label: '结存数',
+    prop: 'residue_stock',
     width: 80
   },
   {
     label: "状态",
     prop: "status",
-    width: 80,
-    cellRenderer({ row }){
+    width: 60,
+    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 || '--'
       })
     }
   },
+  {
+    label: '成本状态',
+    width: 75,
+    cellRenderer({ row }) {
+      return h(ElTag, { size: 'small' }, {
+        default: () => basicStatusOptions.find(item => item.value == row.basic_status)?.label || '--'
+      })
+    }
+  },
+
+
+
   {
     label: '税前单价',
     prop: 'subunit_price',
@@ -70,15 +74,37 @@ const columns = [
     prop: 'unit_price',
     width: 100
   },
+  {
+    label: "单位",
+    prop: "unit",
+    width: 42
+  },
+
+
+  {
+    label: "规格",
+    prop: "spec",
+    width: 80
+  },
   {
     label: '重量',
     prop: 'unit_weight',
     width: 80
   },
+  // {
+  //   label: '分光',
+  //   prop: 'spectral',
+  //   width: 80
+  // },
   {
-    label: '分光',
-    prop: 'spectral',
-    width: 80
+    label: "销售方公司",
+    width: 160,
+    ...renderIconLabelLeft('seller_code', 'seller_name', "销售方公司纳税号:")
+  },
+  {
+    label: "购买方公司",
+    width: 160,
+    ...renderIconLabelLeft('buyer_code', 'buyer_name', "购买方公司纳税号:")
   },
   {
     label: '创建人',
@@ -86,14 +112,15 @@ const columns = [
     width: 80
   },
   {
-    label:'创建时间',
+    label: '创建时间',
     prop: 'create_time',
     width: 140
-  }
+  },
 ];
 
 const contentConfig: ContentConfig = {
   columns,
+  companyProp: 'buyer_code',
   apis: { httpList: (parameter = {}) => httpList({ ...parameter, is_combind: '0' }) }
 };
 

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

@@ -51,6 +51,7 @@ function handleSubmit(){
         :events="events"
         :searchConfig="searchConfig"
         :contentConfig="contentConfig"
+        :other-search-parameter="{ basic_status : '1'}"
         :isPageStart="true"
         @content-select-change="values => selection = values.map(item => ({ ...item, child_num: '1', child_id: item.id }))"
       />

src/views/invoiceInOut/inventoryCheck/components/shared.ts

@@ -52,7 +52,7 @@ export const invoice_columns = [
 
 export const createInitalData = () => ({
     product_id: '',
-    check_type: '',
+    check_type: '1',
     check_num: '0',
     fz_date: ''
 })

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

@@ -11,28 +11,10 @@ const columns = [
     prop: "checkCode",
     width: 170
   },
-  {
-    label: '销售方公司',
-    minWidth: 160,
-    ...renderIconLabelLeftValue(
-      (row) => row.product.seller_code,
-      (row) => row.product.seller_name,
-      "销售方公司纳税号:"
-    )
-  },
-  {
-    label: '购买方公司',
-    minWidth: 160,
-    ...renderIconLabelLeftValue(
-      (row) => row.product.buyer_code,
-      (row) => row.product.buyer_name,
-      "购买公司纳税号:"
-    )
-  },
   {
     label: "盘点类型",
-    minWidth: 80,
-    cellRenderer(row){
+    minWidth: 120,
+    cellRenderer({ row }){
       return h(ElTag, { size: 'small' }, {
         default: typeOptions.find(item => item.value == row.check_type)?.label || '--'
       })
@@ -47,26 +29,11 @@ const columns = [
     label: "商品名称",
     minWidth: 160,
     ...renderIconLabelLeftValue(
-      (row) => row.product.good_code,
+      (row) => row.product.skuCode,
       (row) => row.product.goodName,
       "商品编号:"
     )
   },
-  {
-    label: "规格",
-    prop: "spec",
-    width: 80,
-    cellRenderer({ row }) {
-      return row.product.spec
-    }
-  },
-  {
-    label: "单位",
-    width: 60,
-    cellRenderer({ row }) {
-      return row.product.unit
-    }
-  },
   {
     label: '单价',
     width: 80,
@@ -89,6 +56,39 @@ const columns = [
     prop: 'diff_num',
     width: 120
   },
+  {
+    label: "规格",
+    prop: "spec",
+    width: 80,
+    cellRenderer({ row }) {
+      return row.product.spec
+    }
+  },
+  {
+    label: "单位",
+    width: 60,
+    cellRenderer({ row }) {
+      return row.product.unit
+    }
+  },
+  {
+    label: '销售方公司',
+    minWidth: 160,
+    ...renderIconLabelLeftValue(
+      (row) => row.product.seller_code,
+      (row) => row.product.seller_name,
+      "销售方公司纳税号:"
+    )
+  },
+  {
+    label: '购买方公司',
+    minWidth: 160,
+    ...renderIconLabelLeftValue(
+      (row) => row.product.buyer_code,
+      (row) => row.product.buyer_name,
+      "购买公司纳税号:"
+    )
+  },
   {
     label: '操作人',
     prop: 'apply_name',