Browse Source

快递100配置页面

cz 2 years ago
parent
commit
b6fb5f6e53

+ 1 - 1
src/components/WDLY/process/SendSubscribe.vue

@@ -140,7 +140,7 @@ const formConfig = computed(() => {
     {
       type: "select",
       prop: "receiptWarehouseId",
-      label: "收仓库",
+      label: "收仓库",
       itemWidth: 25,
       isLoad: {
         url: "/warehouse/page",

+ 20 - 19
src/views/WDLY/outInBound/waitInBound/index.vue

@@ -111,22 +111,26 @@ let rules = ref({
 const { proxy } = getCurrentInstance();
 const selectConfig = reactive([
   {
-    label: "异常来源",
+    label: "入库状态",
     prop: "type",
     data: [],
   },
+]);
+const inboundType = ref([
   {
-    label: "处理状态",
-    prop: "type",
-    data: [],
+    label: "未入库",
+    value: "1",
+  },
+  {
+    label: "部分入库",
+    value: "2",
   },
 ]);
-
 const config = computed(() => {
   return [
     {
       attrs: {
-        label: "类型",
+        label: "数据来源",
         prop: "name",
       },
       render(type) {
@@ -135,16 +139,11 @@ const config = computed(() => {
     },
     {
       attrs: {
-        label: "仓库名称",
-        prop: "type",
-      },
-    },
-    {
-      attrs: {
         label: "单号",
-        prop: "name",
+        prop: "type",
       },
     },
+
     {
       attrs: {
         label: "物流/快递公司",
@@ -153,7 +152,7 @@ const config = computed(() => {
     },
     {
       attrs: {
-        label: "物流/快递单号",
+        label: "仓库名称",
         prop: "remark",
       },
     },
@@ -171,9 +170,12 @@ const config = computed(() => {
     },
     {
       attrs: {
-        label: "状态",
+        label: "入库状态",
         prop: "name",
       },
+      render(type) {
+        return proxy.dictDataEcho(type, inboundType.value);
+      },
     },
     {
       attrs: {
@@ -311,10 +313,6 @@ const getDict = () => {
     })
     .then((res) => {
       warehouseType.value = res.rows;
-      selectConfig[0].data = res.rows.map((x) => ({
-        label: x.dictValue,
-        value: x.dictKey,
-      }));
       formConfig[0].data = res.rows.map((x) => ({
         label: x.dictValue,
         value: x.dictKey,
@@ -323,6 +321,9 @@ const getDict = () => {
 };
 getList();
 getDict();
+onMounted(() => {
+  selectConfig[0].data = inboundType.value;
+});
 </script>
   
 <style lang="scss" scoped>

+ 233 - 145
src/views/WDLY/purchaseManage/alreadyPurchase/index.vue

@@ -26,84 +26,95 @@
       </byTable>
     </div>
     <el-dialog
-      title="到货通知"
+      :title="modalType === 'add' ? '发货登记' : '到货通知'"
       v-model="dialogVisible"
       width="800"
       v-loading="loading"
     >
-      <el-form
-        :model="formData.data"
+      <byForm
+        :formConfig="formConfig"
+        :formOption="formOption"
+        v-model="formData.data"
         :rules="rules"
-        ref="formDom"
-        label-position="top"
+        ref="byform"
       >
-        <div style="margin-bottom: 10px; font-size: 14px">基础信息</div>
-        <el-row>
-          <el-col :span="8">
-            <el-form-item label="供应商" prop="supplyId">
-              <el-select
-                v-model="formData.data.supplyId"
-                placeholder="请选择"
-                style="width: 100%"
-                disabled
+        <template #detailSlot>
+          <div style="width: 100%">
+            <el-table
+              :data="
+                modalType === 'add' ? formData.data.deliverGoodsDetailsList : []
+              "
+            >
+              <el-table-column
+                prop="productType"
+                label="货品类型"
+                :formatter="(row) => (row.productType == 1 ? '产品' : '物料')"
+              />
+              <el-table-column prop="productCode" label="货品编码" />
+              <el-table-column prop="productName" label="货品名称" />
+              <el-table-column prop="productSpec" label="规格型号" />
+              <el-table-column prop="productUnit" label="单位" />
+              <el-table-column prop="count" label="采购数量" />
+              <el-table-column
+                prop="alreadyDeliverGoodsQuantity"
+                label="累计发货"
+                v-if="modalType === 'add'"
+              />
+              <el-table-column
+                prop="deliverGoodsQuantity"
+                label="本次发货"
+                min-width="150"
+                v-if="modalType === 'add'"
               >
-                <el-option
-                  v-for="item in supplierData"
-                  :label="item.name"
-                  :value="item.id"
-                >
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="6">
-            <el-form-item label="采购单号" prop="code">
-              <el-input
-                v-model="formData.data.code"
-                placeholder="请输入"
-                disabled
+                <template #default="{ row, $index }">
+                  <el-form-item
+                    :prop="
+                      'deliverGoodsDetailsList.' +
+                      $index +
+                      '.deliverGoodsQuantity'
+                    "
+                    :rules="rules.deliverGoodsQuantity"
+                    :inline-message="true"
+                  >
+                    <el-input-number
+                      v-model="row.deliverGoodsQuantity"
+                      :precision="4"
+                      :controls="false"
+                      :min="0"
+                    />
+                  </el-form-item>
+                </template>
+              </el-table-column>
+              <el-table-column
+                prop="sumArrivalCount"
+                label="剩余在途"
+                v-if="modalType === 'edit'"
+              />
+              <el-table-column
+                prop="count"
+                label="本次到货"
+                min-width="150"
+                v-if="modalType === 'edit'"
               >
-              </el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-
-        <div style="margin-bottom: 10px; font-size: 14px">到货明细</div>
-        <el-form-item>
-          <el-table :data="formData.data.arrivalDetailList">
-            <el-table-column
-              prop="goodType"
-              label="货品类型"
-              :formatter="(row) => (row.goodType == 1 ? '产品' : '物料')"
-            />
-            <el-table-column prop="productCode" label="货品编码" />
-            <el-table-column prop="productName" label="货品名称" />
-            <el-table-column prop="productSpec" label="规格型号" />
-            <el-table-column prop="productUnit" label="单位" />
-            <el-table-column prop="purchaseCount" label="采购数量" />
-            <el-table-column prop="sumArrivalCount" label="已到货" />
-            <el-table-column prop="count" label="本次到货" min-width="150">
-              <template #default="{ row, $index }">
-                <el-form-item
-                  :prop="'arrivalDetailList.' + $index + '.count'"
-                  :rules="rules.count"
-                  :inline-message="true"
-                >
-                  <el-input-number
-                    v-model="row.count"
-                    :precision="4"
-                    :controls="false"
-                    :min="0"
-                    @change="handleChangeAmount"
-                  />
-                </el-form-item>
-              </template>
-            </el-table-column>
-          </el-table>
-        </el-form-item>
-      </el-form>
+                <template #default="{ row, $index }">
+                  <el-form-item
+                    :prop="'arrivalDetailList.' + $index + '.count'"
+                    :rules="rules.count"
+                    :inline-message="true"
+                  >
+                    <el-input-number
+                      v-model="row.count"
+                      :precision="4"
+                      :controls="false"
+                      :min="0"
+                    />
+                  </el-form-item>
+                </template>
+              </el-table-column>
+            </el-table>
+          </div>
+        </template>
+      </byForm>
 
       <template #footer>
         <el-button @click="dialogVisible = false" size="large">取 消</el-button>
@@ -138,7 +149,13 @@ const sourceList = ref({
 let dialogVisible = ref(false);
 let modalType = ref("add");
 let rules = ref({
-  count: [{ required: true, message: "请输入本次到货", trigger: "blur" }],
+  logisticsCompanyCode: [
+    { required: true, message: "请选择物流公司", trigger: "change" },
+  ],
+  code: [{ required: true, message: "请输入物流/快递单号", trigger: "blur" }],
+  deliverGoodsQuantity: [
+    { required: true, message: "请输入本次发货", trigger: "blur" },
+  ],
 });
 const { proxy } = getCurrentInstance();
 const selectConfig = reactive([
@@ -263,13 +280,13 @@ const config = computed(() => {
         return [
           {
             attrs: {
-              label: "发货通知",
+              label: "发货登记",
               type: "primary",
               text: true,
             },
             el: "button",
             click() {
-              handleArrival(row);
+              handleArrival(row, "add");
             },
           },
           {
@@ -280,7 +297,7 @@ const config = computed(() => {
             },
             el: "button",
             click() {
-              handleArrival(row);
+              handleArrival(row, "edit");
             },
           },
           {
@@ -312,61 +329,84 @@ const config = computed(() => {
 });
 
 let formData = reactive({
-  data: {
-    type: "1",
-  },
+  data: {},
 });
 const formOption = reactive({
   inline: true,
   labelWidth: 100,
   itemWidth: 100,
-  rules: [],
 });
-const formDom = ref(null);
-const formConfig = computed(() => {
-  return [
+const byform = ref(null);
+let formConfig = reactive();
+const configData = [
+  [
     {
-      type: "radio",
-      prop: "name",
-      label: "供应商类型",
-      required: true,
-      border: true,
-      data: [
-        { label: "贸易商", value: "1" },
-        { label: "工厂", value: "2" },
-      ],
+      type: "input",
+      prop: "supplyName",
+      label: "供应商",
+      disabled: true,
+      itemWidth: 50,
     },
     {
       type: "input",
-      prop: "name",
-      label: "供应商名称",
-      required: true,
+      prop: "purchaseCode",
+      label: "采购单号",
+      disabled: true,
+      itemWidth: 50,
     },
     {
-      type: "slot",
-      slotName: "address",
-      label: "地址",
-      required: true,
+      type: "select",
+      label: "物流信息",
+      prop: "logisticsCompanyCode",
+      itemWidth: 50,
+      style: {
+        width: "100%",
+      },
     },
     {
-      type: "slot",
-      slotName: "contact",
-      label: "联系信息",
-      required: true,
+      type: "input",
+      label: " ",
+      prop: "code",
+      itemWidth: 50,
     },
     {
       type: "slot",
-      slotName: "fileSlot",
-      label: "上传附件",
+      slotName: "detailSlot",
+      label: "发货明细",
     },
+  ],
+  [
     {
       type: "input",
-      label: "备注",
-      prop: "remakes",
-      itemType: "textarea",
+      prop: "name",
+      label: "供应商",
+      disabled: true,
+      itemWidth: 50,
     },
-  ];
-});
+    {
+      type: "input",
+      prop: "name",
+      label: "采购单号",
+      disabled: true,
+      itemWidth: 50,
+    },
+    {
+      type: "select",
+      label: "物流/快递单号",
+      prop: "name",
+      itemWidth: 50,
+      style: {
+        width: "100%",
+      },
+    },
+    {
+      type: "slot",
+      slotName: "detailSlot",
+      label: "发货明细",
+    },
+  ],
+];
+
 const getList = async (req) => {
   sourceList.value.pagination = { ...sourceList.value.pagination, ...req };
   loading.value = true;
@@ -380,34 +420,52 @@ const getList = async (req) => {
   });
 };
 
-const submitForm = async () => {
-  formDom.value.validate((vaild) => {
-    if (vaild) {
-      const list = formData.data.arrivalDetailList;
-      const total = list.reduce((total, x) => (total += Number(x.count)));
+const submitForm = () => {
+  byform.value.handleSubmit((valid) => {
+    if (modalType.value === "add") {
+      const list = formData.data.deliverGoodsDetailsList;
+      const total = list.reduce(
+        (total, x) => (total += Number(x.deliverGoodsQuantity)),
+        0
+      );
       if (total < 1) {
         return ElMessage({
-          message: `本次到货不能为0!`,
+          message: `本次货不能为0!`,
           type: "info",
         });
       }
-      let sum = 0;
       for (let i = 0; i < list.length; i++) {
         const e = list[i];
         if (
-          Number(e.sumArrivalCount) + Number(e.count) >=
-          Number(e.purchaseCount)
+          Number(e.alreadyDeliverGoodsQuantity) +
+            Number(e.deliverGoodsQuantity) >=
+          Number(e.count)
         ) {
-          sum += 1;
+          return ElMessage({
+            message: `本次发货加累计发货不可大于采购数量!`,
+            type: "info",
+          });
         }
       }
-      formData.data.arrivalStatus = sum === list.length ? "20" : "10";
+      formData.data.deliverGoodsDetailsList = list.map((x) => ({
+        purchaseDetailId: x.purchaseDetailId,
+        deliverGoodsQuantity: x.deliverGoodsQuantity,
+      }));
+      proxy.post("/deliverGoods/add", formData.data).then((res) => {
+        ElMessage({
+          message: `操作成功!`,
+          type: "success",
+        });
+        dialogVisible.value = false;
+        getList();
+      });
+    } else if (modalType.value === "edit") {
       proxy.post("/arrival/add", formData.data).then((res) => {
         ElMessage({
           message: `操作成功!`,
           type: "success",
         });
-        dialogVisible.value = true;
+        dialogVisible.value = false;
         getList();
       });
     }
@@ -459,35 +517,65 @@ const getSupplierList = async (req) => {
       supplierData.value = res.rows;
     });
 };
-const handleArrival = (row) => {
-  proxy.post("/purchase/detail", { id: row.id }).then((res) => {
-    formData.data = {
-      purchaseId: row.id,
-      code: res.code,
-      supplyId: res.supplyId,
-      arrivalDetailList: res.purchaseDetailList.map((x) => ({
-        ...x,
-        purchaseDetailId: x.id,
-        purchaseCount: x.count,
-        count: 0,
-      })),
-      arrivalStatus: "",
-    };
-    dialogVisible.value = true;
+
+const logisticsData = ref([]);
+const getLogisticsData = (row) => {
+  proxy.post("/companyInfo/list", { pageNum: 1, pageSize: 999 }).then((res) => {
+    logisticsData.value = res.reverse().slice(0, 100); //截取前100
   });
 };
 
-getList();
-getSupplierList();
-const start = () => {
-  proxy.$router.replace({
-    path: "/platform_manage/process/processApproval",
-    query: {
-      isSubscribe: "20",
-      ids: "",
-    },
-  });
+const handleArrival = (row, type) => {
+  modalType.value = type;
+  if (type === "add") {
+    formConfig = configData[0];
+    formConfig[2].data = logisticsData.value.map((x) => ({
+      label: x.name,
+      value: x.code,
+    }));
+    proxy.post("/deliverGoodsDetails/detail", { id: row.id }).then((res) => {
+      formData.data = {
+        purchaseId: row.id,
+        supplyName: row.supplyName,
+        purchaseCode: row.code,
+        supplyId: res.supplyId,
+        code: "",
+        logisticsCompanyCode: "",
+        deliverGoodsDetailsList: res.map((x) => ({
+          ...x,
+          purchaseDetailId: x.id,
+          alreadyDeliverGoodsQuantity: x.deliverGoodsQuantity,
+          deliverGoodsQuantity: 0,
+        })),
+      };
+      dialogVisible.value = true;
+    });
+  } else if (type === "edit") {
+    formConfig = configData[1];
+    proxy.post("/deliverGoods/list", { id: row.id }).then((res) => {
+      console.log(res, "wss");
+    });
+    proxy.post("/deliverGoods/detail", { id: row.id }).then((res) => {
+      console.log(res, "wss");
+      formData.data = {
+        purchaseId: row.id,
+        code: res.code,
+        supplyId: res.supplyId,
+        arrivalDetailList: res.purchaseDetailList.map((x) => ({
+          ...x,
+          purchaseDetailId: x.id,
+          purchaseCount: x.count,
+          count: 0,
+        })),
+        arrivalStatus: "",
+      };
+      dialogVisible.value = true;
+    });
+  }
 };
+
+getList();
+getLogisticsData();
 </script>
   
 <style lang="scss" scoped>

+ 54 - 28
src/views/WDLY/purchaseManage/purchase/index.vue

@@ -12,13 +12,12 @@
         :table-events="{
           //element talbe事件都能传
           select: selectRow,
-          'select-all': selectRow,
         }"
         :action-list="[
           {
             text: '采购',
             disabled: selectData.length === 0,
-            action: () => start(),
+            action: () => start(20),
           },
         ]"
         @get-list="getList"
@@ -200,6 +199,9 @@ const config = computed(() => {
   return [
     {
       type: "selection",
+      attrs: {
+        checkAtt: "isCheck",
+      },
     },
     {
       attrs: {
@@ -303,8 +305,8 @@ const config = computed(() => {
             },
             el: "button",
             click() {
-              selectData.value = [row];
-              start();
+              selectDataOne.value = [row];
+              start(10);
             },
           },
         ];
@@ -369,6 +371,7 @@ const formConfig = computed(() => {
     },
   ];
 });
+
 const getList = async (req) => {
   sourceList.value.pagination = { ...sourceList.value.pagination, ...req };
   loading.value = true;
@@ -376,6 +379,13 @@ const getList = async (req) => {
     .post("/subscribeDetail/pageByWdly", sourceList.value.pagination)
     .then((message) => {
       console.log(message);
+      message.rows.forEach((x) => {
+        if (x.status <= 30) {
+          x.isCheck = true;
+        } else {
+          x.isCheck = false;
+        }
+      });
       sourceList.value.data = message.rows.map((x) => ({
         ...x,
         ...JSON.parse(x.victoriatouristJson),
@@ -436,6 +446,7 @@ const getDtl = (row) => {
     dialogVisible.value = true;
   });
 };
+
 const handleBeforeUpload = async (file) => {
   const res = await proxy.post("/fileInfo/getSing", { fileName: file.name });
   uploadData.value = res.uploadBody;
@@ -447,17 +458,6 @@ const handleBeforeUpload = async (file) => {
     },
   ];
 };
-const handleClickFile = (row) => {
-  ElMessage({
-    message: "数据请求中,请稍后!",
-    type: "success",
-  });
-  let id = row.id;
-  proxy.post("/fileInfo/getList", { businessIdList: [id] }).then((res) => {
-    const file = res[id][0];
-    window.open(file.fileUrl, "_blank");
-  });
-};
 
 const handlePreview = (file) => {
   console.log(file);
@@ -473,26 +473,49 @@ const handleClose = (index) => {
 };
 getList();
 const selectData = ref([]);
+const selectDataOne = ref([]);
+
 const selectRow = (data) => {
   selectData.value = data;
 };
 
-const start = () => {
-  if (selectData.value.length > 0) {
-    let ids = selectData.value.map((x) => x.id).join();
-    proxy.$router.replace({
-      path: "/WDLY/process/processApproval_wdly",
-      query: {
-        flowKey: "purchase_flow",
-        ids,
-      },
+watch(selectData, (newVal, oldVal) => {
+  if (newVal.length == 0) {
+    sourceList.value.data.forEach((x) => {
+      if (x.status <= 30) {
+        x.isCheck = true;
+      } else {
+        x.isCheck = false;
+      }
     });
-  } else {
-    return ElMessage({
-      message: "请勾选数据!",
-      type: "info",
+  } else if (newVal.length == 1) {
+    const current = newVal[0];
+    sourceList.value.data.forEach((x) => {
+      if (x.receiptWarehouseId !== current.receiptWarehouseId) {
+        x.isCheck = false;
+      }
     });
   }
+});
+
+const start = (type) => {
+  modalType.value = "add";
+  let ids = [];
+  let row = {};
+  if (type === 10) {
+    row = selectDataOne.value[0];
+    ids = selectDataOne.value.map((x) => x.id).join();
+  } else if (type === 20) {
+    ids = selectData.value.map((x) => x.id).join();
+    row = selectData.value[0];
+  }
+  proxy.$router.replace({
+    path: "/WDLY/process/processApproval_wdly",
+    query: {
+      flowKey: "purchase_flow",
+      ids,
+    },
+  });
 };
 </script>
   
@@ -500,4 +523,7 @@ const start = () => {
 .tenant {
   padding: 20px;
 }
+:deep(.el-table__header-wrapper .el-checkbox) {
+  display: none;
+}
 </style>

+ 4 - 4
src/views/connect/E-mail/mail/com/main.vue

@@ -16,14 +16,14 @@
       >
         <div class="main">
           <mailList
-            v-if="item.id.includes('floder')"
+            v-show="item.id.includes('floder')"
             :ref="'floder' + index"
           ></mailList>
           <mailDetail
-            v-if="item.id.includes('detail')"
+            v-show="item.id.includes('detail')"
             :ref="'detail' + index"
           ></mailDetail>
-          <mailWrite v-if="item.id.includes('write')"></mailWrite>
+          <mailWrite v-show="item.id.includes('write')"></mailWrite>
         </div>
       </el-tab-pane>
     </el-tabs>
@@ -43,7 +43,7 @@ const mailStore = useMailStore();
 const { proxy } = getCurrentInstance();
 const menuList = ref([]);
 let activeMenu = ref("");
-
+// 订阅监听
 mailStore.$subscribe((mutations, state) => {
   activeMenu.value = state.currentId;
   menuList.value = state.mailMenuList;

+ 303 - 0
src/views/publicModule/KDconfig/index.vue

@@ -0,0 +1,303 @@
+<template>
+  <div class="tenant">
+    <!-- <Banner /> -->
+    <div class="content">
+      <byTable
+        :source="sourceList.data"
+        :pagination="sourceList.pagination"
+        :config="config"
+        :loading="loading"
+        highlight-current-row
+        :selectConfig="selectConfig"
+        :table-events="{
+          //element talbe事件都能传
+          select: select,
+        }"
+        :action-list="[
+          {
+            text: '添加数据',
+            action: () => openModal('add'),
+          },
+        ]"
+        @get-list="getList"
+      >
+        <template #slotName="{ item }">
+          {{ item.createTime }}
+        </template>
+      </byTable>
+    </div>
+    <el-dialog
+      :title="modalType == 'add' ? '添加IoT平台' : '编辑'"
+      v-model="dialogVisible"
+      width="800"
+      v-loading="loading"
+    >
+      <byForm
+        :formConfig="formConfig"
+        :formOption="formOption"
+        v-model="formData.data"
+        :rules="rules"
+        ref="byform"
+      >
+      </byForm>
+      <template #footer>
+        <el-button @click="dialogVisible = false" size="large">取 消</el-button>
+        <el-button
+          type="primary"
+          @click="submitForm('byform')"
+          size="large"
+          :loading="submitLoading"
+        >
+          确 定
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+  
+<script setup>
+/* eslint-disable vue/no-unused-components */
+import { ElMessage, ElMessageBox } from "element-plus";
+import byTable from "@/components/byTable/index";
+import byForm from "@/components/byForm/index";
+import { computed, defineComponent, ref } from "vue";
+const loading = ref(false);
+const submitLoading = ref(false);
+const sourceList = ref({
+  data: [],
+  pagination: {
+    total: 3,
+    pageNum: 1,
+    pageSize: 10,
+  },
+});
+let dialogVisible = ref(false);
+let roomDialogVisible = ref(false);
+let modalType = ref("add");
+let rules = ref({
+  kdKey: [{ required: true, message: "请输入快递100 key", trigger: "blur" }],
+  kdCustomer: [
+    { required: true, message: "请输入快递100 customer", trigger: "blur" },
+  ],
+  kdSecret: [
+    { required: true, message: "请输入快递100 secret", trigger: "blur" },
+  ],
+  kdUserId: [
+    { required: true, message: "请输入快递100 userId", trigger: "blur" },
+  ],
+  tenantId: [{ required: true, message: "请选择租户", trigger: "change" }],
+});
+const { proxy } = getCurrentInstance();
+const selectConfig = [];
+const config = computed(() => {
+  return [
+    {
+      attrs: {
+        label: "租户名称",
+        prop: "type",
+      },
+      render(type) {
+        return "华为";
+      },
+    },
+    {
+      attrs: {
+        label: "快递100 key",
+        prop: "kdKey",
+      },
+    },
+    {
+      attrs: {
+        label: "快递100 customer",
+        prop: "kdCustomer",
+      },
+    },
+    {
+      attrs: {
+        label: "快递100 secret",
+        prop: "kdSecret",
+      },
+    },
+    {
+      attrs: {
+        label: "快递100 userId",
+        prop: "kdUserId",
+      },
+    },
+
+    {
+      attrs: {
+        label: "操作",
+        width: "200",
+        align: "right",
+      },
+      // 渲染 el-button,一般用在最后一列。
+      renderHTML(row) {
+        return [
+          {
+            attrs: {
+              label: "修改",
+              type: "primary",
+              text: true,
+            },
+            el: "button",
+            click() {
+              getDtl(row);
+            },
+          },
+          {
+            attrs: {
+              label: "删除",
+              type: "danger",
+              text: true,
+            },
+            el: "button",
+            click() {
+              // 弹窗提示是否删除
+              ElMessageBox.confirm(
+                "此操作将永久删除该数据, 是否继续?",
+                "提示",
+                {
+                  confirmButtonText: "确定",
+                  cancelButtonText: "取消",
+                  type: "warning",
+                }
+              ).then(() => {
+                // 删除
+                proxy
+                  .post("/configInfo/delete", {
+                    id: row.id,
+                  })
+                  .then((res) => {
+                    ElMessage({
+                      message: "删除成功",
+                      type: "success",
+                    });
+                    getList();
+                  });
+              });
+            },
+          },
+        ];
+      },
+    },
+  ];
+});
+
+let formData = reactive({
+  data: {
+    type: "1",
+  },
+  treeData: [],
+});
+const formOption = reactive({
+  inline: true,
+  labelWidth: 100,
+  itemWidth: 100,
+  rules: [],
+});
+const byform = ref(null);
+const treeData = ref([]);
+const formConfig = computed(() => {
+  return [
+    {
+      type: "select",
+      prop: "tenantId",
+      label: "租户",
+      disabled: modalType.value === "edit",
+      isLoad: {
+        url: "/tenantInfo/page",
+        req: {
+          pageNum: 1,
+          pageSize: 9999,
+        },
+        labelKey: "enterpriseName",
+        labelVal: "tenantId",
+        method: "post",
+        resUrl: "rows",
+      },
+    },
+    {
+      type: "input",
+      prop: "kdKey",
+      label: "快递100 key",
+    },
+    {
+      type: "input",
+      prop: "kdCustomer",
+      label: "快递100 customer",
+    },
+    {
+      type: "input",
+      prop: "kdSecret",
+      label: "快递100 secret",
+    },
+    {
+      type: "input",
+      prop: "kdUserId",
+      label: "快递100 userId",
+    },
+  ];
+});
+const getList = async (req) => {
+  sourceList.value.pagination = { ...sourceList.value.pagination, ...req };
+  loading.value = true;
+  proxy
+    .post("/configInfo/page", sourceList.value.pagination)
+    .then((message) => {
+      console.log(message);
+      sourceList.value.data = message.rows;
+      sourceList.value.pagination.total = message.total;
+      setTimeout(() => {
+        loading.value = false;
+      }, 200);
+    });
+};
+
+const openModal = () => {
+  dialogVisible.value = true;
+  modalType.value = "add";
+  formData.data = {};
+};
+const selection = ref({
+  data: [],
+});
+const select = (_selection, row) => {
+  selection.value.data = _selection;
+  console.log(_selection.length);
+};
+const submitForm = () => {
+  console.log(byform.value);
+  byform.value.handleSubmit((valid) => {
+    submitLoading.value = true;
+    proxy.post("/configInfo/" + modalType.value, formData.data).then(
+      (res) => {
+        ElMessage({
+          message: modalType.value == "add" ? "添加成功" : "编辑成功",
+          type: "success",
+        });
+        dialogVisible.value = false;
+        submitLoading.value = false;
+        getList();
+      },
+      (err) => (submitLoading.value = false)
+    );
+  });
+};
+
+const getDtl = (row) => {
+  modalType.value = "edit";
+  proxy.post("/configInfo/detail", { id: row.id }).then((res) => {
+    formData.data = res;
+    dialogVisible.value = true;
+  });
+};
+
+getList();
+</script>
+  
+<style lang="scss" scoped>
+.tenant {
+  padding: 20px;
+}
+</style>

+ 4 - 3
src/views/purchaseManage/purchaseManage/arrival/index.vue

@@ -470,9 +470,10 @@ onMounted(() => {});
 .tenant {
   padding: 20px;
 }
-::deep {
-}
-.el-checkbox {
+// /deep/.el-checkbox {
+//   display: none;
+// }
+:deep(.el-table__header-wrapper .el-checkbox) {
   display: none;
 }
 </style>

+ 1 - 0
src/views/purchaseManage/supplier/supplyPrice/index.vue

@@ -323,6 +323,7 @@ const formConfig = reactive([
     label: "供应商",
     required: true,
     disabled: false,
+    filterable: true,
     isLoad: {
       url: "/supplierInfo/page",
       req: {