build

src/components/PageContent/src/page-content.tsx

@@ -56,21 +56,17 @@ const PageContent = defineComponent({
     } = useRequest(props);
 
     const { selects } = useSelection();
-    const { action } = useActions(props.contentConfig);
     const { isSuperUser } = useUserInfo();
+    const { action } = useActions(props.contentConfig);
+    const { columns, fixed, displayColumns, _raw, reset } = useColumns(props.contentConfig.columns);
 
-    const { columns, fixed, displayColumns, _raw, reset } = useColumns(
-      props.contentConfig.columns
-    );
-
-    function handleSelection(value) {
+    // 
+    function handleSelection(value: any) {
       selects.value = value;
       emit("selectionChange", value);
     }
 
-    /**
-     * 渲染需要的操作按钮
-     */
+    /* 渲染需要的操作按钮 */ 
     function renderOperation(row) {
       const { contentConfig, powers } = props;
       const {
@@ -84,78 +80,49 @@ const PageContent = defineComponent({
         returnProps,
         showPreview,
         showPayTagFn,
+        showUnPayTagFn,
         showReturnTagFn,
-        isRequesetArray,
+        showUnReturnTagFn,
+        isRequestArray,
         superUserNoAction,
         superUserNoPerview,
       } = contentConfig;
 
       const view = showPreview ? showPreview(row) : true;
-
-      const del = showDelete ? showDelete(row) : true;
-
-      const noAction =
-        (superUserNoAction && !isSuperUser.value) || !superUserNoAction;
-
-      const noPerview =
-        (superUserNoPerview && !isSuperUser.value) || !superUserNoPerview;
-
+      const del = showPreview ? showDelete(row) : true;
+      const noAction = (superUserNoAction && !isSuperUser.value) || !superUserNoAction;
+      const noPerview = (superUserNoPerview && !isSuperUser.value) || !superUserNoPerview;
       const showPay = showPayTagFn ? showPayTagFn(row, powers) : true;
       const showReturn = showReturnTagFn ? showReturnTagFn(row, powers) : true;
+      const showUnPay = showUnPayTagFn ? showUnPayTagFn(row,powers) && Number(row.pay_tag) !== 0 : false;
+      const showUnReturn = showUnReturnTagFn ? showUnReturnTagFn(row, powers)  && Number(row.inv_tag) !== 0 : false;
 
       const _showStatus = showStatus
-        ? showStatus(isSuperUser.value)
-        : action.status &&
-        noAction &&
-        ((powers.some(i => i == "003") && row.status + "" === "0") ||
-          (powers.some(i => i == "004") && row.status + "" === "1"));
+      ? showStatus(isSuperUser.value)
+      : action.status &&
+      noAction &&
+      ((powers.some(i => i == "003") && row.status + "" === "0") ||
+        (powers.some(i => i == "004") && row.status + "" === "1"));
 
       return (
         <>
-          {!notPreview && view && noPerview && powers.some(i => i == "007") && (
-            <Operation.Preview
-              isInv={inv}
-              onPreview={() => emit("previewBtnClick", row)}
-            />
-          )}
-
+          {!notPreview && view && noPerview && powers.some(i => i == "007") && ( <Operation.Preview isInv={inv} onPreview={() => emit("previewBtnClick", row)} /> )}
           {slots.custom && slots.custom(row)}
-
-          {returnProps && noAction && showReturn && (
-            <Operation.Tag
-              row={row}
-              tagProps={returnProps}
-              onReload={() => onSearch()}
-            />
-          )}
-
-          {payProps && noAction && showPay && (
-            <Operation.Tag
-              row={row}
-              tagProps={payProps}
-              isPay
-              onReload={() => onSearch()}
-            />
-          )}
-
-          {action.update && powers.some(i => i == "005") && noAction && (
-            <Operation.Update
-              onUpdate={() => emit("updateBtnClick", row)}
-              {...createActionProps("update", apis)}
-            />
-          )}
-
+          {returnProps && noAction && showReturn && (<Operation.Tag row={row} tagProps={returnProps} onReload={() => onSearch()} /> )}
+          {payProps && noAction && showPay  && ( <Operation.Tag row={row} tagProps={payProps} isPay onReload={() => onSearch()} /> )}
+          {returnProps && showUnReturn && (<Operation.UnTag row={row} tagProps={returnProps} onReload={() => onSearch()} />)}
+          {payProps && showUnPay && (<Operation.UnTag  row={row} isPay tagProps={payProps} onReload={() => onSearch()} />)}
+          {action.update && powers.some(i => i == "005") && noAction && (<Operation.Update onUpdate={() => emit("updateBtnClick", row)} {...createActionProps("update", apis)} />)}
           {_showStatus && (
             <Operation.Status
               row={row}
               prop={contentConfig.statusProp}
               statusRowProp={contentConfig.statusRowProp}
               onReload={() => onSearch()}
-              isRequesetArray={isRequesetArray}
+              isRequestArray={isRequestArray}
               {...createActionProps("status", apis)}
             />
           )}
-
           {del && noAction && action.delete && powers.some(i => i == "006") && (
             <Operation.Delete
               row={row}
@@ -182,12 +149,7 @@ const PageContent = defineComponent({
 
       return (
         (slots.create && slots.create()) ||
-        (action.create && powers.some(i => i == "002") && (
-          <Operation.Create
-            {...createActionProps("create", contentConfig.apis)}
-            onCreate={() => emit("createBtnClick")}
-          />
-        ))
+        (action.create && powers.some(i => i == "002") && (<Operation.Create {...createActionProps("create", contentConfig.apis)} onCreate={() => emit("createBtnClick")} />))
       );
     }
 
@@ -274,7 +236,7 @@ const PageContent = defineComponent({
 
     function renderPureTable(size, checkList) {
       const { contentConfig } = props;
-      const { treeProps, rowKey, isTree,maxHeight,tableRowClassName } = contentConfig;
+      const { treeProps, rowKey, isTree,maxHeight, tableRowClassName } = contentConfig;
 
       return (
         <PureTable
@@ -291,11 +253,9 @@ const PageContent = defineComponent({
           treeProps={treeProps}
           data={dataList.value}
           checkList={checkList}
-          maxHeight={ maxHeight ? maxHeight : '660px'}
-          paginationSmall={
-            size === "small" ? true : false
-          }
           rowClassName={tableRowClassName}
+          maxHeight={ maxHeight ? maxHeight : '660px'}
+          paginationSmall={ size === "small" ? true : false }
           headerCellStyle={{ background: "#fafafa", color: "#606266" }}
           onSelectionChange={handleSelection}
           {...paginationConfig}

src/views/InvoiceSales/sheetOrderRecord/config/content.config.ts

@@ -15,6 +15,11 @@ const columns = [
     prop: 'code',
     width: '160px'
   },
+  {
+    label: '开票编码',
+    prop: 'tag_code',
+    width: '160px'
+  },
   {
     label: '业务公司',
     prop: 'companyName',