暂存

src/utils/details/inv-open.ts

@@ -200,6 +200,7 @@ export const INV_OPEN_COLUMNS: DescriptionColumns = [
   {
     field: "cancel_fee",
     label: "订单信息:",
+    span: 24,
     render(_, { orderinfo }) {
       return h(
         ElTable,

src/utils/details/sale.ts

@@ -71,57 +71,51 @@ export const ORDER_COLUMNS: DescriptionColumns = [
   {
     field: "sequenceNo",
     label: "销售单编号",
-    labelWidth: "80px",
-    span: 2
+    span: 6
   },
   {
     field: "ownerName",
-    labelWidth: "80px",
-    span: 2,
-    label: "销售员",
-    render: (ownerName, { ownerid }) =>
-      createTooltip(ownerName, "销售员id : " + ownerid, 160)
+    span: 6,
+    label: "销售员"
   },
   {
     field: "createdTime",
-    labelWidth: "80px",
-    span: 1,
+    span: 6,
     label: "新建时间"
   },
   {
     field: "department",
-    labelWidth: "80px",
-    span: 1,
+    span: 6,
     label: "销售部门"
   },
   {
     field: "companyName",
-    label: "业务公司",
-    span: 3,
+    label: "业务公司公司",
+    span: 12,
     render: (company, { companyNo }) =>
       createTooltip(company, "业务公司编号 : " + companyNo, 270)
   },
   {
     field: "customerName",
     label: "客户公司",
-    span: 3,
+    span: 12,
     render: (customer, { customerNo }) =>
       createTooltip(customer, "客户公司编号 : " + customerNo, 270)
   },
   {
     field: "poCode",
-    span: 2,
+    span: 24,
     label: "po编号"
   },
-  {
-    field: "cgdNo",
-    span: 2,
-    label: "采购单号"
-  },
+  // {
+  //   field: "cgdNo",
+  //   span: 2,
+  //   label: "采购单号"
+  // },
   {
     field: "status",
     label: "状态",
-    span: 1,
+    span: 6,
     render(data) {
       return h(ElTag, null, {
         default: () => SALE_STATUS.find(s => s.value === data)?.label
@@ -130,36 +124,43 @@ export const ORDER_COLUMNS: DescriptionColumns = [
   },
   {
     field: "platName",
-    span: 1,
+    span: 6,
     label: "平台名称"
   },
   {
     field: "wsendNum",
+    span: 6,
     label: "未发货"
   },
   {
     field: "sendNum",
+    span: 6,
     label: "已发货"
   },
   {
     field: "pay_fee",
+    span: 6,
     label: "付款中"
   },
   {
     field: "apay_fee",
+    span: 6,
     label: "已付款"
   },
   {
     field: "inv_fee",
+    span: 6,
     label: "开票中"
   },
   {
     field: "ainv_fee",
+    span: 6,
     label: "已开票"
   },
   {
     field: "sendType",
     label: "发货方式",
+    span: 6,
     render(data) {
       return h(ElTag, null, {
         default: () => SEND_TYPE.find(t => t.value === data)?.label
@@ -169,6 +170,7 @@ export const ORDER_COLUMNS: DescriptionColumns = [
   {
     field: "inv_status",
     label: "开票状态",
+    span: 6,
     render(data) {
       return h(ElTag, null, {
         default: () => INV_STATUS.find(t => t.value === data)?.label
@@ -178,6 +180,7 @@ export const ORDER_COLUMNS: DescriptionColumns = [
   {
     field: "pay_status",
     label: "付款状态",
+    span: 6,
     render(data) {
       return h(ElTag, null, {
         default: () => PAY_STATUS.find(t => t.value === data)?.label
@@ -186,30 +189,37 @@ export const ORDER_COLUMNS: DescriptionColumns = [
   },
   {
     field: "thNum",
+    span: 6,
     label: "退货数量"
   },
   {
     field: "th_fee",
+    span: 6,
     label: "退货金额"
   },
   {
     field: "diff_weight",
+    span: 6,
     label: "工差重量"
   },
   {
     field: "diff_fee",
+    span: 6,
     label: "工差金额"
   },
   {
     field: "customerAttr",
+    span: 6,
     label: "公司属性"
   },
   {
     field: "branch",
+    span: 6,
     label: "分公司"
   },
   {
     field: "paytime",
+    span: 6,
     label: "付款时间"
   }
 ];
@@ -218,31 +228,37 @@ export const GOOD_COLUMNS: DescriptionColumns = [
   {
     field: "goodNo",
     label: "商品编号",
-    span: 2
+    span: 6
   },
   {
     field: "goodBrand",
-    label: "品牌"
+    label: "品牌",
+    span: 6
   },
   {
     field: "firstCat",
-    label: "一级分类"
+    label: "一级分类",
+    span: 6
   },
   {
     field: "secCat",
-    label: "二级分类"
+    label: "二级分类",
+    span: 6
   },
   {
     field: "thirdCat",
-    label: "三级分类"
+    label: "三级分类",
+    span: 6
   },
   {
     field: "goodMaterial",
-    label: "材质"
+    label: "材质",
+    span: 6
   },
   {
     field: "goodType",
     label: "商品类型",
+    span: 6,
     render(data) {
       return h(ElTag, null, {
         default: () => SALE_GOOD_TYPE.find(t => t.value === data)?.label
@@ -252,6 +268,7 @@ export const GOOD_COLUMNS: DescriptionColumns = [
   {
     field: "isStock",
     label: "是否库存",
+    span: 6,
     render(data) {
       return h(ElTag, null, {
         default: () => (data === "1" ? "库存" : "非库存")
@@ -260,39 +277,48 @@ export const GOOD_COLUMNS: DescriptionColumns = [
   },
   {
     field: "goodModel",
-    label: "型号"
+    label: "型号",
+    span: 6
   },
   {
     field: "metalsType",
-    label: "贵金属种类"
+    label: "贵金属种类",
+    span: 6
   },
   {
     field: "weight",
-    label: "重量"
+    label: "重量",
+    span: 6
   },
   {
     field: "goldPrice",
-    label: "金价"
+    label: "金价",
+    span: 6
   },
   {
     field: "workDay",
-    label: "工期"
+    label: "工期",
+    span: 6
   },
   {
     field: "tax",
-    label: "税率"
+    label: "税率",
+    span: 6
   },
   {
     field: "goodNum",
-    label: "商品数量"
+    label: "商品数量",
+    span: 6
   },
   {
     field: "goodPrice",
-    label: "商品单价"
+    label: "商品单价",
+    span: 6
   },
   {
     field: "totalPrice",
-    label: "总金额"
+    label: "总金额",
+    span: 6
   }
 ];
 

src/utils/details/tragelog.ts

@@ -35,7 +35,7 @@ export const CAPITAL_COLUMNS: DescriptionColumns = [
     field: "logNo",
     label: "编号",
     width: "180px",
-    span: 2
+    span: 6
   },
   {
     field: "status",
@@ -50,18 +50,18 @@ export const CAPITAL_COLUMNS: DescriptionColumns = [
   {
     field: "addtime",
     label: "认领时间",
-    span: 2
+    span: 6
   },
   {
     field: "used_fee",
     label: "资金使用金额",
     width: "130px",
-    span: 2
+    span: 6
   },
   {
     field: "remark",
     label: "备注",
-    span: 6
+    span: 24
   }
 ];
 

src/views/InvoiceSaleSettings/consultingCost/config/configs.ts

@@ -38,29 +38,17 @@ export const good_detail_columns = [
     label: "商品编号"
   },
   {
-    field: "good_name",
-    label: "商品名称"
-  },
-  {
-    field: "companyNo",
-    label: "业务公司编号"
-  },
-  {
-    field: "supplierNo",
-    label: "供应商编号"
-  },
-  {
-    field: "is_stock",
-    label: "是否库存",
-    render(stock) {
+    field: "status",
+    label: "关联状态",
+    render(status) {
       return h(ElTag, null, {
-        default: () => stock_type.find(s => s.value === String(stock))?.label
+        default: () => good_type.find(s => s.value === String(status))?.label
       });
     }
   },
   {
-    field: "craft_desc",
-    label: "工艺描述"
+    field: "creater",
+    label: "商品创建人"
   },
   {
     field: "good_img",
@@ -79,26 +67,37 @@ export const good_detail_columns = [
     }
   },
   {
-    field: "creater",
-    label: "创建人"
+    field: "good_name",
+    label: "商品名称",
+    span: 24
   },
   {
-    field: "cat_name",
-    label: "分类名称"
+    field: "companyNo",
+    label: "业务公司编号"
   },
   {
-    field: "unit_name",
-    label: "单位名称"
+    field: "supplierNo",
+    label: "供应商编号"
   },
   {
-    field: "status",
-    label: "是否关联开票类目",
-    render(status) {
+    field: "is_stock",
+    label: "是否库存",
+    render(stock) {
       return h(ElTag, null, {
-        default: () => good_type.find(s => s.value === String(status))?.label
+        default: () => stock_type.find(s => s.value === String(stock))?.label
       });
     }
   },
+  {
+    field: "unit_name",
+    label: "单位名称"
+  },
+
+  {
+    field: "cat_name",
+    label: "分类名称"
+  },
+
   {
     field: "inv_cat_name",
     label: "类目名称"
@@ -111,20 +110,21 @@ export const good_detail_columns = [
     field: "inv_tax",
     label: "类目税率额"
   },
+
   {
-    field: "inv_good_name",
-    label: "开票商品名称"
+    field: "craft_desc",
+    label: "工艺描述",
+    span: 24
   },
+
   {
     field: "inv_good_name",
-    label: "开票商品名称"
-  },
-  {
-    field: "addtime",
-    label: "申请时间"
+    label: "开票商品名称",
+    span: 24
   },
   {
     field: "after_sales",
-    label: "售后"
+    label: "售后",
+    span: 24
   }
 ];

src/views/InvoiceSales/capitalPool/capital-dialog.vue

@@ -25,7 +25,7 @@ defineExpose({
 </script>
 
 <template>
-  <el-dialog v-model="visible" center title="资金详情">
+  <el-dialog v-model="visible" center title="资金详情" width="1040px">
     <BasicDescriptions
       v-loading="loading"
       :columns="CAPITAL_COLUMNS"

src/views/InvoiceSales/refund/config/_details.ts

@@ -10,22 +10,23 @@ import { refundTypeOptions, refundStatusOptions } from "./_options";
 export const refundColumns: DescriptionColumns = [
   {
     label: "退款编号",
-    span: 2,
+    span: 6,
     field: "returnCode"
   },
   {
     label: "资金认领编号",
-    span: 2,
+    span: 6,
     field: "logNo"
   },
   {
     label: "资金编号",
-    span: 2,
+    span: 6,
     field: "tradNo"
   },
   {
     label: "退款类型",
     field: "type",
+    span: 6,
     render(type) {
       return h(ElTag, null, {
         default: () =>
@@ -36,6 +37,7 @@ export const refundColumns: DescriptionColumns = [
   {
     label: "退款状态",
     field: "status",
+    span: 6,
     render(status) {
       return h(ElTag, null, {
         default: () =>
@@ -47,53 +49,59 @@ export const refundColumns: DescriptionColumns = [
   {
     label: "申请人",
     field: "apply_name",
+    span: 6,
     render: (apply_name, { apply_id }) =>
       createTooltip(apply_name, "申请人ID : " + apply_id, 90)
   },
   {
     label: "付款公司",
-    span: 2,
+    span: 6,
     field: "trade_out"
   },
   {
     label: "退款时间",
+    span: 6,
     field: "addtime"
   },
   {
     label: "交易公司",
-    span: 2,
+    span: 6,
     field: "trade_out"
   },
   {
     label: "收款公司",
-    span: 2,
+    span: 6,
     field: "trade_in"
   },
   {
     label: "交易银行",
-    span: 2,
+    span: 6,
     field: "trade_bank"
   },
   {
     label: "总金额",
+    span: 6,
     field: "total_fee"
   },
   {
     label: "余额",
+    span: 6,
     field: "balance"
   },
   {
     label: "已认领金额",
+    span: 6,
     field: "used_fee"
   },
   {
     label: "认领金额",
+    span: 6,
     field: "log_total_fee"
   },
   {
     label: "退款回执",
     field: "return_img",
-    span: 2,
+    span: 6,
     render(img_url) {
       const imgs = img_url ? img_url.split(",") : [];
       return imgs.map(url => {
@@ -113,6 +121,7 @@ export const refundColumns: DescriptionColumns = [
   },
   {
     label: "备注",
+    span: 6,
     field: "remark"
   }
 ];

src/views/InvoiceSales/sheetOrderPool/detail-dialog.vue

@@ -21,7 +21,7 @@ defineExpose({
 </script>
 
 <template>
-  <ElDialog center title="确认单详情" v-model="visible" width="1100px">
+  <ElDialog center title="确认单详情" v-model="visible" width="1040px">
     <div v-loading="loading">
       <BasicDescriptions
         v-loading="loading"

src/views/interest/action/index.vue

@@ -461,11 +461,12 @@ watch(
                           )
                         "
                       >
-                        <div class="stitle">
-                          <span class="_h2">{{ subItem.menu_name }}</span>
+                        <div class="stitle clear">
+                          <span class="_h2 fl">{{ subItem.menu_name }}</span>
                           <el-radio-group
                             style="margin: 0 0 0 20px"
-                            :size="'mini'"
+                            class="fl"
+                            size="small"
                             v-if="
                               subItem &&
                               subItem.private &&
@@ -474,6 +475,7 @@ watch(
                             v-model="subItem.is_private_change"
                           >
                             <el-radio-button
+                              size="small"
                               v-for="(radioN, ri) in subItem.private"
                               :key="radioN.label + ri"
                               :label="radioN.id"
@@ -488,6 +490,7 @@ watch(
                           <div class="checkAll">
                             <el-checkbox
                               v-model="subItem.checkAll"
+                              size="small"
                               :disabled="editType === 'view'"
                               :indeterminate="indeterminateCheck(subItem)"
                               @change="
@@ -503,6 +506,7 @@ watch(
                           </div>
                           <div class="checkItem">
                             <el-checkbox-group
+                              size="small"
                               v-model="subItem.checkList"
                               :disabled="editType === 'view'"
                               @change="
@@ -515,6 +519,7 @@ watch(
                               "
                             >
                               <el-checkbox
+                                size="small"
                                 :disabled="editType === 'view'"
                                 v-for="children in subItem.action"
                                 :key="'checkItem' + children.id"
@@ -542,6 +547,7 @@ watch(
                         >
                           <div class="checkAll">
                             <el-checkbox
+                              size="small"
                               v-model="subItem.fieldAll"
                               :disabled="editType === 'view'"
                               :indeterminate="indeterminateField(subItem)"
@@ -559,6 +565,7 @@ watch(
                           <div class="checkItem">
                             <el-checkbox-group
                               v-model="subItem.fieldList"
+                              size="small"
                               :disabled="editType === 'view'"
                               @change="
                                 handleFieldGroupChange(
@@ -573,6 +580,7 @@ watch(
                                 v-for="children in subItem.action_data"
                                 :key="'FieldItem' + children.id"
                                 :label="children.id"
+                                size="small"
                                 :disabled="editType === 'view'"
                                 @change="
                                   handleFieldChange(
@@ -752,14 +760,17 @@ watch(
               border-bottom: 1px solid #dfe6ec;
 
               .stitle {
-                padding: 18px 18px 12px 18px;
+                padding: 15px 18px 10px 18px;
                 border-bottom: 1px dashed #dfe6ec;
                 font-size: 14px;
                 color: #97a8be;
 
                 ._h2 {
                   display: inline-block;
-                  width: 100px;
+                  height: 24px;
+                  line-height: 24px;
+
+                  // width: 100px;
                 }
               }
 
@@ -769,13 +780,13 @@ watch(
                 width: 100%;
 
                 .checkAll {
-                  width: 140px;
+                  width: 110px;
                   text-align: right;
-                  padding: 0 35px 0 0;
+                  padding: 0 25px 0 0;
                 }
 
                 .checkItem {
-                  width: calc(100% - 140px);
+                  width: calc(100% - 120px);
                 }
               }
 

src/views/interest/companyAccount/index.vue

@@ -168,6 +168,7 @@ onMounted(() => {
         ref="formRef"
         :inline="true"
         :model="form"
+        size="small"
         :label-width="0"
         class="bg-white w-99/100 pl-8 pt-4"
       >
@@ -214,11 +215,13 @@ onMounted(() => {
         title="公司账号管理"
         :loading="loading"
         :dataList="dataList"
+        size="small"
         @refresh="onSearch"
       >
         <template #buttons>
           <el-button
             type="primary"
+            size="small"
             :icon="useRenderIcon('add')"
             @click="editItem('', 'add', {})"
           >
@@ -231,7 +234,7 @@ onMounted(() => {
             align="left"
             showOverflowTooltip
             table-layout="auto"
-            :size="size"
+            size="small"
             :data="dataList"
             :columns="columns"
             :checkList="checkList"
@@ -249,7 +252,7 @@ onMounted(() => {
                     class="reset-margin"
                     link
                     type="primary"
-                    :size="size"
+                    size="small"
                     v-if="powers.some(i => i == '012')"
                     :icon="useRenderIcon('refresh-right')"
                   /> </template
@@ -259,7 +262,7 @@ onMounted(() => {
                 v-if="powers.some(i => i == '007')"
                 link
                 type="primary"
-                :size="size"
+                size="small"
                 @click="editItem(row.id, 'view', row)"
                 :icon="useRenderIcon('eye-view')"
               />
@@ -268,7 +271,7 @@ onMounted(() => {
                 link
                 v-if="powers.some(i => i == '005')"
                 type="primary"
-                :size="size"
+                size="small"
                 @click="editItem(row.id, 'edit', row)"
                 :icon="useRenderIcon('edits')"
               />
@@ -287,7 +290,7 @@ onMounted(() => {
                     class="reset-margin"
                     link
                     type="primary"
-                    :size="size"
+                    size="small"
                     :icon="
                       useRenderIcon(
                         String(row.status) === '1'

src/views/interest/role/addEdit.vue

@@ -14,7 +14,8 @@ import {
 } from "/@/api/interest/role";
 
 const { logout } = useNav();
-const formSize = ref("default");
+const formSize = ref("small");
+
 const ruleFormRef = ref<FormInstance>();
 
 const { currentCompany } = useCompany();
@@ -542,11 +543,12 @@ let indeterminateField = computed(() => {
                             )
                           "
                         >
-                          <div class="stitle">
-                            <span class="_h2">{{ subItem.menu_name }}</span>
+                          <div class="stitle clear">
+                            <span class="_h2 fl">{{ subItem.menu_name }}</span>
                             <el-radio-group
                               style="margin: 0 0 0 20px"
-                              :size="'mini'"
+                              class="fl"
+                              size="small"
                               v-if="
                                 subItem &&
                                 subItem.private &&
@@ -555,6 +557,7 @@ let indeterminateField = computed(() => {
                               v-model="subItem.is_private_change"
                             >
                               <el-radio-button
+                                size="small"
                                 v-for="(radioN, ri) in subItem.private"
                                 :key="radioN.label + ri"
                                 :label="String(radioN.id)"
@@ -758,14 +761,15 @@ let indeterminateField = computed(() => {
             border-bottom: 1px solid #dfe6ec;
 
             .stitle {
-              padding: 18px 18px 12px 18px;
+              padding: 15px 18px 10px 18px;
               border-bottom: 1px dashed #dfe6ec;
               font-size: 14px;
               color: #97a8be;
 
               ._h2 {
                 display: inline-block;
-                width: 100px;
+                height: 24px;
+                line-height: 24px;
               }
             }
 
@@ -775,13 +779,13 @@ let indeterminateField = computed(() => {
               width: 100%;
 
               .checkAll {
-                width: 140px;
+                width: 110px;
                 text-align: right;
-                padding: 0 35px 0 0;
+                padding: 0 25px 0 0;
               }
 
               .checkItem {
-                width: calc(100% - 140px);
+                width: calc(100% - 120px);
               }
             }
 

src/views/interest/role/index.vue

@@ -142,6 +142,7 @@ watch(
         ref="formRef"
         :inline="true"
         :model="form"
+        size="small"
         :label-width="0"
         class="bg-white w-99/100 pl-8 pt-4"
       >
@@ -190,6 +191,7 @@ watch(
         <template #buttons>
           <el-button
             type="primary"
+            size="small"
             v-if="powers.some(i => i == '002')"
             :icon="useRenderIcon('add')"
             @click="editItem('', 'add')"
@@ -203,7 +205,7 @@ watch(
             align="left"
             showOverflowTooltip
             table-layout="auto"
-            :size="size"
+            size="small"
             :data="dataList"
             :columns="columns"
             :checkList="checkList"

src/views/supply/purchPay/config/_options.ts

@@ -1,27 +1,43 @@
 export const statusOptions = [
   {
-    value: "0",
-    label: "待发起"
+    label: "待系统验证",
+    value: "1"
+  },
+  {
+    label: "待买方公司审核",
+    value: "2"
+  },
+  {
+    label: "待买方公司认证",
+    value: "3"
+  },
+  {
+    label: "认证成功",
+    value: "4"
+  },
+  {
+    label: "验证失败",
+    value: "5"
   },
   {
-    value: "1",
-    label: "待买方审核"
+    label: "买方审核驳回",
+    value: "6"
   },
   {
-    value: "2",
-    label: "待付款回执"
+    label: "认证失败",
+    value: "7"
   },
   {
-    value: "3",
-    label: "审核成功"
+    label: "回票流程终止",
+    value: "8"
   },
   {
-    value: "4",
-    label: "买方公司驳回"
+    label: "验证超过次数",
+    value: "9"
   },
   {
-    value: "5",
-    label: "付款已退"
+    label: "回票已退",
+    value: "10"
   }
 ];
 

src/views/system/account/index.vue

@@ -156,8 +156,9 @@ onMounted(() => {
       <el-form
         ref="formRef"
         :model="form"
+        size="small"
         :label-width="0"
-        class="bg-white w-99/100 pl-8 pt-4"
+        class="bg-white pl-8 pt-4"
       >
         <el-row :gutter="12">
           <el-col :span="6">
@@ -220,12 +221,14 @@ onMounted(() => {
       <TableProBar
         title="运营账号管理"
         :loading="loading"
+        size="small"
         :dataList="dataList"
         @refresh="onSearch"
       >
         <template #buttons>
           <el-button
             type="primary"
+            size="small"
             :icon="useRenderIcon('add')"
             @click="editItem('', 'add', {})"
           >