新需求

src/components/process/PurchasePayment.vue

@@ -172,6 +172,15 @@ const formConfig = computed(() => {
       itemType: "textarea",
     },
     {
+      type: "treeSelect",
+      prop: "companyId",
+      label: "业务公司",
+      data: proxy.useUserStore().allDict["tree_company_data"],
+      propsTreeLabel: "deptName",
+      propsTreeValue: "deptId",
+      itemWidth: 33.33,
+    },
+    {
       type: "number",
       prop: "receiptsNum",
       label: "单据数量",
@@ -308,6 +317,7 @@ const rules = ref({
   ],
   type: [{ required: true, message: "请选择付款类型", trigger: "change" }],
   taxRate: [{ required: true, message: "请输入税率", trigger: "blur" }],
+  companyId: [{ required: true, message: "请选择业务公司", trigger: "change" }],
 });
 
 const getDict = () => {

src/components/process/SF/Purchase.vue

@@ -378,18 +378,27 @@ const formConfig = computed(() => {
     {
       type: "title",
       title: "基本信息",
-      isShow: formData.data.code ? true : false,
     },
     {
       type: "input",
       prop: "code",
       label: "合同号",
       isShow: formData.data.code ? true : false,
+      itemWidth: 50,
+    },
+    {
+      type: "treeSelect",
+      prop: "companyId",
+      label: "业务公司",
+      data: proxy.useUserStore().allDict["tree_company_data"],
+      propsTreeLabel: "deptName",
+      propsTreeValue: "deptId",
+      itemWidth: 50,
     },
     {
       type: "title",
       title: "贸易信息",
-      haveLine: formData.data.code ? true : false,
+      haveLine: true,
     },
     {
       type: "slot",
@@ -586,6 +595,7 @@ const rules = ref({
   payName: [{ required: true, message: "请输入收费项目", trigger: ["blur"] }],
   amount: [{ required: true, message: "请输入金额", trigger: "blur" }],
   remark: [{ required: true, message: "请输入条款内容", trigger: "blur" }],
+  companyId: [{ required: true, message: "请选择业务公司", trigger: "change" }],
 });
 const getDict = () => {
   proxy

src/components/process/SF/PurchaseChange.vue

@@ -378,19 +378,28 @@ const formConfig = computed(() => {
     {
       type: "title",
       title: "基本信息",
-      isShow: formData.data.code ? true : false,
     },
+
     {
       type: "input",
       prop: "code",
       label: "合同号",
       isShow: formData.data.code ? true : false,
-      disabled: true,
+      itemWidth: 50,
+    },
+    {
+      type: "treeSelect",
+      prop: "companyId",
+      label: "业务公司",
+      data: proxy.useUserStore().allDict["tree_company_data"],
+      propsTreeLabel: "deptName",
+      propsTreeValue: "deptId",
+      itemWidth: 50,
     },
     {
       type: "title",
       title: "贸易信息",
-      haveLine: formData.data.code ? true : false,
+      haveLine: true,
     },
     {
       type: "slot",
@@ -587,6 +596,7 @@ const rules = ref({
   payName: [{ required: true, message: "请输入收费项目", trigger: ["blur"] }],
   amount: [{ required: true, message: "请输入金额", trigger: "blur" }],
   remark: [{ required: true, message: "请输入条款内容", trigger: "blur" }],
+  companyId: [{ required: true, message: "请选择业务公司", trigger: "change" }],
 });
 const getDict = () => {
   proxy

src/components/process/SF/ReturnGood.vue

@@ -130,6 +130,15 @@ const formConfig = computed(() => {
       disabled: true,
     },
     {
+      type: "treeSelect",
+      prop: "companyId",
+      label: "业务公司",
+      data: proxy.useUserStore().allDict["tree_company_data"],
+      propsTreeLabel: "deptName",
+      propsTreeValue: "deptId",
+      itemWidth: 50,
+    },
+    {
       type: "title",
       title: "退货明细",
       haveLine: true,
@@ -146,6 +155,7 @@ const rules = ref({
   code: [{ required: true, message: "请选择采购订单", trigger: "blur" }],
   // quantity: [{ required: true, message: "请输入退货数量", trigger: "blur" }],
   remark: [{ required: true, message: "请输入退货原因", trigger: "blur" }],
+  companyId: [{ required: true, message: "请选择业务公司", trigger: "change" }],
 });
 
 const getAllFileData = () => {

src/components/process/SF/Subscribe.vue

@@ -105,22 +105,31 @@ const formConfig = computed(() => {
       type: "input",
       prop: "deptName",
       label: "申购部门",
-      itemWidth: 33.33,
+      itemWidth: 25,
       disabled: true,
     },
     {
       type: "input",
       prop: "subcribeName",
       label: "申购人",
-      itemWidth: 33.33,
+      itemWidth: 25,
       disabled: true,
     },
     {
+      type: "treeSelect",
+      prop: "companyId",
+      label: "业务公司",
+      data: proxy.useUserStore().allDict["tree_company_data"],
+      propsTreeLabel: "deptName",
+      propsTreeValue: "deptId",
+      itemWidth: 25,
+    },
+    {
       type: "date",
       prop: "subcribeTime",
       itemType: "date",
       label: "申时间",
-      itemWidth: 33.33,
+      itemWidth: 25,
       disabled: false,
     },
     {
@@ -153,6 +162,7 @@ const rules = ref({
     { required: true, message: "请选择申购时间", trigger: "change" },
   ],
   count: [{ required: true, message: "请输入申购数量", trigger: "blur" }],
+  companyId: [{ required: true, message: "请选择业务公司", trigger: "change" }],
 });
 
 const selectMaterial = (row) => {

src/layout/index.vue

@@ -68,7 +68,29 @@ const getAllDict = () => {
   proxy
     .useUserStore()
     .allDictMap()
-    .then(() => {})
+    .then(() => {
+      proxy
+        .get("/tenantDept/list", {
+          pageNum: 1,
+          pageSize: 9999,
+          keyword: "",
+          tenantId: proxy.useUserStore().user.tenantId,
+          type: 0,
+        })
+        .then((res) => {
+          proxy.useUserStore().allDict["list_company_data"] = res.data.map(
+            (x) => ({
+              ...x,
+              label: x.deptName,
+              value: x.deptId,
+            })
+          );
+          proxy.useUserStore().allDict["tree_company_data"] = proxy.handleTree(
+            res.data,
+            "deptId"
+          );
+        });
+    })
     .catch(() => {});
 };
 getAllDict();

src/views/EHSD/procurement/returnGood/index.vue

@@ -178,6 +178,12 @@ const config = computed(() => {
     },
     {
       attrs: {
+        label: "业务公司",
+        prop: "companyName",
+      },
+    },
+    {
+      attrs: {
         label: "采购单号",
         prop: "purchaseCode",
       },

src/views/EHSD/saleContract/priceSheetEHSD/index.vue

@@ -59,20 +59,22 @@
 
         <template #btn="{item}">
           <div style="width: 100%">
-            <span v-if="item.status == 0">
-              <el-button type="primary" text v-debounce @click="getDtl(item, false)">修改</el-button>
-              <el-button type="danger" text v-debounce @click="handleRepeal(item,'/saleQuotation/delete')">删除</el-button>
-            </span>
-            <span v-if="item.status !=88">
-              <el-button type="primary" text v-debounce v-if="item.quotationStatus==2 && !item.extQuotationId"
-                         @click="handleBack(item)">退回</el-button>
-              <el-button type="primary" text v-debounce v-if="item.status == 30 && item.quotationStatus==2"
-                         @click="getDtl(item, false,true)">变更</el-button>
-              <el-button type="primary" text v-debounce v-if="item.quotationStatus==2 && !item.extQuotationId"
-                         @click="handleForeign(item)">转对外</el-button>
-              <el-button type="danger" text v-debounce v-if="item.status !=0 && item.status !=88"
-                         @click="handleRepeal(item,'/saleQuotation/cancellation')">作废</el-button>
-            </span>
+            <div v-if="isCurrentCompanyData(item.ofCompanyId)">
+              <span v-if="item.status == 0">
+                <el-button type="primary" text v-debounce @click="getDtl(item, false)">修改</el-button>
+                <el-button type="danger" text v-debounce @click="handleRepeal(item,'/saleQuotation/delete')">删除</el-button>
+              </span>
+              <span v-if="item.status !=88">
+                <el-button type="primary" text v-debounce v-if="item.quotationStatus==2 && !item.extQuotationId"
+                           @click="handleBack(item)">退回</el-button>
+                <el-button type="primary" text v-debounce v-if="item.status == 30 && item.quotationStatus==2"
+                           @click="getDtl(item, false,true)">变更</el-button>
+                <el-button type="primary" text v-debounce v-if="item.quotationStatus==2 && !item.extQuotationId"
+                           @click="handleForeign(item)">转对外</el-button>
+                <el-button type="danger" text v-debounce v-if="item.status !=0 && item.status !=88"
+                           @click="handleRepeal(item,'/saleQuotation/cancellation')">作废</el-button>
+              </span>
+            </div>
           </div>
         </template>
       </byTable>

src/views/EHSD/saleContract/priceSheetEstimate/index.vue

@@ -569,7 +569,9 @@ const config = computed(() => {
       },
       renderHTML(row) {
         return [
-          row.quotationStatus < 2 && row.status == 30
+          row.quotationStatus < 2 &&
+          row.status == 30 &&
+          proxy.isCurrentCompanyData(row.ofCompanyId)
             ? {
                 attrs: {
                   label: "报价",

src/views/EHSD/saleContract/priceSheetForeign/index.vue

@@ -93,11 +93,13 @@
 
       <template #btn="{item}">
         <div style="width: 100%">
+          <div v-if="isCurrentCompanyData(item.ofCompanyId)">
+            <el-button type="primary" text v-debounce v-if="item.status !=88" @click="handleGenerate(item,false)">生成订单</el-button>
+            <el-button type="primary" text v-debounce v-if="item.status !=88" @click="handleGenerate(item,true)">生成样品单</el-button>
+            <el-button type="primary" text v-debounce v-if="item.status !=88" @click="getDtl(item)">调价</el-button>
+            <el-button type="danger" text v-debounce v-if="item.status !=0 && item.status !=88" @click="handleRepeal(item)">作废</el-button>
+          </div>
           <!-- <el-button type="primary" text v-debounce @click="handleFollow(item)">跟进</el-button> -->
-          <el-button type="primary" text v-debounce v-if="item.status !=88" @click="handleGenerate(item,false)">生成订单</el-button>
-          <el-button type="primary" text v-debounce v-if="item.status !=88" @click="handleGenerate(item,true)">生成样品单</el-button>
-          <el-button type="primary" text v-debounce v-if="item.status !=88" @click="getDtl(item)">调价</el-button>
-          <el-button type="danger" text v-debounce v-if="item.status !=0 && item.status !=88" @click="handleRepeal(item)">作废</el-button>
         </div>
       </template>
     </byTable>

src/views/purchaseManage/purchaseManage/subscribe/index.vue

@@ -270,7 +270,7 @@ const config = computed(() => {
           //     getDtl(row);
           //   },
           // },
-          row.status == 15
+          row.status == 15 && proxy.isCurrentCompanyData(row.companyId)
             ? {
                 attrs: {
                   label: "作废",

src/views/purchaseManage/purchasePayment/invoice/index.vue

@@ -71,6 +71,13 @@ const config = computed(() => {
   return [
     {
       attrs: {
+        label: "业务公司",
+        prop: "companyName",
+        width: 110,
+      },
+    },
+    {
+      attrs: {
         label: "供应商",
         prop: "supplyName",
         width: 250,
@@ -113,50 +120,52 @@ const config = computed(() => {
         align: "center",
       },
       renderHTML(row) {
-        return [
-          {
-            attrs: {
-              label: "修改",
-              type: "primary",
-              text: true,
-            },
-            el: "button",
-            click() {
-              update(row);
-            },
-          },
-          {
-            attrs: {
-              label: "删除",
-              type: "primary",
-              text: true,
-            },
-            el: "button",
-            click() {
-              ElMessageBox.confirm(
-                "此操作将永久删除该数据, 是否继续?",
-                "提示",
-                {
-                  confirmButtonText: "确定",
-                  cancelButtonText: "取消",
-                  type: "warning",
-                }
-              ).then(() => {
-                proxy
-                  .post("/invoice/delete", {
-                    id: row.id,
-                  })
-                  .then(() => {
-                    ElMessage({
-                      message: "删除成功",
-                      type: "success",
-                    });
-                    getList();
+        return proxy.isCurrentCompanyData(row.companyId)
+          ? [
+              {
+                attrs: {
+                  label: "修改",
+                  type: "primary",
+                  text: true,
+                },
+                el: "button",
+                click() {
+                  update(row);
+                },
+              },
+              {
+                attrs: {
+                  label: "删除",
+                  type: "primary",
+                  text: true,
+                },
+                el: "button",
+                click() {
+                  ElMessageBox.confirm(
+                    "此操作将永久删除该数据, 是否继续?",
+                    "提示",
+                    {
+                      confirmButtonText: "确定",
+                      cancelButtonText: "取消",
+                      type: "warning",
+                    }
+                  ).then(() => {
+                    proxy
+                      .post("/invoice/delete", {
+                        id: row.id,
+                      })
+                      .then(() => {
+                        ElMessage({
+                          message: "删除成功",
+                          type: "success",
+                        });
+                        getList();
+                      });
                   });
-              });
-            },
-          },
-        ];
+                },
+              },
+            ]
+          : [];
       },
     },
   ];
@@ -219,6 +228,15 @@ const formOption = reactive({
 const formConfig = computed(() => {
   return [
     {
+      type: "treeSelect",
+      prop: "companyId",
+      label: "业务公司",
+      data: proxy.useUserStore().allDict["tree_company_data"],
+      propsTreeLabel: "deptName",
+      propsTreeValue: "deptId",
+      itemWidth: 50,
+    },
+    {
       type: "select",
       label: "供应商",
       prop: "supplyId",
@@ -264,6 +282,7 @@ const rules = ref({
   supplyId: [{ required: true, message: "请选择供应商", trigger: "change" }],
   type: [{ required: true, message: "请选择发票类型", trigger: "change" }],
   money: [{ required: true, message: "请输入金额", trigger: "blur" }],
+  companyId: [{ required: true, message: "请选择业务公司", trigger: "change" }],
 });
 const formData = reactive({
   data: {

src/views/purchaseManage/purchasePayment/payment/index.vue

@@ -88,6 +88,13 @@ const config = computed(() => {
   return [
     {
       attrs: {
+        label: "业务公司",
+        prop: "companyName",
+        width: 110,
+      },
+    },
+    {
+      attrs: {
         label: "供应商",
         prop: "supplyName",
         width: 200,
@@ -170,19 +177,21 @@ const config = computed(() => {
         align: "center",
       },
       renderHTML(row) {
-        return [
-          {
-            attrs: {
-              label: "打印",
-              type: "primary",
-              text: true,
-            },
-            el: "button",
-            click() {
-              clickPrint(row);
-            },
-          },
-        ];
+        return proxy.isCurrentCompanyData(row.companyId)
+          ? [
+              {
+                attrs: {
+                  label: "打印",
+                  type: "primary",
+                  text: true,
+                },
+                el: "button",
+                click() {
+                  clickPrint(row);
+                },
+              },
+            ]
+          : [];
       },
     },
   ];

src/views/purchaseSales/outAndInWarehouse/manualDelivery/index.vue

@@ -174,6 +174,13 @@ const config = computed(() => {
     },
     {
       attrs: {
+        label: "业务公司",
+        prop: "companyName",
+        width: 110,
+      },
+    },
+    {
+      attrs: {
         label: "出库原因",
         prop: "type",
         width: 110,
@@ -427,6 +434,15 @@ const formConfig = computed(() => {
       isShow: formData.data.type == "3",
     },
     {
+      type: "treeSelect",
+      prop: "companyId",
+      label: "业务公司",
+      data: proxy.useUserStore().allDict["tree_company_data"],
+      propsTreeLabel: "deptName",
+      propsTreeValue: "deptId",
+      itemWidth: 50,
+    },
+    {
       type: "input",
       itemType: "textarea",
       prop: "remarks",
@@ -441,6 +457,7 @@ const formConfig = computed(() => {
   ];
 });
 const rules = ref({
+  companyId: [{ required: true, message: "请选择业务公司", trigger: "change" }],
   warehouseId: [{ required: true, message: "请选择仓库", trigger: "change" }],
   exWarehousePerson: [
     { required: true, message: "请输入领料人", trigger: "blur" },

src/views/purchaseSales/outAndInWarehouse/manualWarehousing/index.vue

@@ -167,6 +167,13 @@ const config = computed(() => {
     },
     {
       attrs: {
+        label: "业务公司",
+        prop: "companyName",
+        width: 110,
+      },
+    },
+    {
+      attrs: {
         label: "入库原因",
         prop: "type",
         width: 110,
@@ -491,6 +498,15 @@ const formConfig = computed(() => {
       },
     },
     {
+      type: "treeSelect",
+      prop: "companyId",
+      label: "业务公司",
+      data: proxy.useUserStore().allDict["tree_company_data"],
+      propsTreeLabel: "deptName",
+      propsTreeValue: "deptId",
+      itemWidth: 50,
+    },
+    {
       type: "input",
       itemType: "textarea",
       prop: "remarks",
@@ -505,6 +521,7 @@ const formConfig = computed(() => {
   ];
 });
 const rules = ref({
+  companyId: [{ required: true, message: "请选择业务公司", trigger: "change" }],
   warehouseId: [{ required: true, message: "请选择仓库", trigger: "change" }],
   exWarehousePerson: [
     { required: true, message: "请输入领料人", trigger: "blur" },

src/views/purchaseSales/outAndInWarehouse/record/index.vue

@@ -242,6 +242,13 @@ const config = computed(() => {
     },
     {
       attrs: {
+        label: "业务公司",
+        prop: "companyName",
+        width: 110,
+      },
+    },
+    {
+      attrs: {
         label: "仓库名称",
         prop: "warehouseName",
         width: 130,

src/views/purchaseSales/outAndInWarehouse/waitingForDelivery/index.vue

@@ -193,6 +193,13 @@ const config = computed(() => {
     },
     {
       attrs: {
+        label: "业务公司",
+        prop: "companyName",
+        width: 110,
+      },
+    },
+    {
+      attrs: {
         label: "数据来源",
         prop: "businessType",
         slot: "businessType",
@@ -289,21 +296,23 @@ const config = computed(() => {
         align: "center",
       },
       renderHTML(row) {
-        return [
-          row.status !== 2
-            ? {
-                attrs: {
-                  label: "出库",
-                  type: "primary",
-                  text: true,
-                },
-                el: "button",
-                click() {
-                  clickOperation(row);
-                },
-              }
-            : {},
-        ];
+        return proxy.isCurrentCompanyData(row.companyId)
+          ? [
+              row.status !== 2
+                ? {
+                    attrs: {
+                      label: "出库",
+                      type: "primary",
+                      text: true,
+                    },
+                    el: "button",
+                    click() {
+                      clickOperation(row);
+                    },
+                  }
+                : {},
+            ]
+          : [];
       },
     },
   ];
@@ -401,6 +410,15 @@ const formConfig = computed(() => {
       itemWidth: 50,
     },
     {
+      type: "treeSelect",
+      prop: "companyId",
+      label: "业务公司",
+      data: proxy.useUserStore().allDict["tree_company_data"],
+      propsTreeLabel: "deptName",
+      propsTreeValue: "deptId",
+      itemWidth: 50,
+    },
+    {
       type: "select",
       prop: "warehouseId",
       label: "仓库名称",
@@ -429,6 +447,7 @@ const formConfig = computed(() => {
   ];
 });
 const rules = ref({
+  companyId: [{ required: true, message: "请选择业务公司", trigger: "change" }],
   warehouseId: [{ required: true, message: "请选择仓库", trigger: "change" }],
   quantity: [{ required: true, message: "请输入出库数量", trigger: "blur" }],
   fileList: [

src/views/purchaseSales/outAndInWarehouse/waitingForStorage/index.vue

@@ -200,6 +200,13 @@ const config = computed(() => {
     },
     {
       attrs: {
+        label: "业务公司",
+        prop: "companyName",
+        width: 110,
+      },
+    },
+    {
+      attrs: {
         label: "数据来源",
         prop: "businessType",
         // width: 120,
@@ -285,21 +292,23 @@ const config = computed(() => {
         align: "center",
       },
       renderHTML(row) {
-        return [
-          row.status !== 2
-            ? {
-                attrs: {
-                  label: "入库",
-                  type: "primary",
-                  text: true,
-                },
-                el: "button",
-                click() {
-                  clickOperation(row);
-                },
-              }
-            : {},
-        ];
+        return proxy.isCurrentCompanyData(row.companyId)
+          ? [
+              row.status !== 2
+                ? {
+                    attrs: {
+                      label: "入库",
+                      type: "primary",
+                      text: true,
+                    },
+                    el: "button",
+                    click() {
+                      clickOperation(row);
+                    },
+                  }
+                : {},
+            ]
+          : [];
       },
     },
   ];
@@ -397,6 +406,15 @@ const formConfig = computed(() => {
       itemWidth: 50,
     },
     {
+      type: "treeSelect",
+      prop: "companyId",
+      label: "业务公司",
+      data: proxy.useUserStore().allDict["tree_company_data"],
+      propsTreeLabel: "deptName",
+      propsTreeValue: "deptId",
+      itemWidth: 50,
+    },
+    {
       type: "select",
       prop: "warehouseId",
       label: "仓库名称",
@@ -425,6 +443,7 @@ const formConfig = computed(() => {
   ];
 });
 const rules = ref({
+  companyId: [{ required: true, message: "请选择业务公司", trigger: "change" }],
   warehouseId: [{ required: true, message: "请选择仓库", trigger: "change" }],
   quantity: [{ required: true, message: "请输入入库数量", trigger: "blur" }],
   fileList: [

src/views/salesMange/saleContract/claim/index.vue

@@ -219,67 +219,51 @@ const config = computed(() => {
         align: "right",
       },
       renderHTML(row) {
-        return [
-          row.isClaim != 1
-            ? {
-                attrs: {
-                  label: "认领",
-                  type: "primary",
-                  text: true,
-                  bg: true,
-                  disabled: false,
-                },
-                el: "button",
-                click() {
-                  getDtl(row);
-                },
-              }
-            : {},
-          row.isClaim != 0
-            ? {
-                attrs: {
-                  label: "取消认领",
-                  text: true,
-                  bg: true,
-                  type: "primary",
-                  disabled: false,
-                  style: {
-                    color: "#e6a23c",
-                  },
-                },
-                el: "button",
-                click() {
-                  proxy.$router.replace({
-                    path: "/platform_manage/process/processApproval",
-                    query: {
-                      flowKey: "claim_del_flow",
-                      flowName: "取消认领发起",
-                      random: proxy.random(),
-                      businessId: row.id,
+        return proxy.isCurrentCompanyData(row.companyId)
+          ? [
+              row.isClaim != 1
+                ? {
+                    attrs: {
+                      label: "认领",
+                      type: "primary",
+                      text: true,
+                      bg: true,
+                      disabled: false,
                     },
-                  });
-                  // ElMessageBox.confirm("是否确定取消认领?", "提示", {
-                  //   confirmButtonText: "确定",
-                  //   cancelButtonText: "取消",
-                  //   type: "warning",
-                  // }).then(() => {
-                  //   // 删除
-                  //   proxy
-                  //     .post("/claim/delete", {
-                  //       id: row.id,
-                  //     })
-                  //     .then((res) => {
-                  //       ElMessage({
-                  //         message: "操作成功",
-                  //         type: "success",
-                  //       });
-                  //       getList();
-                  //     });
-                  // });
-                },
-              }
-            : {},
-        ];
+                    el: "button",
+                    click() {
+                      getDtl(row);
+                    },
+                  }
+                : {},
+              row.isClaim != 0
+                ? {
+                    attrs: {
+                      label: "取消认领",
+                      text: true,
+                      bg: true,
+                      type: "primary",
+                      disabled: false,
+                      style: {
+                        color: "#e6a23c",
+                      },
+                    },
+                    el: "button",
+                    click() {
+                      proxy.$router.replace({
+                        path: "/platform_manage/process/processApproval",
+                        query: {
+                          flowKey: "claim_del_flow",
+                          flowName: "取消认领发起",
+                          random: proxy.random(),
+                          businessId: row.id,
+                        },
+                      });
+                    },
+                  }
+                : {},
+            ]
+          : [];
       },
     },
   ];