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.57fd1333.js";import{B as M}from"./basic-descriptions.898fa2c0.js";import"./status.0f771e9a.js";import"./tootip.f8ec1491.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.23cf5116.js";import{B as M}from"./basic-descriptions.7b665aa5.js";import"./status.0f771e9a.js";import"./tootip.4387edcf.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.898fa2c0.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.7b665aa5.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.898fa2c0.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.7b665aa5.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.4b42d2.js

@@ -0,0 +1 @@
+import{_ as E,d as b,aY as D,r as a,at as T,H as g,l as e,o as i,c as V,j as o,C as l,ah as h,G as p,a as c}from"./index.js";import{u as x}from"./useDetail.776970e8.js";import B from"./BaseForm.03bc88.js";import{P}from"./index.76cbc8c7.js";import{a as w}from"./index.be76080c.js";import"./status.0f771e9a.js";import"./InvoiceTitle.77bebe.js";import"./basic-descriptions.7b665aa5.js";import"./index.08977e.js";import"./use-page-search.2475f65e.js";import"./ChildGoodEditModal.7967d3.js";import"./columns.23cf5116.js";import"./tootip.4387edcf.js";import"./query-category.fa03a8.js";const y={class:"padding__container"},I=b({__name:"detail",setup(N){const t=D(),{title:r,isDetail:d,collapses:s,id:n}=x({baseName:"\u5546\u54C1",collapseLen:2});return n.value&&t.run(w({id:n.value})),(j,m)=>{const u=a("ElCollapseItem"),_=a("ElCollapse"),f=a("ElTabPane"),v=a("ElTabs"),C=T("loading");return g((i(),V("div",y,[o(v,null,{default:l(()=>[o(f,{label:e(r)},{default:l(()=>[o(_,{modelValue:e(s),"onUpdate:modelValue":m[0]||(m[0]=k=>h(s)?s.value=k:null)},{default:l(()=>[o(u,{title:e(r),name:"1"},{default:l(()=>[e(d)?c("v-if",!0):(i(),p(B,{key:0})),e(t).data?(i(),p(P,{key:1,data:e(t).data},null,8,["data"])):c("v-if",!0)]),_:1},8,["title"])]),_:1},8,["modelValue"])]),_:1},8,["label"])]),_:1})])),[[C,e(t).loading]])}}});var Q=E(I,[["__file","C:/Users/89793/Desktop/projects/ticket-system/src/views/invoiceInOut/productManager/detail.vue"]]);export{Q as default};

dist/assets/detail.8b0ced.js

@@ -1 +0,0 @@
-import{_ as E,d as b,aY as B,r as t,at as D,H as g,l as e,o as i,c as h,j as o,C as s,ah as T,G as d,a as p}from"./index.js";import{B as V,g as x,a as y}from"./BaseForm.0d14fd.js";import{B as w}from"./basic-descriptions.898fa2c0.js";import{u as I}from"./useDetail.de731874.js";import{a as N}from"./index.0e8d4646.js";import"./shared.80186348.js";import"./index.bb93f8.js";import"./use-page-search.c6a73876.js";import"./status.0f771e9a.js";import"./index.d1f322f8.js";const j={class:"padding__container"},H=b({__name:"detail",setup(P){const a=B(),{id:n,title:r,isDetail:m,collapses:l}=I({baseName:"\u76D8\u70B9",collapseLen:2});return n.value&&a.run(N({id:n.value})),(U,c)=>{const u=t("ElCollapseItem"),_=t("ElCollapse"),f=t("ElTabPane"),v=t("ElTabs"),C=D("loading");return g((i(),h("div",j,[o(v,null,{default:s(()=>[o(f,{label:e(r)},{default:s(()=>[o(_,{modelValue:e(l),"onUpdate:modelValue":c[0]||(c[0]=k=>T(l)?l.value=k:null)},{default:s(()=>[o(u,{title:e(r),name:"1"},{default:s(()=>[e(m)?p("v-if",!0):(i(),d(V,{key:0})),e(m)&&e(a).data?(i(),d(e(w),{key:1,columns:e(a).data.is_combind=="1"?e(x):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 K=E(H,[["__file","C:/Users/89793/Desktop/projects/ticket-system/src/views/invoiceInOut/inventoryCheck/detail.vue"]]);export{K as default};

dist/assets/index.81d51bb0.js

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

dist/assets/index.dd8eab88.js

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

dist/assets/qrCode.be32d8.js

@@ -1,4 +1,4 @@
-import{d as Ht,w as Ot,a7 as Lt,z as me,j as P,H as pe,at as we,l as R,aE as be,F as Jt,y as Ce,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.de78445b.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,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.2b5ebdc9.js";/*!
  * is-plain-object <https://github.com/jonschlinkert/is-plain-object>
  *
  * Copyright (c) 2014-2017, Jon Schlinkert.

src/api/invoiceInOut/inOutManager/index.ts

@@ -29,6 +29,10 @@ export const httpDetail = (data: object): ResponseType => {
     return http.request("post", `${newApi}/cxinv/FinancialManager/info`, { data });
 };
 
+export const httpDelete = (data: object): ResponseType => {
+    return http.request("post", `${newApi}/cxinv/FinancialManager/delete`, { data });
+};
+
 export const httpStatus = (data: object): ResponseType => {
     return http.request("post", `${newApi}/cxinv/FinancialManager/CheckSure`, { data });
 };

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

@@ -300,7 +300,7 @@ const columns = [
   { 
     label: "操作", 
     fixed: "right", 
-    width: 50, 
+    width: 80, 
     slot: "operation" 
   }
 ];

src/views/invoiceInOut/inManager/index.vue

@@ -11,7 +11,9 @@ import contentConfig from "./config/content.config";
 import searchConfig from "./config/search.config";
 import { utils, writeFile } from "xlsx";
 import { useUserInfo } from "/@/hooks/core/useUser";
-
+import { httpDelete } from "/@/api/invoiceInOut/inOutManager";
+import { useTask } from "/@/hooks/core";
+import { ElMessage } from "element-plus";
 
 const PageName = "inOutManager";
 const router = useRouter();
@@ -23,6 +25,12 @@ const pageContentRef = ref(null)
 
 const { isSuperUser } = useUserInfo()
 
+
+const deleteTask = useTask({ success(){
+  ElMessage.success('取消成功')
+  pageContentRef?.value.onSearch()
+} })
+
 const events: PageEvents = {
   content: {
     create: () => router.push('/invoiceInOut/inManagerDetail'),
@@ -38,6 +46,11 @@ function onDownload(type = 'notOrder'){
   utils.book_append_sheet(workBook, workSheet, "sheet");
   writeFile(workBook, title, { bookType: "xlsx" });
 }
+
+
+function handleRefresh(row){
+  deleteTask.run(httpDelete({ id: row.id }))
+}
 </script>
 
 <template>
@@ -82,15 +95,17 @@ function onDownload(type = 'notOrder'){
           </template>
         </ElDropdown>
       </template>
-      <!-- <template #content_action>
-        <ElTooltip content="取消操作" placement="top">
+
+      <template #content_action="row">
+        <ElTooltip content="取消操作" placement="top" v-if="row.status == '1'">
           <ElButton 
-            :icon="useRenderIcon('delete')"
+            :icon="useRenderIcon('refresh')"
+            @click="handleRefresh(row)"
             type="danger"
             link
           />
         </ElTooltip>
-      </template> -->
+      </template>
     </PageContainer>
 
     <OrderImportModal 

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

@@ -14,6 +14,8 @@ import BasicDescriptions from "/@/components/BasicDescriptions";
 import { goodColumns } from "../config/columns";
 import { useRenderIcon } from "/@/components/ReIcon/src/hooks";
 
+import ProductDetail from "/@/components/productDetail/index.vue"
+
 
 import { httpAdd } from "/@/api/invoiceInOut/inventoryCheck";
 
@@ -86,11 +88,14 @@ async function submit(){
 function handleSubmit(list: any[]){
   detail.value = list[0]
   formData.value.product_id = list[0].id
+  formData.value.check_num = String(list[0].residue_stock)
 }
 
 function handleChoose(){
   detail.value = null
+  formData.value.check_num = '0'
   formData.value.product_id = ''
+  console.log(formData.value)
 }
 
 (async function initalData(){
@@ -100,33 +105,37 @@ function handleChoose(){
 </script>
 
 <template>
-  <ElForm
-    ref="formRef"
-    :rules="rules" 
-    :model="formData" 
-    v-loading="createTask.loading"
-    label-width="140px"
-  >
+  <ElForm ref="formRef" :rules="rules" :model="formData" v-loading="createTask.loading" label-width="140px">
     <ElRow>
       <ElCol :span="24">
         <ElFormItem label="商品信息" prop="product_id">
-          <ElInput  v-if="!detail" placeholder="商品信息" @click="state.visible = true"  />
+          <ElInput v-if="!detail" placeholder="商品信息" @click="state.visible = true" />
+
+          <div class="flex items-start" v-if="detail">
+            <ProductDetail v-if="detail" :data="detail" />
 
-          <div class="flex items-start"  v-if="detail">
-            <BasicDescriptions  :data="detail"  :columns="goodColumns" />
+            <!-- <BasicDescriptions :data="detail" :columns="goodColumns" /> -->
 
             <ElTooltip content="重新选择" placement="top">
-               <ElButton 
-                  link 
-                  type="info"
-                  :icon="useRenderIcon('close-circle-line')" 
-                  @click="handleChoose" 
-                />
+              <ElButton link type="info" :icon="useRenderIcon('close-circle-line')" @click="handleChoose" />
             </ElTooltip>
           </div>
         </ElFormItem>
       </ElCol>
 
+      <ElCol :span="6" v-if="detail">
+        <ElFormItem label="账面数量">
+          {{ detail?.residue_stock || 0 }}
+        </ElFormItem>
+      </ElCol>
+      <ElCol :span="6" v-if="detail">
+        <ElFormItem label="税前单价">
+          {{ detail?.subunit_price || 0 }}
+        </ElFormItem>
+      </ElCol>
+
+      <ElCol :span="12"></ElCol>
+
       <ElCol :span="24">
         <ElFormItem label="盘点数量" prop="check_num">
           <NumberInput v-model="formData.check_num" placeholder="盘点数量" />
@@ -135,7 +144,7 @@ function handleChoose(){
 
       <ElCol :span="24">
         <ElFormItem label="盈亏数量" prop="ykNum">
-         {{ reComputedNumber.ykNum }}
+          {{ reComputedNumber.ykNum }}
         </ElFormItem>
       </ElCol>
 
@@ -149,40 +158,25 @@ function handleChoose(){
       <ElCol :span="24">
         <ElFormItem label="结果类型" prop="check_type">
           <ElSelect v-model="formData.check_type" placeholder="结果类型">
-            <ElOption
-              :disabled="reComputedNumber.yKPrice == 0"
-              label="调整单" 
-              value="2" 
-            />
-
-            <ElOption 
-              label="前期数据导入" 
-              value="1" 
-            />
+            <ElOption :disabled="reComputedNumber.yKPrice == 0" label="调整单" value="2" />
+
+            <ElOption label="前期数据导入" value="1" />
           </ElSelect>
         </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"
-          />
+          <ElDatePicker type="month" placeholder="入账月份" v-model="formData.fz_date" :disabledDate="disabledDate"
+            value-format="YYYY-MM" />
         </ElFormItem>
       </ElCol>
     </ElRow>
 
     <div class="w-full flex justify-end">
-      <ElButton 
-        type="primary" 
-        @click="submit"
-      >保存</ElButton>
+      <ElButton type="primary" @click="submit">保存</ElButton>
     </div>
 
-    <ChooseGoodModal  v-model:visible="state.visible"  @submit="handleSubmit" />
+    <ChooseGoodModal v-model:visible="state.visible" @submit="handleSubmit" />
   </ElForm>
 </template>

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

@@ -76,13 +76,13 @@ const columns = [
     label: '操作人',
     prop: 'apply_name',
     width: 80
+  },
+  {
+    label: "操作",
+    fixed: "right",
+    width: 50,
+    slot: "operation"
   }
-  // {
-  //   label: "操作",
-  //   fixed: "right",
-  //   width: 50,
-  //   slot: "operation"
-  // }
 ];
 
 const contentConfig: ContentConfig = {

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

@@ -295,7 +295,7 @@ const columns = [
   { 
     label: "操作", 
     fixed: "right", 
-    width: 50, 
+    width: 80, 
     slot: "operation" 
   }
 ];

src/views/invoiceInOut/outManager/index.vue

@@ -11,7 +11,9 @@ import contentConfig from "./config/content.config";
 import searchConfig from "./config/search.config";
 import { utils, writeFile } from "xlsx";
 import { useUserInfo } from "/@/hooks/core/useUser";
-
+import { httpDelete } from "/@/api/invoiceInOut/inOutManager";
+import { useTask } from "/@/hooks/core";
+import { ElMessage } from "element-plus";
 
 const PageName = "inOutManager";
 const router = useRouter();
@@ -21,6 +23,13 @@ const hooks: PageHooks = { pageSearchHook: () => usePageSearch(undefined, undefi
 
 const pageContentRef = ref(null)
 
+const deleteTask = useTask({
+  success() {
+    ElMessage.success('取消成功')
+    pageContentRef?.value.onSearch()
+  }
+})
+
 const { isSuperUser } = useUserInfo()
 
 const events: PageEvents = {
@@ -38,27 +47,22 @@ function onDownload(type = 'notOrder'){
   utils.book_append_sheet(workBook, workSheet, "sheet");
   writeFile(workBook, title, { bookType: "xlsx" });
 }
+
+function handleRefresh(row) {
+  deleteTask.run(httpDelete({ id: row.id }))
+}
 </script>
 
 <template>
   <PageAuth :pageName="PageName">
-    <PageContainer
-      :hooks="hooks"
-      :events="events"
-      :searchConfig="searchConfig"
-      :contentConfig="contentConfig"
-      :get-content-ref="ref => pageContentRef = ref"
-    >
+    <PageContainer :hooks="hooks" :events="events" :searchConfig="searchConfig" :contentConfig="contentConfig"
+      :get-content-ref="ref => pageContentRef = ref">
       <template #content_header>
-        <ElDropdown  v-if="!isSuperUser">
-          <ElButton
-            size="small" 
-            type="primary"
-            style="margin-right: 10px;margin-top:1px"
-            :icon="useRenderIcon('arrow-up-line')"
-          >商品导入
+        <ElDropdown v-if="!isSuperUser">
+          <ElButton size="small" type="primary" style="margin-right: 10px;margin-top:1px"
+            :icon="useRenderIcon('arrow-up-line')">商品导入
           </ElButton>
-          
+
           <template #dropdown>
             <ElDropdownMenu>
               <ElDropdownItem @click="state.orderImportVisible = true">订单商品</ElDropdownItem>
@@ -68,12 +72,9 @@ function onDownload(type = 'notOrder'){
         </ElDropdown>
 
         <ElDropdown>
-          <ElButton 
-            size="small" 
-            style="margin-right: 10px;margin-top:1px"
-            :icon="useRenderIcon('arrow-down-line')"
-          >商品导入模板下载</ElButton>
-          
+          <ElButton size="small" style="margin-right: 10px;margin-top:1px" :icon="useRenderIcon('arrow-down-line')">
+            商品导入模板下载</ElButton>
+
           <template #dropdown>
             <ElDropdownMenu>
               <ElDropdownItem @click="onDownload('order')">订单商品</ElDropdownItem>
@@ -82,25 +83,17 @@ function onDownload(type = 'notOrder'){
           </template>
         </ElDropdown>
       </template>
-      <!-- <template #content_action>
-        <ElTooltip content="取消操作" placement="top">
-          <ElButton 
-            :icon="useRenderIcon('delete')"
-            type="danger"
-            link
-          />
+
+
+      <template #content_action="row">
+        <ElTooltip content="取消操作" placement="top" v-if="row.status == '1'">
+          <ElButton :icon="useRenderIcon('refresh')" @click="handleRefresh(row)" type="danger" link />
         </ElTooltip>
-      </template> -->
+      </template>
     </PageContainer>
 
-    <OrderImportModal 
-      v-model:visible="state.orderImportVisible"
-      @refresh="pageContentRef?.onSearch()"
-    />
+    <OrderImportModal v-model:visible="state.orderImportVisible" @refresh="pageContentRef?.onSearch()" />
 
-    <NotOrderImportModal 
-      v-model:visible="state.notOrderImportVisible"
-      @refresh="pageContentRef?.onSearch()"
-    />
+    <NotOrderImportModal v-model:visible="state.notOrderImportVisible" @refresh="pageContentRef?.onSearch()" />
   </PageAuth>
 </template>

src/views/invoiceInOut/summary/detail.vue

@@ -93,6 +93,8 @@ const formData = ref({
                 <ElCol :span="24">
                   <ElTable size="small" :data="listTask.data?.list" border stripe>
                     <ElTableColumn label="存货" align="center">
+                      <ElTableColumn prop="product_id" label="商品ID" width="60" show-overflow-tooltip />
+                      
                       <ElTableColumn prop="skuCode" label="编码" width="120" show-overflow-tooltip />
                       <ElTableColumn prop="goodName" label="名称" width="150" show-overflow-tooltip />
 
@@ -138,7 +140,7 @@ const formData = ref({
 
                     <ElTableColumn label="发出" align="center">
                       <ElTableColumn prop="out_num" label="数量" show-overflow-tooltip />
-                      
+
                       <ElTableColumn prop="unit_price" label="单价" show-overflow-tooltip>
                         <template #="{ row }">
                           {{ row.Porduct?.subunit_price }}
@@ -150,8 +152,8 @@ const formData = ref({
 
                     <ElTableColumn label="结存" align="center">
                       <ElTableColumn prop="balance_num" label="数量" show-overflow-tooltip />
-                      
-                        <ElTableColumn prop="unit_price" label="单价" show-overflow-tooltip>
+
+                      <ElTableColumn prop="unit_price" label="单价" show-overflow-tooltip>
                         <template #="{ row }">
                           {{ row.Porduct?.subunit_price }}
                         </template>