snow 4 months ago
parent
commit
96f27e8b26
51 changed files with 179 additions and 31 deletions
  1. 0 0
      dist/assets/BaseForm.4fc96e.js
  2. 0 0
      dist/assets/BaseForm.b52127.js
  3. 0 0
      dist/assets/ChildGoodEditModal.14a346.js
  4. 0 0
      dist/assets/ChildGoodEditModal.266623.js
  5. 0 0
      dist/assets/ChildGoodEditModal.6d23b8.js
  6. 1 1
      dist/assets/InvoiceTitle.7eecae.js
  7. 1 1
      dist/assets/InvoiceTitle.9ee27f.js
  8. 0 0
      dist/assets/basic-descriptions.93b25071.js
  9. 0 0
      dist/assets/calc.65481ed8.js
  10. 0 0
      dist/assets/detail.40f304.js
  11. 0 0
      dist/assets/detail.47635f.js
  12. 0 0
      dist/assets/detail.6337df.js
  13. 0 0
      dist/assets/detail.811938.js
  14. 1 1
      dist/assets/detail.c73fd2.js
  15. 0 0
      dist/assets/detail.ce357b.js
  16. 1 1
      dist/assets/detail.f3b08e.js
  17. 0 0
      dist/assets/index.02f82a38.js
  18. 0 0
      dist/assets/index.1219f2.js
  19. 0 0
      dist/assets/index.1ddafc.js
  20. 0 0
      dist/assets/index.29ade6.js
  21. 0 0
      dist/assets/index.303734.js
  22. 0 0
      dist/assets/index.4cf9ee.js
  23. 0 0
      dist/assets/index.52bb3f.js
  24. 0 0
      dist/assets/index.669119.js
  25. 0 0
      dist/assets/index.740cb1.js
  26. 0 0
      dist/assets/index.7a0f8c.js
  27. 0 0
      dist/assets/index.88cf8b.js
  28. 0 0
      dist/assets/index.91c8b9.js
  29. 0 0
      dist/assets/index.9d82f1d9.js
  30. 0 0
      dist/assets/index.9fb413.js
  31. 0 0
      dist/assets/index.a9ff40.js
  32. 0 0
      dist/assets/index.ae5395.js
  33. 0 0
      dist/assets/index.bb93f8.js
  34. 0 0
      dist/assets/index.ccc514.js
  35. 0 0
      dist/assets/index.da6cf9.js
  36. 0 0
      dist/assets/index.f86972.js
  37. 0 0
      dist/assets/index.js
  38. 0 0
      dist/assets/motion.1e20acdd.js
  39. 0 0
      dist/assets/phone.9e1123.js
  40. 1 1
      dist/assets/qrCode.be32d8.js
  41. 0 0
      dist/assets/regist.bfca82.js
  42. 0 0
      dist/assets/rule.facb84cb.js
  43. 0 0
      dist/assets/update.2f876b.js
  44. 0 0
      dist/assets/useDetail.3679bc9a.js
  45. 0 0
      dist/assets/verifyCode.87b64da8.js
  46. 4 10
      src/views/invoiceInOut/adjustOrder/detail.vue
  47. 50 0
      src/views/invoiceInOut/inOutManager/components/ChildGoodEditModal.vue
  48. 1 1
      src/views/invoiceInOut/inOutManager/components/ChooseGoodModal/index.vue
  49. 73 2
      src/views/invoiceInOut/inOutManager/config/columns.ts
  50. 45 12
      src/views/invoiceInOut/inOutManager/detail.vue
  51. 1 1
      src/views/invoiceInOut/provisionOut/detail.vue

File diff suppressed because it is too large
+ 0 - 0
dist/assets/BaseForm.4fc96e.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/BaseForm.b52127.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/ChildGoodEditModal.14a346.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/ChildGoodEditModal.266623.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/ChildGoodEditModal.6d23b8.js


+ 1 - 1
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.456185fd.js";import{B as c}from"./basic-descriptions.e5f4d3ab.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.456185fd.js";import{B as c}from"./basic-descriptions.93b25071.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};

+ 1 - 1
dist/assets/InvoiceTitle.9ee27f.js

@@ -1 +1 @@
-import{_ as r,d as _,o as l,G as d,l as s,a as u}from"./index.js";import{B as p}from"./basic-descriptions.e5f4d3ab.js";const y=o=>{const{company_address:e,mobile:i,company_license:n,bank_name:t,bankNo:c,company_name:a}=o;return{invoice_addr:e,invoice_mobile:i,invoice_code:n,invoice_bank:t,invoice_bankNo:c,invoice_title:a}},g=o=>{const{invoice_addr:e,invoice_mobile:i,invoice_code:n,invoice_bank:t,invoice_bankNo:c,invoice_title:a}=o;return{invoice_code:n,invoice_title:a,addrAndmobile:e+" "+i,bankAndBankNo:t+" "+c}},v=[{label:"\u62AC\u5934",span:24,field:"invoice_title"},{label:"\u7EB3\u7A0E\u4EBA\u8BC6\u522B\u53F7",span:24,field:"invoice_code"}],B=()=>({buyer_code:"",buyer_name:"",seller_code:"",seller_name:"",good_source:"",good_code:"",good_type:"",is_combind:"",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(s(p),{key:0,"px-8":"","pb-5":"",data:e.detail,columns:s(v),"col-number":1,"label-width":"130"},null,8,["data","columns"])):u("v-if",!0)}});var b=r(m,[["__file","C:/Users/89793/Desktop/projects/ticket-system/src/views/invoiceInOut/productManager/components/InvoiceTitle.vue"]]),I=Object.freeze(Object.defineProperty({__proto__:null,default:b},Symbol.toStringTag,{value:"Module"}));export{b as I,g as a,y as b,B as c,I as d};
+import{_ as r,d as _,o as l,G as d,l as s,a as u}from"./index.js";import{B as p}from"./basic-descriptions.93b25071.js";const y=o=>{const{company_address:e,mobile:i,company_license:n,bank_name:t,bankNo:c,company_name:a}=o;return{invoice_addr:e,invoice_mobile:i,invoice_code:n,invoice_bank:t,invoice_bankNo:c,invoice_title:a}},g=o=>{const{invoice_addr:e,invoice_mobile:i,invoice_code:n,invoice_bank:t,invoice_bankNo:c,invoice_title:a}=o;return{invoice_code:n,invoice_title:a,addrAndmobile:e+" "+i,bankAndBankNo:t+" "+c}},v=[{label:"\u62AC\u5934",span:24,field:"invoice_title"},{label:"\u7EB3\u7A0E\u4EBA\u8BC6\u522B\u53F7",span:24,field:"invoice_code"}],B=()=>({buyer_code:"",buyer_name:"",seller_code:"",seller_name:"",good_source:"",good_code:"",good_type:"",is_combind:"",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(s(p),{key:0,"px-8":"","pb-5":"",data:e.detail,columns:s(v),"col-number":1,"label-width":"130"},null,8,["data","columns"])):u("v-if",!0)}});var b=r(m,[["__file","C:/Users/89793/Desktop/projects/ticket-system/src/views/invoiceInOut/productManager/components/InvoiceTitle.vue"]]),I=Object.freeze(Object.defineProperty({__proto__:null,default:b},Symbol.toStringTag,{value:"Module"}));export{b as I,g as a,y as b,B as c,I as d};

+ 0 - 0
dist/assets/basic-descriptions.e5f4d3ab.js → dist/assets/basic-descriptions.93b25071.js


+ 0 - 0
dist/assets/calc.9fbeadc4.js → dist/assets/calc.65481ed8.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/detail.40f304.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/detail.47635f.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/detail.6337df.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/detail.811938.js


+ 1 - 1
dist/assets/detail.c73fd2.js

@@ -1 +1 @@
-import{_ as E,d as b,aV as g,r as t,aj as D,H as B,l as e,o as n,c as T,j as o,C as s,a6 as V,G as d,a as p}from"./index.js";import{B as h}from"./basic-descriptions.e5f4d3ab.js";import{u as x}from"./useDetail.b1c1d9df.js";import j from"./BaseForm.b52127.js";import{g as w,a as y}from"./ChildGoodEditModal.266623.js";import{a as I}from"./index.952d47b4.js";import"./status.915de772.js";import"./InvoiceTitle.9ee27f.js";import"./index.91c8b9.js";const N={class:"padding__container"},H=b({__name:"detail",setup(P){const a=g(),{title:i,isDetail:r,collapses:l,id:m}=x({baseName:"\u5546\u54C1",collapseLen:2});return m.value&&a.run(I({id:m.value})),(U,c)=>{const u=t("ElCollapseItem"),_=t("ElCollapse"),f=t("ElTabPane"),v=t("ElTabs"),C=D("loading");return B((n(),T("div",N,[o(v,null,{default:s(()=>[o(f,{label:e(i)},{default:s(()=>[o(_,{modelValue:e(l),"onUpdate:modelValue":c[0]||(c[0]=k=>V(l)?l.value=k:null)},{default:s(()=>[o(u,{title:e(i),name:"1"},{default:s(()=>[e(r)?p("v-if",!0):(n(),d(j,{key:0})),e(r)&&e(a).data?(n(),d(e(h),{key:1,columns:e(a).data.is_combind=="1"?e(w):e(y),data:e(a).data},null,8,["columns","data"])):p("v-if",!0)]),_:1},8,["title"])]),_:1},8,["modelValue"])]),_:1},8,["label"])]),_:1})])),[[C,e(a).loading]])}}});var J=E(H,[["__file","C:/Users/89793/Desktop/projects/ticket-system/src/views/invoiceInOut/productManager/detail.vue"]]);export{J as default};
+import{_ as E,d as b,aV as g,r as t,aj as D,H as B,l as e,o as n,c as T,j as o,C as s,a6 as V,G as d,a as p}from"./index.js";import{B as h}from"./basic-descriptions.93b25071.js";import{u as x}from"./useDetail.3679bc9a.js";import j from"./BaseForm.b52127.js";import{g as w,a as y}from"./ChildGoodEditModal.266623.js";import{a as I}from"./index.9d82f1d9.js";import"./status.915de772.js";import"./InvoiceTitle.9ee27f.js";import"./index.91c8b9.js";const N={class:"padding__container"},H=b({__name:"detail",setup(P){const a=g(),{title:i,isDetail:r,collapses:l,id:m}=x({baseName:"\u5546\u54C1",collapseLen:2});return m.value&&a.run(I({id:m.value})),(U,c)=>{const u=t("ElCollapseItem"),_=t("ElCollapse"),f=t("ElTabPane"),v=t("ElTabs"),C=D("loading");return B((n(),T("div",N,[o(v,null,{default:s(()=>[o(f,{label:e(i)},{default:s(()=>[o(_,{modelValue:e(l),"onUpdate:modelValue":c[0]||(c[0]=k=>V(l)?l.value=k:null)},{default:s(()=>[o(u,{title:e(i),name:"1"},{default:s(()=>[e(r)?p("v-if",!0):(n(),d(j,{key:0})),e(r)&&e(a).data?(n(),d(e(h),{key:1,columns:e(a).data.is_combind=="1"?e(w):e(y),data:e(a).data},null,8,["columns","data"])):p("v-if",!0)]),_:1},8,["title"])]),_:1},8,["modelValue"])]),_:1},8,["label"])]),_:1})])),[[C,e(a).loading]])}}});var J=E(H,[["__file","C:/Users/89793/Desktop/projects/ticket-system/src/views/invoiceInOut/productManager/detail.vue"]]);export{J as default};

File diff suppressed because it is too large
+ 0 - 0
dist/assets/detail.ce357b.js


+ 1 - 1
dist/assets/detail.f3b08e.js

@@ -1 +1 @@
-import{_ as E,d as b,aV as D,r as t,aj as g,H as B,l as e,o as n,c as T,j as o,C as s,a6 as V,G as d,a as p}from"./index.js";import{g as h,a as x}from"./ChildGoodEditModal.6d23b8.js";import{B as y}from"./basic-descriptions.e5f4d3ab.js";import{u as j}from"./useDetail.b1c1d9df.js";import w from"./BaseForm.4fc96e.js";import{a as I}from"./index.952d47b4.js";import"./status.915de772.js";import"./shared.456185fd.js";import"./index.bb93f8.js";const N={class:"padding__container"},H=b({__name:"detail",setup(P){const a=D(),{title:i,isDetail:r,collapses:l,id:m}=j({baseName:"\u76D8\u70B9",collapseLen:2});return m.value&&a.run(I({id:m.value})),(U,c)=>{const u=t("ElCollapseItem"),_=t("ElCollapse"),f=t("ElTabPane"),v=t("ElTabs"),C=g("loading");return B((n(),T("div",N,[o(v,null,{default:s(()=>[o(f,{label:e(i)},{default:s(()=>[o(_,{modelValue:e(l),"onUpdate:modelValue":c[0]||(c[0]=k=>V(l)?l.value=k:null)},{default:s(()=>[o(u,{title:e(i),name:"1"},{default:s(()=>[e(r)?p("v-if",!0):(n(),d(w,{key:0})),e(r)&&e(a).data?(n(),d(e(y),{key:1,columns:e(a).data.is_combind=="1"?e(h):e(x),data:e(a).data},null,8,["columns","data"])):p("v-if",!0)]),_:1},8,["title"])]),_:1},8,["modelValue"])]),_:1},8,["label"])]),_:1})])),[[C,e(a).loading]])}}});var K=E(H,[["__file","C:/Users/89793/Desktop/projects/ticket-system/src/views/invoiceInOut/inventoryCheck/detail.vue"]]);export{K as default};
+import{_ as E,d as b,aV as D,r as t,aj as g,H as B,l as e,o as n,c as T,j as o,C as s,a6 as V,G as d,a as p}from"./index.js";import{g as h,a as x}from"./ChildGoodEditModal.6d23b8.js";import{B as y}from"./basic-descriptions.93b25071.js";import{u as j}from"./useDetail.3679bc9a.js";import w from"./BaseForm.4fc96e.js";import{a as I}from"./index.9d82f1d9.js";import"./status.915de772.js";import"./shared.456185fd.js";import"./index.bb93f8.js";const N={class:"padding__container"},H=b({__name:"detail",setup(P){const a=D(),{title:i,isDetail:r,collapses:l,id:m}=j({baseName:"\u76D8\u70B9",collapseLen:2});return m.value&&a.run(I({id:m.value})),(U,c)=>{const u=t("ElCollapseItem"),_=t("ElCollapse"),f=t("ElTabPane"),v=t("ElTabs"),C=g("loading");return B((n(),T("div",N,[o(v,null,{default:s(()=>[o(f,{label:e(i)},{default:s(()=>[o(_,{modelValue:e(l),"onUpdate:modelValue":c[0]||(c[0]=k=>V(l)?l.value=k:null)},{default:s(()=>[o(u,{title:e(i),name:"1"},{default:s(()=>[e(r)?p("v-if",!0):(n(),d(w,{key:0})),e(r)&&e(a).data?(n(),d(e(y),{key:1,columns:e(a).data.is_combind=="1"?e(h):e(x),data:e(a).data},null,8,["columns","data"])):p("v-if",!0)]),_:1},8,["title"])]),_:1},8,["modelValue"])]),_:1},8,["label"])]),_:1})])),[[C,e(a).loading]])}}});var K=E(H,[["__file","C:/Users/89793/Desktop/projects/ticket-system/src/views/invoiceInOut/inventoryCheck/detail.vue"]]);export{K as default};

+ 0 - 0
dist/assets/index.9ce48d0a.js → dist/assets/index.02f82a38.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index.1219f2.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index.1ddafc.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index.29ade6.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index.303734.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index.4cf9ee.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index.52bb3f.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index.669119.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index.740cb1.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index.7a0f8c.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index.88cf8b.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index.91c8b9.js


+ 0 - 0
dist/assets/index.952d47b4.js → dist/assets/index.9d82f1d9.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index.9fb413.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index.a9ff40.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index.ae5395.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index.bb93f8.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index.ccc514.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index.da6cf9.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index.f86972.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index.js


+ 0 - 0
dist/assets/motion.2df3b996.js → dist/assets/motion.1e20acdd.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/phone.9e1123.js


+ 1 - 1
dist/assets/qrCode.be32d8.js

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

File diff suppressed because it is too large
+ 0 - 0
dist/assets/regist.bfca82.js


+ 0 - 0
dist/assets/rule.2ebb92c5.js → dist/assets/rule.facb84cb.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/update.2f876b.js


+ 0 - 0
dist/assets/useDetail.b1c1d9df.js → dist/assets/useDetail.3679bc9a.js


+ 0 - 0
dist/assets/verifyCode.d9a5005d.js → dist/assets/verifyCode.87b64da8.js


+ 4 - 10
src/views/invoiceInOut/adjustOrder/detail.vue

@@ -20,13 +20,10 @@ import {
 } from "element-plus"
 
 
-const { id, isDetail, title, collapses } = useDetail({ baseName: '计提明细处理', collapseLen: 2 });
+const { id, isDetail, title, collapses } = useDetail({ baseName: '调整单', collapseLen: 2 });
 
 
-const formData = ref({
-  isToAdjust: '',
-  amount: ''
-})
+const formData = ref({ isToAdjust: '', amount: '' })
 
 </script>
 
@@ -36,7 +33,7 @@ const formData = ref({
       <ElTabPane :label="title">
         <ElCollapse v-model="collapses">
           <ElCollapseItem :title="title" name="1">
-            <ElForm label-width="100px">
+            <ElForm label-width="160px">
               <ElFormItem label="计提明细">
                 <BasicDescriptions 
                   style="margin-left: 40px" 
@@ -59,10 +56,7 @@ const formData = ref({
               </ElFormItem>
 
               <ElFormItem label="调整金额" prop="amount">
-                <NumberInput 
-                  v-model="formData.amount" 
-                  placeholder="调整金额"
-                />
+                <NumberInput v-model="formData.amount"  placeholder="调整金额" />
               </ElFormItem>
 
               <ElFormItem label="添加至调整单" prop="isToAdjust">

+ 50 - 0
src/views/invoiceInOut/inOutManager/components/ChildGoodEditModal.vue

@@ -0,0 +1,50 @@
+<script setup lang="ts">
+import { useVModel } from '@vueuse/core';
+import { ElDialog } from 'element-plus';
+import { goodColumns } from '../config/columns';
+import BasicDescriptions from "/@/components/BasicDescriptions";
+
+import { NumberInput } from "/@/components/Input"
+import { ref, watch} from 'vue';
+
+const props = defineProps<{ 
+    visible: boolean;
+    index: any; 
+    data: any; 
+}>()
+
+const emit = defineEmits(['submit'])
+const visible = useVModel(props, 'visible')
+
+const child_num = ref(0)
+
+
+watch(() => visible.value, () => {
+    if(!visible.value){  return }
+    child_num.value = props.data.goodNum
+})
+
+function handleSubmit(){
+    emit('submit', props.index, { ...props.data, goodNum: child_num.value })    
+    visible.value = false
+}
+</script>
+
+<template>
+    <ElDialog
+       v-model="visible"
+       title="编辑商品" 
+       center
+    >
+        <BasicDescriptions style="overflow: hidden;" v-if="props.data" :data="props.data" :columns="goodColumns" />
+
+        <div class="flex justify-between mt-[10px]">
+            <div class="flex items-center">
+                <p style="width: 110px">操作数量:</p>
+                <NumberInput v-model="child_num" placeholder="操作数量" />
+            </div>
+
+            <ElButton type="primary" @click="handleSubmit">保存</ElButton>
+        </div>
+    </ElDialog>
+</template>

+ 1 - 1
src/views/invoiceInOut/inOutManager/components/ChooseGoodModal/index.vue

@@ -38,7 +38,7 @@ function handleSubmit(){
 </script>
 
 <template>
-    <ElDialog class="reactive" v-model="visible" title="选择商品" center top="10px">
+    <ElDialog class="relative" v-model="visible" title="选择商品" center top="10px">
       <PageContainer
         v-if="visible"
         :hooks="hooks"

+ 73 - 2
src/views/invoiceInOut/inOutManager/config/columns.ts

@@ -1,9 +1,80 @@
+import { ElTag } from "element-plus"
+import { cg_order_type_options } from "/@/utils/status"
+import { h } from "vue"
+
 export const goodColumns = [
-  { label: '业务编号', field: '', span: 8 }
+  {
+    span: 12,
+    field: 'seller_name',
+    label: '销售方公司'
+  },
+  {
+    span: 12,
+    field: 'buyer_name',
+    label: '购买方公司'
+  },
+  {
+    span: 12,
+    field: 'goodName',
+    label: '订单商品名称'
+  },
+  {
+    span: 12,
+    field: 'inv_good_name',
+    label: '发票商品名称'
+  },
+  {
+    span: 6,
+    label: '商品类型',
+    render(_, { good_type }) {
+      return h(ElTag, { size: 'small' }, {
+        default: () => cg_order_type_options.find(item => item.value == good_type)?.label || '--'
+      })
+    }
+  },
+  {
+    span: 6,
+    field: 'good_code',
+    label: '商品代码'
+  },
+  {
+    span: 6,
+    field: 'spec',
+    label: '规格'
+  },
+  {
+    span: 6,
+    field: 'unit',
+    label: '单位'
+  },
+  {
+    span: 6,
+    field: 'unit_price',
+    label: '税前单价'
+  },
+  {
+    span: 6,
+    field: 'subunit_price',
+    label: '税后单价'
+  },
+  {
+    span: 6,
+    field: 'unit_weight',
+    label: '重量'
+  },
+  {
+    span: 6,
+    field: 'spectral',
+    label: '分光'
+  },
+  {
+    field: 'cat_name',
+    label: '进项类目',
+    span: 24
+  }
 ]
 
 
-
 export const orderGoodColumns = [
  
 ]

+ 45 - 12
src/views/invoiceInOut/inOutManager/detail.vue

@@ -1,17 +1,29 @@
 <script setup lang="ts">
-import { ref } from "vue";
+import { reactive, ref } from "vue";
 
-import { goodColumns } from "./config/columns"
+import { goodColumns, orderGoodColumns } from "./config/columns"
 import { useDetail } from "/@/hooks/core/useDetail";
 import BasicDescriptions from "/@/components/BasicDescriptions";
 import { useRenderIcon } from "/@/components/ReIcon/src/hooks";
 
 import ChooseGoodModal from "./components/ChooseGoodModal/index.vue"
+
+import ChildGoodEditModal from "./components/ChildGoodEditModal.vue";
+
 import { ElForm } from "element-plus";
 
+
 const { title, collapses } = useDetail({ baseName: '出入库', collapseLen: 2 });
+
 const visible = ref(false)
 
+
+const state = reactive({
+  editVisible: false,
+  index: -1,
+  data: {}
+})
+
 const formRef = ref<InstanceType<typeof ElForm> | null>(null)
 
 const formData = ref({
@@ -40,6 +52,12 @@ function handleGoodComfirm(values){
   formData.value.goods = [...list,  ...formData.value.goods]
 }
 
+function handleChildGoodEdit(index: number){
+  state.index = index
+  state.editVisible = true
+  state.data = { ...formData.value.goods[index] }
+}
+
 async function onSubmit(){
   try{
     await formRef.value.validate()
@@ -55,7 +73,7 @@ async function onSubmit(){
       <ElTabPane :label="title">
         <ElCollapse v-model="collapses">
           <ElCollapseItem :title="title" name="1">
-            <BasicDescriptions :columns="goodColumns" :data="{}" />
+            <BasicDescriptions :columns="orderGoodColumns" :data="{}" />
           </ElCollapseItem>
 
           <ElCollapseItem title="出入库信息确认" name="2">
@@ -66,7 +84,6 @@ async function onSubmit(){
                   size="small" 
                   :data="formData.goods"
                 >
-
                   <ElTableColumn label="商品编号" prop="skuCode" show-overflow-tooltip />
                   <ElTableColumn label="商品名称" prop="goodName" show-overflow-tooltip />
                   <ElTableColumn label="操作数量" prop="goodNum" show-overflow-tooltip/>
@@ -92,6 +109,17 @@ async function onSubmit(){
                     </template>
 
                     <template #="{ $index }">
+                      <ElTooltip content="编辑" placement="top">
+                        <ElButton 
+                          :icon="useRenderIcon('edits')"
+                          type="primary"
+                          size="small"
+                          link
+                           @click="handleChildGoodEdit($index)"
+                        />
+                      </ElTooltip>
+
+
                       <ElTooltip content="删除" placement="top">
                         <ElButton 
                           :icon="useRenderIcon('delete')"
@@ -107,20 +135,18 @@ async function onSubmit(){
               </ElFormItem>
 
               <ElFormItem label="入账月份" prop="month">
-                <ElDatePicker 
+                <ElDatePicker
+                  v-model="formData.month"
                   type="month" 
                   placeholder="入账月份"
                   :disabledDate="disabledTomorrow" 
                 />
               </ElFormItem>
-
-              <div class="flex w-full justify-end">
-                <ElButton 
-                  type="primary"
-                  @click="onSubmit"
-                >保存</ElButton>
-              </div>
             </ElForm>
+
+            <div class="flex w-full justify-end">
+              <ElButton type="primary" @click="onSubmit">保存</ElButton>
+            </div>
           </ElCollapseItem>
         </ElCollapse>
       </ElTabPane>
@@ -130,5 +156,12 @@ async function onSubmit(){
       v-model:visible="visible"
       @submit="handleGoodComfirm"
     />
+
+    <ChildGoodEditModal 
+      :data="state.data"
+      :index="state.index"
+      v-model:visible="state.editVisible"
+      @submit="(index, data) => formData.goods[index] = { ...data }"
+    />
   </div>
 </template>

+ 1 - 1
src/views/invoiceInOut/provisionOut/detail.vue

@@ -50,7 +50,7 @@ async function handleSubmit(){
         <ElCollapse v-model="collapses">
           <ElCollapseItem :title="title" name="1">
             <ElForm 
-              label-width="100px" 
+              label-width="140px" 
               :model="formData"
                ref="formRef" 
               :rules="rules" 

Some files were not shown because too many files changed in this diff