客户简称、订单汇总

src/components/process/SF/Contract.vue

@@ -1712,6 +1712,7 @@ const selectProduct = async (goods) => {
           quantity: null,
           price: goods.price || null,
           businessCostPrice: goods.businessCostPrice || null,
+          factoryPrice: goods.factoryPrice || null,
           amount: "",
           remark: "",
           fileList: [],
@@ -2368,6 +2369,7 @@ const getPriceSheetData = (id) => {
       price: x.price,
       amount: x.amount,
       businessCostPrice: x.businessCostPrice,
+      factoryPrice: x.prodPrice,
       amountTwo: Number(
         parseFloat(x.quantity * x.businessCostPrice).toFixed(2)
       ),

src/components/process/SF/ContractChange.vue

@@ -1712,6 +1712,7 @@ const selectProduct = async (goods) => {
           quantity: null,
           price: goods.price || null,
           businessCostPrice: goods.businessCostPrice || null,
+          factoryPrice: goods.factoryPrice || null,
           amount: "",
           remark: "",
           fileList: [],
@@ -2368,6 +2369,7 @@ const getPriceSheetData = (id) => {
       price: x.price,
       amount: x.amount,
       businessCostPrice: x.businessCostPrice,
+      factoryPrice: x.prodPrice,
       amountTwo: Number(
         parseFloat(x.quantity * x.businessCostPrice).toFixed(2)
       ),

src/components/process/SF/Purchase.vue

@@ -435,6 +435,7 @@ const formConfig = computed(() => {
       type: "input",
       prop: "code",
       label: "订单号",
+      disabled: true,
       isShow: formData.data.code ? true : false,
       itemWidth: 25,
     },
@@ -1290,11 +1291,15 @@ const getAllData = (businessId) => {
 const getProductList = (ids) => {
   if (ids && ids.length > 0) {
     proxy.post("/subscribeDetail/detail", { ids }).then((res) => {
-      formData.data.companyId = res.companyId;
-      formData.data.deptId = res.deptId;
-      formData.data.purchaseUserId = res.subcribeUserId;
-      formData.data.warehouseId = res.putWarehouseId;
+      formData.data.companyId =
+        res.companyId || proxy.useUserStore().user.companyId;
       getDeptData(formData.data.companyId);
+      formData.data.deptId =
+        res.deptId || proxy.useUserStore().user.dept.deptId;
+      formData.data.purchaseUserId =
+        res.subcribeUserId || proxy.useUserStore().user.userId;
+      formData.data.warehouseId = res.putWarehouseId;
+
       let detailList = res.subscribeDetailList;
       if (detailList && detailList.length > 0) {
         formData.data.purchaseProductList = detailList.map((item) => {

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

@@ -723,10 +723,7 @@ const submitForm = () => {
     for (let i = 0; i < formData.data.arrivalDetailList.length; i++) {
       const ele = formData.data.arrivalDetailList[i];
       allQuantity += ele.quantity;
-      if (
-        ele.quantity + ele.arrivalQuantity >
-        Number(parseFloat(Number(ele.purchaseQuantity * 1.05)).toFixed(2))
-      ) {
+      if (ele.quantity + ele.arrivalQuantity > Number(ele.maxQuantity)) {
         return proxy.msgTip("到货量超出上限，若要接收，请另发申购单", 2);
       }
     }

src/views/EHSD/productLibrary/companyProduct/index.vue

@@ -1019,16 +1019,16 @@ const formConfig = computed(() => {
       itemWidth: 50,
       disabled: false,
     },
-    {
-      type: "number",
-      prop: "businessCostPrice",
-      label: "业务供货价",
-      precision: 2,
-      min: 0.01,
-      controls: false,
-      itemWidth: 50,
-      disabled: false,
-    },
+    // {
+    //   type: "number",
+    //   prop: "businessCostPrice",
+    //   label: "业务供货价",
+    //   precision: 2,
+    //   min: 0.01,
+    //   controls: false,
+    //   itemWidth: 50,
+    //   disabled: false,
+    // },
     {
       type: "title1",
       title: "BOM",

src/views/EHSD/productLibrary/waitCreateProduct/index.vue

@@ -848,16 +848,16 @@ const formConfig = computed(() => {
       itemWidth: 50,
       disabled: false,
     },
-    {
-      type: "number",
-      prop: "businessCostPrice",
-      label: "业务供货价",
-      precision: 2,
-      min: 0.01,
-      controls: false,
-      itemWidth: 50,
-      disabled: false,
-    },
+    // {
+    //   type: "number",
+    //   prop: "businessCostPrice",
+    //   label: "业务供货价",
+    //   precision: 2,
+    //   min: 0.01,
+    //   controls: false,
+    //   itemWidth: 50,
+    //   disabled: false,
+    // },
     // {
     //   type: "slot",
     //   slotName: "productionFile",

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

@@ -1862,7 +1862,7 @@ const formConfig = computed(() => {
       itemWidth: 50,
       fn: (val) => {
         companyId.value = val;
-        formData.data.quotationProductList = [];
+        // formData.data.quotationProductList = [];
       },
     },
     {

src/views/customer/file/index.vue

@@ -101,7 +101,7 @@
             text: '添加客户',
             action: () => openModal(),
           },
-        ]" @moreSearch="moreSearch" @get-list="getList" ref="table">
+        ]" @get-list="getList" ref="table">
           <template #isTop="{ item }">
             <div>
               <img style="cursor: pointer; width: 20px; transform: translateY(5px)" :src="'/img/isTop.png'" @click="deleteTop(item)"
@@ -299,55 +299,12 @@
       </template>
     </el-dialog>
 
-    <el-dialog title="高级检索" v-if="openSearch" v-model="openSearch" width="600" :before-close="cancelSearch">
-      <byForm :formConfig="formSearchConfig" :formOption="formOption" v-model="sourceList.pagination">
-        <template #address>
-          <el-row style="width: 100%">
-            <el-col :span="8">
-              <el-form-item prop="countryId">
-                <el-select v-model="sourceList.pagination.countryId" placeholder="国家" clearable filterable
-                           @change="(val) => getCitySearchData(val, '20', true)">
-                  <el-option v-for="item in countrySearchData" :label="item.name" :value="item.id">
-                  </el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item prop="provinceName">
-                <selectCity placeholder="省/洲" @change="(val) => getCitySearchData(val, '30', true)" addressId="provinceId" addressName="provinceName"
-                            v-model="sourceList.pagination" :data="provinceSearchData">
-                </selectCity>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item prop="cityName">
-                <selectCity placeholder="城市" addressId="cityId" addressName="cityName" v-model="sourceList.pagination" :data="citySearchData">
-                </selectCity>
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </template>
-        <template #tags>
-          <div style="width: 100%">
-            <el-tag style="margin-right: 8px" type="info" v-for="(tag, index) in sourceList.pagination.tags" closable :key="index"
-                    @close="tagSearchClose(tag)">
-              {{ dictValueLabel(tag, customerTag) }}
-            </el-tag>
-            <template v-if="sourceList.pagination.tags.length !== customerTag.length">
-              <el-select v-if="addTagSearchShow" v-model="addSearchTag" style="margin-top: 8px" @change="changeSearchTag">
-                <el-option v-for="tag in customerTag" :key="tag.value" :label="tag.label" :value="tag.value" :disabled="
-                    judgeTagSelect(sourceList.pagination.tags, tag.value)
-                  " />
-              </el-select>
-              <el-tag style="cursor: pointer" type="info" @click="addTagSearchShow = true" v-else>
-                +
-              </el-tag>
-            </template>
-          </div>
-        </template>
+    <el-dialog title="简称" v-if="openShortDialog" v-model="openShortDialog" width="800">
+      <byForm :formConfig="formShortConfig" :formOption="formOption" v-model="shortFormData.data" :rules="shortRules" ref="shortFormDom">
+
       </byForm>
       <template #footer>
-        <el-button @click="cancelSearch()" size="default">取 消</el-button>
+        <el-button @click="openShortDialog=false" size="default">取 消</el-button>
         <el-button type="primary" @click="submitSearch()" size="default">确 定</el-button>
       </template>
     </el-dialog>
@@ -358,7 +315,7 @@
 import { ElMessage, ElMessageBox } from "element-plus";
 import byTable from "@/components/byTable/index";
 import byForm from "@/components/byForm/index";
-import { computed, ref } from "vue";
+import { computed, reactive, ref } from "vue";
 import useUserStore from "@/store/modules/user";
 import selectCity from "@/components/selectCity/index.vue";
 import TitleInfo from "@/components/TitleInfo/index.vue";
@@ -525,6 +482,14 @@ const config = computed(() => {
     },
     {
       attrs: {
+        label: "客户简称",
+        prop: "shortName",
+        fixed: "left",
+        width: 110,
+      },
+    },
+    {
+      attrs: {
         label: "客户名称",
         slot: "name",
         fixed: "left",
@@ -625,6 +590,23 @@ const config = computed(() => {
                   openAllocation.value = true;
                 },
               },
+              proxy.useUserStore().roles.includes("cfo")
+                ? {
+                    attrs: {
+                      label: "简称",
+                      type: "primary",
+                      text: true,
+                    },
+                    el: "button",
+                    click() {
+                      shortFormData.data = {
+                        id: row.id,
+                        shortName: row.shortName,
+                      };
+                      openShortDialog.value = true;
+                    },
+                  }
+                : {},
               {
                 attrs: {
                   label: "跟进",
@@ -1216,97 +1198,8 @@ const getCitySearchData = (id, type, isChange) => {
   });
 };
 getCitySearchData("0");
-const openSearch = ref(false);
-const formSearchConfig = computed(() => {
-  return [
-    {
-      type: "input",
-      prop: "name",
-      label: "客户名称",
-      itemType: "text",
-    },
-    {
-      type: "input",
-      prop: "contactName",
-      label: "客户联系人",
-      itemType: "text",
-      itemWidth: 50,
-    },
-    {
-      type: "input",
-      prop: "contactEmail",
-      label: "联系人邮箱",
-      itemType: "text",
-      itemWidth: 50,
-    },
-    {
-      type: "slot",
-      slotName: "address",
-      label: "所在城市",
-    },
-    {
-      type: "select",
-      label: "客户来源",
-      prop: "source",
-      itemWidth: 50,
-      data: customerSource.value,
-      clearable: true,
-    },
-    {
-      type: "select",
-      label: "客户类型",
-      prop: "status",
-      itemWidth: 50,
-      data: customerStatus.value,
-      clearable: true,
-    },
-    {
-      type: "select",
-      label: "业务员",
-      prop: "userId",
-      data: userList.value,
-      clearable: true,
-    },
-    {
-      type: "slot",
-      slotName: "tags",
-      label: "客户标签",
-    },
-  ];
-});
 const addSearchTag = ref("");
 const addTagSearchShow = ref(false);
-// let copySearch = ref({});
-const moreSearch = () => {
-  if (sourceList.value.pagination.tag) {
-    sourceList.value.pagination.tags =
-      sourceList.value.pagination.tag.split(",");
-  } else {
-    sourceList.value.pagination.tags = [];
-  }
-  addTagSearchShow.value = false;
-  // copySearch.value = proxy.deepClone(sourceList.value.pagination);
-  openSearch.value = true;
-};
-const cancelSearch = () => {
-  // sourceList.value.pagination = copySearch.value;
-  openSearch.value = false;
-};
-const submitSearch = () => {
-  if (
-    sourceList.value.pagination.tags &&
-    sourceList.value.pagination.tags.length > 0
-  ) {
-    sourceList.value.pagination.tag =
-      sourceList.value.pagination.tags.join(",");
-  } else {
-    sourceList.value.pagination.tag = "";
-  }
-  openSearch.value = false;
-  sourceList.value.pagination.keyword = "";
-  sourceList.value.pagination.pageNum = 1;
-  getList();
-};
 const tagSearchClose = (val) => {
   sourceList.value.pagination.tags = sourceList.value.pagination.tags.filter(
     (item) => item !== val
@@ -1346,6 +1239,41 @@ const exportExcel = () => {
       proxy.downloadFile(res, "客户.xlsx");
     });
 };
+
+const openShortDialog = ref(false);
+const shortFormData = reactive({
+  data: {},
+});
+const shortFormDom = ref(null);
+const formShortConfig = computed(() => {
+  return [
+    {
+      type: "input",
+      prop: "shortName",
+      label: "客户简称",
+      itemType: "text",
+    },
+  ];
+});
+const shortRules = ref({
+  shortName: [{ required: true, message: "请输入客户简称", trigger: "blur" }],
+});
+
+const submitSearch = () => {
+  shortFormDom.value.handleSubmit(() => {
+    proxy.post("/customer/editShortName", shortFormData.data).then(
+      () => {
+        proxy.msgTip("操作成功");
+        openShortDialog.value = false;
+        getList();
+      },
+      (err) => {
+        console.log(err);
+        // openShortDialog.value = false;
+      }
+    );
+  });
+};
 </script>
 
 <style lang="scss" scoped>

src/views/customer/highseas/index.vue

@@ -285,55 +285,12 @@
       </template>
     </el-dialog>
 
-    <el-dialog title="高级检索" v-if="openSearch" v-model="openSearch" width="600" :before-close="cancelSearch">
-      <byForm :formConfig="formSearchConfig" :formOption="formOption" v-model="sourceList.pagination">
-        <template #address>
-          <el-row style="width: 100%">
-            <el-col :span="8">
-              <el-form-item prop="countryId">
-                <el-select v-model="sourceList.pagination.countryId" placeholder="国家" clearable filterable
-                           @change="(val) => getCitySearchData(val, '20', true)">
-                  <el-option v-for="item in countrySearchData" :label="item.name" :value="item.id">
-                  </el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item prop="provinceName">
-                <selectCity placeholder="省/洲" @change="(val) => getCitySearchData(val, '30', true)" addressId="provinceId" addressName="provinceName"
-                            v-model="sourceList.pagination" :data="provinceSearchData">
-                </selectCity>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item prop="cityName">
-                <selectCity placeholder="城市" addressId="cityId" addressName="cityName" v-model="sourceList.pagination" :data="citySearchData">
-                </selectCity>
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </template>
-        <template #tags>
-          <div style="width: 100%">
-            <el-tag style="margin-right: 8px" type="info" v-for="(tag, index) in sourceList.pagination.tags" closable :key="index"
-                    @close="tagSearchClose(tag)">
-              {{ dictValueLabel(tag, customerTag) }}
-            </el-tag>
-            <template v-if="sourceList.pagination.tags.length !== customerTag.length">
-              <el-select v-if="addTagSearchShow" v-model="addSearchTag" style="margin-top: 8px" @change="changeSearchTag">
-                <el-option v-for="tag in customerTag" :key="tag.value" :label="tag.label" :value="tag.value" :disabled="
-                    judgeTagSelect(sourceList.pagination.tags, tag.value)
-                  " />
-              </el-select>
-              <el-tag style="cursor: pointer" type="info" @click="addTagSearchShow = true" v-else>
-                +
-              </el-tag>
-            </template>
-          </div>
-        </template>
+    <el-dialog title="简称" v-if="openShortDialog" v-model="openShortDialog" width="800">
+      <byForm :formConfig="formShortConfig" :formOption="formOption" v-model="shortFormData.data" :rules="shortRules" ref="shortFormDom">
+
       </byForm>
       <template #footer>
-        <el-button @click="cancelSearch()" size="default">取 消</el-button>
+        <el-button @click="openShortDialog=false" size="default">取 消</el-button>
         <el-button type="primary" @click="submitSearch()" size="default">确 定</el-button>
       </template>
     </el-dialog>
@@ -466,6 +423,14 @@ const config = computed(() => {
     },
     {
       attrs: {
+        label: "客户简称",
+        prop: "shortName",
+        fixed: "left",
+        width: 110,
+      },
+    },
+    {
+      attrs: {
         label: "客户名称",
         slot: "name",
         fixed: "left",
@@ -537,6 +502,23 @@ const config = computed(() => {
       },
       renderHTML(row) {
         return [
+          proxy.useUserStore().roles.includes("cfo")
+            ? {
+                attrs: {
+                  label: "简称",
+                  type: "primary",
+                  text: true,
+                },
+                el: "button",
+                click() {
+                  shortFormData.data = {
+                    id: row.id,
+                    shortName: row.shortName,
+                  };
+                  openShortDialog.value = true;
+                },
+              }
+            : {},
           {
             attrs: {
               label: "跟进",
@@ -1288,21 +1270,7 @@ const cancelSearch = () => {
   // sourceList.value.pagination = copySearch.value;
   openSearch.value = false;
 };
-const submitSearch = () => {
-  if (
-    sourceList.value.pagination.tags &&
-    sourceList.value.pagination.tags.length > 0
-  ) {
-    sourceList.value.pagination.tag =
-      sourceList.value.pagination.tags.join(",");
-  } else {
-    sourceList.value.pagination.tag = "";
-  }
-  openSearch.value = false;
-  sourceList.value.pagination.keyword = "";
-  sourceList.value.pagination.pageNum = 1;
-  getList();
-};
+
 const tagSearchClose = (val) => {
   sourceList.value.pagination.tags = sourceList.value.pagination.tags.filter(
     (item) => item !== val
@@ -1343,6 +1311,41 @@ const exportExcel = () => {
       proxy.downloadFile(res, "公海客户.xlsx");
     });
 };
+
+const openShortDialog = ref(false);
+const shortFormData = reactive({
+  data: {},
+});
+const shortFormDom = ref(null);
+const formShortConfig = computed(() => {
+  return [
+    {
+      type: "input",
+      prop: "shortName",
+      label: "客户简称",
+      itemType: "text",
+    },
+  ];
+});
+const shortRules = ref({
+  shortName: [{ required: true, message: "请输入客户简称", trigger: "blur" }],
+});
+
+const submitSearch = () => {
+  shortFormDom.value.handleSubmit(() => {
+    proxy.post("/customer/editShortName", shortFormData.data).then(
+      () => {
+        proxy.msgTip("操作成功");
+        openShortDialog.value = false;
+        getList();
+      },
+      (err) => {
+        console.log(err);
+        // openShortDialog.value = false;
+      }
+    );
+  });
+};
 </script>
 
 <style lang="scss" scoped>

src/views/customer/privatesea/index.vue

@@ -293,55 +293,12 @@
       </template>
     </el-dialog>
 
-    <el-dialog title="高级检索" v-if="openSearch" v-model="openSearch" width="600" :before-close="cancelSearch">
-      <byForm :formConfig="formSearchConfig" :formOption="formOption" v-model="sourceList.pagination">
-        <template #address>
-          <el-row style="width: 100%">
-            <el-col :span="8">
-              <el-form-item prop="countryId">
-                <el-select v-model="sourceList.pagination.countryId" placeholder="国家" clearable filterable
-                           @change="(val) => getCitySearchData(val, '20', true)">
-                  <el-option v-for="item in countrySearchData" :label="item.name" :value="item.id">
-                  </el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item prop="provinceName">
-                <selectCity placeholder="省/洲" @change="(val) => getCitySearchData(val, '30', true)" addressId="provinceId" addressName="provinceName"
-                            v-model="sourceList.pagination" :data="provinceSearchData">
-                </selectCity>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item prop="cityName">
-                <selectCity placeholder="城市" addressId="cityId" addressName="cityName" v-model="sourceList.pagination" :data="citySearchData">
-                </selectCity>
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </template>
-        <template #tags>
-          <div style="width: 100%">
-            <el-tag style="margin-right: 8px" type="info" v-for="(tag, index) in sourceList.pagination.tags" closable :key="index"
-                    @close="tagSearchClose(tag)">
-              {{ dictValueLabel(tag, customerTag) }}
-            </el-tag>
-            <template v-if="sourceList.pagination.tags.length !== customerTag.length">
-              <el-select v-if="addTagSearchShow" v-model="addSearchTag" style="margin-top: 8px" @change="changeSearchTag">
-                <el-option v-for="tag in customerTag" :key="tag.value" :label="tag.label" :value="tag.value" :disabled="
-                    judgeTagSelect(sourceList.pagination.tags, tag.value)
-                  " />
-              </el-select>
-              <el-tag style="cursor: pointer" type="info" @click="addTagSearchShow = true" v-else>
-                +
-              </el-tag>
-            </template>
-          </div>
-        </template>
+    <el-dialog title="简称" v-if="openShortDialog" v-model="openShortDialog" width="800">
+      <byForm :formConfig="formShortConfig" :formOption="formOption" v-model="shortFormData.data" :rules="shortRules" ref="shortFormDom">
+
       </byForm>
       <template #footer>
-        <el-button @click="cancelSearch()" size="default">取 消</el-button>
+        <el-button @click="openShortDialog=false" size="default">取 消</el-button>
         <el-button type="primary" @click="submitSearch()" size="default">确 定</el-button>
       </template>
     </el-dialog>
@@ -475,6 +432,14 @@ const config = computed(() => {
     },
     {
       attrs: {
+        label: "客户简称",
+        prop: "shortName",
+        fixed: "left",
+        width: 110,
+      },
+    },
+    {
+      attrs: {
         label: "客户名称",
         slot: "name",
         fixed: "left",
@@ -546,6 +511,23 @@ const config = computed(() => {
       },
       renderHTML(row) {
         return [
+          proxy.useUserStore().roles.includes("cfo")
+            ? {
+                attrs: {
+                  label: "简称",
+                  type: "primary",
+                  text: true,
+                },
+                el: "button",
+                click() {
+                  shortFormData.data = {
+                    id: row.id,
+                    shortName: row.shortName,
+                  };
+                  openShortDialog.value = true;
+                },
+              }
+            : {},
           {
             attrs: {
               label: "跟进",
@@ -1312,21 +1294,7 @@ const cancelSearch = () => {
   // sourceList.value.pagination = copySearch.value;
   openSearch.value = false;
 };
-const submitSearch = () => {
-  if (
-    sourceList.value.pagination.tags &&
-    sourceList.value.pagination.tags.length > 0
-  ) {
-    sourceList.value.pagination.tag =
-      sourceList.value.pagination.tags.join(",");
-  } else {
-    sourceList.value.pagination.tag = "";
-  }
-  openSearch.value = false;
-  sourceList.value.pagination.keyword = "";
-  sourceList.value.pagination.pageNum = 1;
-  getList();
-};
+
 const tagSearchClose = (val) => {
   sourceList.value.pagination.tags = sourceList.value.pagination.tags.filter(
     (item) => item !== val
@@ -1403,6 +1371,41 @@ const exportExcel = () => {
       proxy.downloadFile(res, "私海客户.xlsx");
     });
 };
+
+const openShortDialog = ref(false);
+const shortFormData = reactive({
+  data: {},
+});
+const shortFormDom = ref(null);
+const formShortConfig = computed(() => {
+  return [
+    {
+      type: "input",
+      prop: "shortName",
+      label: "客户简称",
+      itemType: "text",
+    },
+  ];
+});
+const shortRules = ref({
+  shortName: [{ required: true, message: "请输入客户简称", trigger: "blur" }],
+});
+
+const submitSearch = () => {
+  shortFormDom.value.handleSubmit(() => {
+    proxy.post("/customer/editShortName", shortFormData.data).then(
+      () => {
+        proxy.msgTip("操作成功");
+        openShortDialog.value = false;
+        getList();
+      },
+      (err) => {
+        console.log(err);
+        // openShortDialog.value = false;
+      }
+    );
+  });
+};
 </script>
 
 <style lang="scss" scoped>

src/views/index.vue

@@ -419,6 +419,7 @@ const getData = () => {
     .then((res) => {
       toBeProcessedData.value = res;
     });
+
   // proxy.useUserStore().user.companyId == "100" ? "" :"1"
   // 待报价
   proxy

src/views/oa/application/invoiceTaxDeduction/index.vue

@@ -152,14 +152,14 @@ const config = computed(() => {
 
     {
       attrs: {
-        label: "申请人",
+        label: "提交人",
         prop: "createUserName",
         // width: 130,
       },
     },
     {
       attrs: {
-        label: "申请日期",
+        label: "提交日期",
         prop: "applyTime",
         // width: 100,
       },

src/views/oa/application/personalInvoice/index.vue

@@ -152,14 +152,14 @@ const config = computed(() => {
 
     {
       attrs: {
-        label: "申请人",
+        label: "提交人",
         prop: "createUserName",
         width: 130,
       },
     },
     {
       attrs: {
-        label: "申请日期",
+        label: "提交日期",
         prop: "applyTime",
         width: 100,
       },

src/views/process/processConfig/vueFlow.vue

@@ -359,7 +359,9 @@ const formConfig = computed(() => {
       required: true,
       itemType: "text",
       itemWidth: 50,
-      isShow: formData.data.handleObjectType === 9,
+      isShow:
+        formData.data.handleObjectType === 9 ||
+        formData.data.handleObjectType === 8,
     },
     {
       type: "select",

src/views/report/expressPaymentSummary/index.vue

@@ -0,0 +1,664 @@
+<template>
+  <div class="pageIndexClass">
+    <div class="content">
+      <byTable :source="sourceList.data" :pagination="sourceList.pagination" :selectConfig="selectConfig" :config="config" highlight-current-row
+               :action-list="[
+        ]" @get-list="getList" :hideTable="true" :hidePagination="true">
+        <template #code="{item}">
+          <div style="width:100%">
+            <span class="el-click" @click="getDtl(item)">{{item.code}}</span>
+          </div>
+        </template>
+      </byTable>
+
+      <el-table :data="sourceList.data" :height="tableHeight" style="width: 100%;margin-top:-10px" v-loading="loading" border id="my-table">
+        <el-table-column prop="code" label="快递公司" width="100" fixed="left" />
+        <el-table-column prop="code" label="年初余额" width="100" fixed="left" />
+        <template v-if="monthList && monthList.length>0">
+          <el-table-column v-for="col in monthList" :key="col.key" :label="col.label" align="center">
+            <el-table-column prop="address" label="贷方发生额" width="100" align="right">
+              <template #default="{ row, $index }">
+                <div style="width: 100%" :class="today==col?'isToday':''" v-if="row[col] && row[col].sumContractAmount">
+                  {{moneyFormat(row[col].sumContractAmount,2)}}
+                </div>
+              </template>
+            </el-table-column>
+            <el-table-column prop="address" label="借方发生额" align="center">
+              <el-table-column prop="address" label="付款" width="100" align="right">
+              </el-table-column>
+              <el-table-column prop="address" label="抵扣充值" width="100" align="right">
+              </el-table-column>
+            </el-table-column>
+            <el-table-column prop="address" label="期末余额" width="100" align="right">
+            </el-table-column>
+          </el-table-column>
+        </template>
+      </el-table>
+
+    </div>
+
+    <el-dialog :title="modalType == 'add' ? '添加' : '编辑'" v-if="dialogVisible" v-model="dialogVisible" width="60%">
+      <byForm :formConfig="formConfig" :formOption="formOption" v-model="formData.data" :rules="rules" ref="submit" v-loading="loadingDialog">
+
+      </byForm>
+      <template #footer>
+        <el-button @click="dialogVisible = false" size="default">取 消</el-button>
+        <el-button type="primary" @click="submitForm()" size="default">确 定</el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup>
+import { computed, ref } from "vue";
+import byTable from "@/components/byTable/index";
+import byForm from "@/components/byForm/index";
+import moment from "moment";
+
+const { proxy } = getCurrentInstance();
+const tableHeight = ref(0);
+const getTableHeight = () => {
+  tableHeight.value = window.innerHeight - 150 - 30;
+};
+getTableHeight();
+window.addEventListener("resize", () => {
+  getTableHeight();
+});
+const sealType = computed(() => proxy.useUserStore().allDict["seal_type"]);
+const userList = ref([]);
+const deptData = ref([]);
+const typeData = ref([
+  {
+    label: "收入",
+    value: "10",
+  },
+  {
+    label: "支出",
+    value: "20",
+  },
+]);
+const monthList = ref([
+  { key: 1, label: "1月" },
+  { key: 2, label: "2月" },
+  { key: 3, label: "3月" },
+  { key: 4, label: "4月" },
+  { key: 5, label: "5月" },
+  { key: 6, label: "6月" },
+  { key: 7, label: "7月" },
+  { key: 8, label: "8月" },
+  { key: 9, label: "9月" },
+  { key: 10, label: "10月" },
+  { key: 11, label: "11月" },
+  { key: 12, label: "12月" },
+]);
+const sourceList = ref({
+  data: [],
+  pagination: {
+    total: 0,
+    pageNum: 1,
+    pageSize: 10,
+    keyword: "",
+    year: moment().format("yyyy"),
+  },
+});
+const loading = ref(false);
+const statusData = ref([
+  {
+    label: "草稿",
+    value: 0,
+  },
+  {
+    label: "审批中",
+    value: 10,
+  },
+  {
+    label: "审批驳回",
+    value: 20,
+  },
+  {
+    label: "审批通过",
+    value: 30,
+  },
+  {
+    label: "作废",
+    value: 88,
+  },
+]);
+const processingMethod = ref([
+  {
+    dictKey: 10,
+    dictValue: "业务自采",
+  },
+  {
+    dictKey: 20,
+    dictValue: "生产处理",
+  },
+]);
+
+const contractType = ref([
+  {
+    dictKey: "3",
+    dictValue: "打样订单",
+  },
+  {
+    dictKey: "2",
+    dictValue: "内销订单",
+  },
+  {
+    dictKey: "1",
+    dictValue: "外贸订单(退税)",
+  },
+  {
+    dictKey: "4",
+    dictValue: "外贸订单(不退税)",
+  },
+]);
+const selectConfig = computed(() => {
+  return [
+    {
+      type: "time",
+      itemType: "year",
+      label: "年份",
+      placeholder: "请选择",
+      prop: "year",
+      placeholderOne: "",
+      propOne: "",
+      clearable: false,
+      fn: () => {
+        getList();
+      },
+    },
+  ];
+});
+const config = computed(() => {
+  return [
+    {
+      attrs: {
+        label: "订单编号",
+        slot: "code",
+      },
+    },
+
+    // {
+    //   attrs: {
+    //     label: "印章类型",
+    //     prop: "type",
+    //   },
+    //   render(val) {
+    //     return proxy.dictKeyValue(val, sealType.value);
+    //   },
+    // },
+    {
+      attrs: {
+        label: "业务员",
+        prop: "createUserName",
+      },
+    },
+    {
+      attrs: {
+        label: "跟单员",
+        prop: "applyTime",
+      },
+    },
+    {
+      attrs: {
+        label: "订单类型",
+        prop: "contractType",
+        width: 110,
+      },
+      render(val) {
+        return proxy.dictKeyValue(val, contractType.value);
+      },
+    },
+    {
+      attrs: {
+        label: "订单处理方式",
+        prop: "processingMethod",
+        width: 110,
+      },
+      render(val) {
+        return proxy.dictKeyValue(val, processingMethod.value);
+      },
+    },
+    {
+      attrs: {
+        label: "销售金额",
+        prop: "deptName",
+      },
+    },
+    {
+      attrs: {
+        label: "订单出货金额",
+        prop: "educationName",
+      },
+    },
+    {
+      attrs: {
+        label: "出货申请出货金额",
+        prop: "amount",
+      },
+      render(val) {
+        return proxy.moneyFormat(val, 2);
+      },
+    },
+    {
+      attrs: {
+        label: "已收定金",
+        prop: "amount",
+      },
+      render(val) {
+        return proxy.moneyFormat(val, 2);
+      },
+    },
+    {
+      attrs: {
+        label: "是否可结算",
+        prop: "educationName",
+      },
+    },
+    {
+      attrs: {
+        label: "是否已结算",
+        prop: "educationName",
+      },
+    },
+    {
+      attrs: {
+        label: "客户名称",
+        prop: "educationName",
+      },
+    },
+    {
+      attrs: {
+        label: "客户简称",
+        prop: "educationName",
+      },
+    },
+    {
+      attrs: {
+        label: "应收金额",
+        prop: "educationName",
+      },
+    },
+    {
+      attrs: {
+        label: "收款金额",
+        prop: "amount",
+      },
+      render(val) {
+        return proxy.moneyFormat(val, 2);
+      },
+    },
+    {
+      attrs: {
+        label: "未收金额",
+        prop: "amount",
+      },
+      render(val) {
+        return proxy.moneyFormat(val, 2);
+      },
+    },
+    {
+      attrs: {
+        label: "出货日期",
+        prop: "amount",
+      },
+    },
+    {
+      attrs: {
+        label: "账龄级别",
+        prop: "amount",
+      },
+    },
+    // {
+    //   attrs: {
+    //     label: "审批状态",
+    //     prop: "status",
+    //     width: 100,
+    //   },
+    //   render(type) {
+    //     return proxy.dictValueLabel(type, statusData.value);
+    //   },
+    // },
+    {
+      attrs: {
+        label: "操作",
+        width: "120",
+        align: "center",
+      },
+      renderHTML(row) {
+        return row.createUser == proxy.useUserStore().user.userId
+          ? [
+              row.status == 0
+                ? {
+                    attrs: {
+                      label: "修改",
+                      type: "primary",
+                      text: true,
+                    },
+                    el: "button",
+                    click() {
+                      clickUpdate(row);
+                    },
+                  }
+                : {},
+              row.status == 0
+                ? {
+                    attrs: {
+                      label: "删除",
+                      type: "danger",
+                      text: true,
+                    },
+                    el: "button",
+                    click() {
+                      proxy
+                        .msgConfirm()
+                        .then((res) => {
+                          proxy
+                            .post("/educationSubsidy/delete", {
+                              id: row.id,
+                            })
+                            .then((res) => {
+                              proxy.msgTip("操作成功", 1);
+                              getList();
+                            });
+                        })
+                        .catch((err) => {});
+                    },
+                  }
+                : {},
+              row.status == 10 || row.status == 30
+                ? {
+                    attrs: {
+                      label: "作废",
+                      type: "danger",
+                      text: true,
+                    },
+                    el: "button",
+                    click() {
+                      proxy
+                        .msgConfirm()
+                        .then((res) => {
+                          proxy
+                            .post("/educationSubsidy/cancellation", {
+                              id: row.id,
+                            })
+                            .then((res) => {
+                              proxy.msgTip("操作成功", 1);
+                              getList();
+                            });
+                        })
+                        .catch((err) => {});
+                    },
+                  }
+                : {},
+            ]
+          : [];
+      },
+    },
+  ];
+});
+const corporationList = ref([]);
+const getList = async (req) => {
+  sourceList.value.pagination = { ...sourceList.value.pagination, ...req };
+  loading.value = true;
+  proxy
+    .post("/educationSubsidy/page", sourceList.value.pagination)
+    .then((res) => {
+      sourceList.value.data = res.rows;
+      sourceList.value.pagination.total = res.total;
+      setTimeout(() => {
+        loading.value = false;
+      }, 200);
+    });
+};
+getList();
+const getDeptData = (val) => {
+  proxy
+    .get("/tenantUser/list", {
+      pageNum: 1,
+      pageSize: 10000,
+      tenantId: proxy.useUserStore().user.tenantId,
+      companyId: proxy.useUserStore().user.companyId,
+    })
+    .then((res) => {
+      userList.value = res.rows.map((item) => {
+        return {
+          ...item,
+          label: item.nickName,
+          value: item.userId,
+        };
+      });
+    });
+
+  proxy
+    .get("/tenantDept/list", {
+      pageNum: 1,
+      pageSize: 9999,
+      keyword: "",
+      ancestors: proxy.useUserStore().user.companyId,
+      tenantId: proxy.useUserStore().user.tenantId,
+      // type: 2,
+    })
+    .then((res) => {
+      deptData.value = proxy.handleTree(res.data, "deptId");
+    });
+};
+getDeptData();
+const modalType = ref("add");
+const dialogVisible = ref(false);
+const loadingDialog = ref(false);
+const submit = ref(null);
+const formOption = reactive({
+  inline: true,
+  labelWidth: 100,
+  itemWidth: 100,
+  rules: [],
+});
+const formConfig = computed(() => {
+  return [
+    {
+      type: "title1",
+      title: "基本信息",
+    },
+    {
+      type: "input",
+      prop: "name",
+      label: "印章名称",
+      required: true,
+      itemWidth: 50,
+      itemType: "text",
+    },
+    {
+      type: "select",
+      prop: "sealType",
+      label: "印章类型",
+      data: sealType.value,
+      itemWidth: 50,
+    },
+    {
+      type: "select",
+      prop: "applyUserId",
+      label: "存管人员",
+      required: true,
+      filterable: true,
+      data: userList.value,
+      itemWidth: 50,
+      fn: (val) => {
+        let current = userList.value.find((x) => x.value == val);
+        console.log(current, "ada");
+        if (current) {
+          formData.data.deptId = current.deptId;
+        }
+      },
+    },
+    {
+      type: "treeSelect",
+      prop: "deptId",
+      label: "存管部门",
+      data: deptData.value,
+      propsTreeLabel: "deptName",
+      propsTreeValue: "deptId",
+      itemWidth: 50,
+      disabled: 50,
+    },
+    {
+      type: "input",
+      prop: "accountNumber",
+      label: "印章用途",
+      itemWidth: 100,
+      itemType: "textarea",
+    },
+  ];
+});
+const rules = ref({
+  name: [{ required: true, message: "请输入承包商", trigger: "blur" }],
+  taxPoints: [{ required: true, message: "请输入税点", trigger: "blur" }],
+  accountBank: [{ required: true, message: "请输入开户行", trigger: "blur" }],
+  accountName: [{ required: true, message: "请输入开户名", trigger: "blur" }],
+  accountNumber: [{ required: true, message: "请输入账号", trigger: "blur" }],
+});
+const formData = reactive({
+  data: {
+    accountRemainderList: [{ currency: "", remainder: undefined }],
+  },
+});
+const openModal = (val) => {
+  // modalType.value = val;
+  // formData.data = {
+  //   accountRemainderList: [{ currency: "", remainder: undefined }],
+  // };
+  // loadingDialog.value = false;
+  // dialogVisible.value = true;
+  proxy.$router.replace({
+    path: "/platform_manage/process/processApproval",
+    query: {
+      flowKey: "education_subsidy_flow",
+      flowName: "学历补贴发起流程",
+      random: proxy.random(),
+    },
+  });
+};
+const clickBalance = () => {
+  if (
+    formData.data.accountRemainderList &&
+    formData.data.accountRemainderList.length > 0
+  ) {
+    formData.data.accountRemainderList.push({
+      currency: "",
+      remainder: undefined,
+    });
+  } else {
+    formData.data.accountRemainderList = [
+      { currency: "", remainder: undefined },
+    ];
+  }
+};
+const handleRemove = (index) => {
+  formData.data.accountRemainderList.splice(index, 1);
+};
+const isRepeat = (arr) => {
+  var hash = {};
+  for (var i in arr) {
+    if (hash[arr[i].currency]) return true;
+    hash[arr[i].currency] = true;
+  }
+  return false;
+};
+const submitForm = () => {
+  submit.value.handleSubmit(() => {
+    loadingDialog.value = true;
+    proxy.post("/contractor/" + modalType.value, formData.data).then(
+      () => {
+        proxy.msgTip("操作成功", 1);
+        dialogVisible.value = false;
+        getList();
+      },
+      (err) => {
+        console.log(err);
+        loadingDialog.value = false;
+      }
+    );
+    // if (
+    //   formData.data.accountRemainderList &&
+    //   formData.data.accountRemainderList.length > 0
+    // ) {
+    //   if (isRepeat(formData.data.accountRemainderList)) {
+    //     return ElMessage("请勿重复添加货币余额");
+    //   } else {
+    //     loadingDialog.value = true;
+    //     proxy.post("/accountManagement/" + modalType.value, formData.data).then(
+    //       () => {
+    //         ElMessage({
+    //           message: modalType.value == "add" ? "添加成功" : "编辑成功",
+    //           type: "success",
+    //         });
+    //         dialogVisible.value = false;
+    //         getList();
+    //       },
+    //       (err) => {
+    //         console.log(err);
+    //         loadingDialog.value = false;
+    //       }
+    //     );
+    //   }
+    // } else {
+    //   return ElMessage("请添加至少一条类型余额");
+    // }
+  });
+};
+
+const update = (row) => {
+  loadingDialog.value = false;
+  modalType.value = "edit";
+  formData.data = proxy.deepClone(row);
+  dialogVisible.value = true;
+};
+
+const clickUpdate = (row) => {
+  proxy.$router.push({
+    path: "/platform_manage/process/processApproval",
+    query: {
+      flowKey: "education_subsidy_flow",
+      flowName: "学历补贴发起流程",
+      random: proxy.random(),
+      businessId: row.id,
+    },
+  });
+};
+
+const getDtl = (row) => {
+  proxy.$router.push({
+    path: "/platform_manage/process/processApproval",
+    query: {
+      flowKey: "education_subsidy_flow",
+      flowName: "学历补贴流程查看",
+      random: proxy.random(),
+      businessId: row.id,
+      processType: 20,
+    },
+  });
+};
+</script>
+
+<style lang="scss" scoped>
+.tenant {
+  padding: 20px;
+}
+:deep(
+    .el-table .el-table__header-wrapper th,
+    .el-table .el-table__fixed-header-wrapper th
+  ) {
+  height: auto !important;
+}
+:deep(.el-table th.el-table__cell) {
+  background: #fff !important;
+}
+:deep(.el-table .el-table__cell) {
+  padding: 0 !important;
+}
+:deep(.el-table .cell) {
+  padding: 0 8px !important;
+  font-size: 12px !important;
+}
+</style>

src/views/report/orderSummary/index.vue

@@ -0,0 +1,631 @@
+<template>
+  <div class="pageIndexClass">
+    <div class="content">
+      <byTable :source="sourceList.data" :pagination="sourceList.pagination" :selectConfig="selectConfig" :config="config" :loading="loading"
+               highlight-current-row :action-list="[
+        
+        ]" @get-list="getList">
+
+        <template #code="{item}">
+          <div style="width:100%">
+            <span class="el-click" @click="getDtl(item)">{{item.code}}</span>
+          </div>
+        </template>
+
+        <template #time="{item}">
+          <div style="width:100%">
+            <el-date-picker v-model="item.settleStartDate" type="date" style="width:150px" placeholder="开始日期" value-format="YYYY-MM-DD"
+                            :clearable="false" @change="()=>changeDate(item.settleStartDate,item.settleEndDate,item.id)" />
+            <el-date-picker v-model="item.settleEndDate" type="date" style="width:150px" placeholder="结束日期" value-format="YYYY-MM-DD"
+                            :clearable="false" @change="()=>changeDate(item.settleStartDate,item.settleEndDate,item.id)" />
+          </div>
+        </template>
+
+      </byTable>
+    </div>
+
+    <el-dialog :title="modalType == 'add' ? '添加' : '编辑'" v-if="dialogVisible" v-model="dialogVisible" width="60%">
+      <byForm :formConfig="formConfig" :formOption="formOption" v-model="formData.data" :rules="rules" ref="submit" v-loading="loadingDialog">
+
+      </byForm>
+      <template #footer>
+        <el-button @click="dialogVisible = false" size="default">取 消</el-button>
+        <el-button type="primary" @click="submitForm()" size="default">确 定</el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup>
+import { computed, ref } from "vue";
+import byTable from "@/components/byTable/index";
+import byForm from "@/components/byForm/index";
+
+const { proxy } = getCurrentInstance();
+const sealType = computed(() => proxy.useUserStore().allDict["seal_type"]);
+const userList = ref([]);
+const deptData = ref([]);
+const typeData = ref([
+  {
+    label: "收入",
+    value: "10",
+  },
+  {
+    label: "支出",
+    value: "20",
+  },
+]);
+const sourceList = ref({
+  data: [],
+  pagination: {
+    total: 0,
+    pageNum: 1,
+    pageSize: 10,
+    keyword: "",
+  },
+});
+const loading = ref(false);
+const statusData = ref([
+  {
+    label: "草稿",
+    value: 0,
+  },
+  {
+    label: "审批中",
+    value: 10,
+  },
+  {
+    label: "审批驳回",
+    value: 20,
+  },
+  {
+    label: "审批通过",
+    value: 30,
+  },
+  {
+    label: "作废",
+    value: 88,
+  },
+]);
+const belongTypeData = ref([
+  {
+    dictKey: "1",
+    dictValue: "归属工厂",
+  },
+  {
+    dictKey: "2",
+    dictValue: "归属业务",
+  },
+]);
+
+const contractType = ref([
+  {
+    dictKey: "3",
+    dictValue: "打样订单",
+  },
+  {
+    dictKey: "2",
+    dictValue: "内销订单",
+  },
+  {
+    dictKey: "1",
+    dictValue: "外贸订单(退税)",
+  },
+  {
+    dictKey: "4",
+    dictValue: "外贸订单(不退税)",
+  },
+]);
+const selectConfig = computed(() => {
+  return [];
+});
+const config = computed(() => {
+  return [
+    {
+      attrs: {
+        label: "订单编号",
+        prop: "contractCode",
+        fixed: "left",
+        width: 150,
+      },
+    },
+    {
+      attrs: {
+        label: "业务员",
+        prop: "salesmanName",
+        width: 100,
+      },
+    },
+    {
+      attrs: {
+        label: "跟单员",
+        prop: "merchUserName",
+        width: 100,
+      },
+    },
+    {
+      attrs: {
+        label: "订单类型",
+        prop: "contractType",
+        width: 130,
+      },
+      render(val) {
+        return proxy.dictKeyValue(val, contractType.value);
+      },
+    },
+    {
+      attrs: {
+        label: "订单归属",
+        prop: "belongType",
+        width: 110,
+      },
+      render(val) {
+        return proxy.dictKeyValue(val, belongTypeData.value);
+      },
+    },
+    {
+      attrs: {
+        label: "销售金额",
+        prop: "amount",
+        width: 100,
+      },
+      render(val) {
+        return proxy.moneyFormat(val, 2);
+      },
+    },
+    {
+      attrs: {
+        label: "订单出货金额",
+        prop: "factoryAmount",
+        width: 120,
+      },
+      render(val) {
+        return proxy.moneyFormat(val, 2);
+      },
+    },
+    {
+      attrs: {
+        label: "出货申请出货金额",
+        prop: "sumOutFactoryMoney",
+        width: 160,
+      },
+      render(val) {
+        return proxy.moneyFormat(val, 2);
+      },
+    },
+    {
+      attrs: {
+        label: "已收定金",
+        prop: "deposit",
+        width: 90,
+      },
+      render(val) {
+        return proxy.moneyFormat(val, 2);
+      },
+    },
+    {
+      attrs: {
+        label: "是否可结算",
+        prop: "isSettlement",
+        width: 100,
+      },
+      render(val) {
+        return val == 1 ? "是" : "否";
+      },
+    },
+    {
+      attrs: {
+        label: "是否已结算",
+        slot: "time",
+        width: 180,
+      },
+    },
+    {
+      attrs: {
+        label: "客户名称",
+        prop: "customerName",
+        "min-width": 150,
+      },
+    },
+    {
+      attrs: {
+        label: "客户简称",
+        prop: "customerShortName",
+        width: 110,
+      },
+    },
+    {
+      attrs: {
+        label: "应收金额",
+        prop: "receivableAmount",
+        width: 90,
+      },
+      render(val) {
+        return proxy.moneyFormat(val, 2);
+      },
+    },
+    {
+      attrs: {
+        label: "收款金额",
+        prop: "sumClaimMoney",
+        width: 90,
+      },
+      render(val) {
+        return proxy.moneyFormat(val, 2);
+      },
+    },
+    {
+      attrs: {
+        label: "未收金额",
+        prop: "outstandingAmount",
+        width: 90,
+      },
+      render(val) {
+        return proxy.moneyFormat(val, 2);
+      },
+    },
+    {
+      attrs: {
+        label: "出货日期",
+        prop: "firstTruckDate",
+        width: 110,
+      },
+    },
+    {
+      attrs: {
+        label: "账龄级别",
+        prop: "accountAge",
+        width: 120,
+      },
+    },
+    // {
+    //   attrs: {
+    //     label: "审批状态",
+    //     prop: "status",
+    //     width: 100,
+    //   },
+    //   render(type) {
+    //     return proxy.dictValueLabel(type, statusData.value);
+    //   },
+    // },
+    // {
+    //   attrs: {
+    //     label: "操作",
+    //     width: "120",
+    //     align: "center",
+    //   },
+    //   renderHTML(row) {
+    //     return row.createUser == proxy.useUserStore().user.userId
+    //       ? [
+    //           row.status == 0
+    //             ? {
+    //                 attrs: {
+    //                   label: "修改",
+    //                   type: "primary",
+    //                   text: true,
+    //                 },
+    //                 el: "button",
+    //                 click() {
+    //                   clickUpdate(row);
+    //                 },
+    //               }
+    //             : {},
+    //           row.status == 0
+    //             ? {
+    //                 attrs: {
+    //                   label: "删除",
+    //                   type: "danger",
+    //                   text: true,
+    //                 },
+    //                 el: "button",
+    //                 click() {
+    //                   proxy
+    //                     .msgConfirm()
+    //                     .then((res) => {
+    //                       proxy
+    //                         .post("/educationSubsidy/delete", {
+    //                           id: row.id,
+    //                         })
+    //                         .then((res) => {
+    //                           proxy.msgTip("操作成功", 1);
+    //                           getList();
+    //                         });
+    //                     })
+    //                     .catch((err) => {});
+    //                 },
+    //               }
+    //             : {},
+    //           row.status == 10 || row.status == 30
+    //             ? {
+    //                 attrs: {
+    //                   label: "作废",
+    //                   type: "danger",
+    //                   text: true,
+    //                 },
+    //                 el: "button",
+    //                 click() {
+    //                   proxy
+    //                     .msgConfirm()
+    //                     .then((res) => {
+    //                       proxy
+    //                         .post("/educationSubsidy/cancellation", {
+    //                           id: row.id,
+    //                         })
+    //                         .then((res) => {
+    //                           proxy.msgTip("操作成功", 1);
+    //                           getList();
+    //                         });
+    //                     })
+    //                     .catch((err) => {});
+    //                 },
+    //               }
+    //             : {},
+    //         ]
+    //       : [];
+    //   },
+    // },
+  ];
+});
+const corporationList = ref([]);
+const getList = async (req) => {
+  sourceList.value.pagination = { ...sourceList.value.pagination, ...req };
+  loading.value = true;
+  proxy
+    .post("/report/orderSummary", sourceList.value.pagination)
+    .then((res) => {
+      sourceList.value.data = res.rows;
+      sourceList.value.pagination.total = res.total;
+      setTimeout(() => {
+        loading.value = false;
+      }, 200);
+    });
+};
+getList();
+const getDeptData = (val) => {
+  proxy
+    .get("/tenantUser/list", {
+      pageNum: 1,
+      pageSize: 10000,
+      tenantId: proxy.useUserStore().user.tenantId,
+      companyId: proxy.useUserStore().user.companyId,
+    })
+    .then((res) => {
+      userList.value = res.rows.map((item) => {
+        return {
+          ...item,
+          label: item.nickName,
+          value: item.userId,
+        };
+      });
+    });
+
+  proxy
+    .get("/tenantDept/list", {
+      pageNum: 1,
+      pageSize: 9999,
+      keyword: "",
+      ancestors: proxy.useUserStore().user.companyId,
+      tenantId: proxy.useUserStore().user.tenantId,
+      // type: 2,
+    })
+    .then((res) => {
+      deptData.value = proxy.handleTree(res.data, "deptId");
+    });
+};
+getDeptData();
+const modalType = ref("add");
+const dialogVisible = ref(false);
+const loadingDialog = ref(false);
+const submit = ref(null);
+const formOption = reactive({
+  inline: true,
+  labelWidth: 100,
+  itemWidth: 100,
+  rules: [],
+});
+const formConfig = computed(() => {
+  return [
+    {
+      type: "title1",
+      title: "基本信息",
+    },
+    {
+      type: "input",
+      prop: "name",
+      label: "印章名称",
+      required: true,
+      itemWidth: 50,
+      itemType: "text",
+    },
+    {
+      type: "select",
+      prop: "sealType",
+      label: "印章类型",
+      data: sealType.value,
+      itemWidth: 50,
+    },
+    {
+      type: "select",
+      prop: "applyUserId",
+      label: "存管人员",
+      required: true,
+      filterable: true,
+      data: userList.value,
+      itemWidth: 50,
+      fn: (val) => {
+        let current = userList.value.find((x) => x.value == val);
+        console.log(current, "ada");
+        if (current) {
+          formData.data.deptId = current.deptId;
+        }
+      },
+    },
+    {
+      type: "treeSelect",
+      prop: "deptId",
+      label: "存管部门",
+      data: deptData.value,
+      propsTreeLabel: "deptName",
+      propsTreeValue: "deptId",
+      itemWidth: 50,
+      disabled: 50,
+    },
+    {
+      type: "input",
+      prop: "accountNumber",
+      label: "印章用途",
+      itemWidth: 100,
+      itemType: "textarea",
+    },
+  ];
+});
+const rules = ref({
+  name: [{ required: true, message: "请输入承包商", trigger: "blur" }],
+  taxPoints: [{ required: true, message: "请输入税点", trigger: "blur" }],
+  accountBank: [{ required: true, message: "请输入开户行", trigger: "blur" }],
+  accountName: [{ required: true, message: "请输入开户名", trigger: "blur" }],
+  accountNumber: [{ required: true, message: "请输入账号", trigger: "blur" }],
+});
+const formData = reactive({
+  data: {
+    accountRemainderList: [{ currency: "", remainder: undefined }],
+  },
+});
+const openModal = (val) => {
+  // modalType.value = val;
+  // formData.data = {
+  //   accountRemainderList: [{ currency: "", remainder: undefined }],
+  // };
+  // loadingDialog.value = false;
+  // dialogVisible.value = true;
+  proxy.$router.replace({
+    path: "/platform_manage/process/processApproval",
+    query: {
+      flowKey: "education_subsidy_flow",
+      flowName: "学历补贴发起流程",
+      random: proxy.random(),
+    },
+  });
+};
+const clickBalance = () => {
+  if (
+    formData.data.accountRemainderList &&
+    formData.data.accountRemainderList.length > 0
+  ) {
+    formData.data.accountRemainderList.push({
+      currency: "",
+      remainder: undefined,
+    });
+  } else {
+    formData.data.accountRemainderList = [
+      { currency: "", remainder: undefined },
+    ];
+  }
+};
+const handleRemove = (index) => {
+  formData.data.accountRemainderList.splice(index, 1);
+};
+const isRepeat = (arr) => {
+  var hash = {};
+  for (var i in arr) {
+    if (hash[arr[i].currency]) return true;
+    hash[arr[i].currency] = true;
+  }
+  return false;
+};
+const submitForm = () => {
+  submit.value.handleSubmit(() => {
+    loadingDialog.value = true;
+    proxy.post("/contractor/" + modalType.value, formData.data).then(
+      () => {
+        proxy.msgTip("操作成功", 1);
+        dialogVisible.value = false;
+        getList();
+      },
+      (err) => {
+        console.log(err);
+        loadingDialog.value = false;
+      }
+    );
+    // if (
+    //   formData.data.accountRemainderList &&
+    //   formData.data.accountRemainderList.length > 0
+    // ) {
+    //   if (isRepeat(formData.data.accountRemainderList)) {
+    //     return ElMessage("请勿重复添加货币余额");
+    //   } else {
+    //     loadingDialog.value = true;
+    //     proxy.post("/accountManagement/" + modalType.value, formData.data).then(
+    //       () => {
+    //         ElMessage({
+    //           message: modalType.value == "add" ? "添加成功" : "编辑成功",
+    //           type: "success",
+    //         });
+    //         dialogVisible.value = false;
+    //         getList();
+    //       },
+    //       (err) => {
+    //         console.log(err);
+    //         loadingDialog.value = false;
+    //       }
+    //     );
+    //   }
+    // } else {
+    //   return ElMessage("请添加至少一条类型余额");
+    // }
+  });
+};
+
+const update = (row) => {
+  loadingDialog.value = false;
+  modalType.value = "edit";
+  formData.data = proxy.deepClone(row);
+  dialogVisible.value = true;
+};
+
+const clickUpdate = (row) => {
+  proxy.$router.push({
+    path: "/platform_manage/process/processApproval",
+    query: {
+      flowKey: "education_subsidy_flow",
+      flowName: "学历补贴发起流程",
+      random: proxy.random(),
+      businessId: row.id,
+    },
+  });
+};
+
+const getDtl = (row) => {
+  proxy.$router.push({
+    path: "/platform_manage/process/processApproval",
+    query: {
+      flowKey: "education_subsidy_flow",
+      flowName: "学历补贴流程查看",
+      random: proxy.random(),
+      businessId: row.id,
+      processType: 20,
+    },
+  });
+};
+
+const changeDate = (settleStartDate, settleEndDate, id) => {
+  if (settleStartDate && settleEndDate) {
+    proxy
+      .post("/contract/editSettleDateRange", {
+        id,
+        settleStartDate,
+        settleEndDate,
+      })
+      .then((res) => {});
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.tenant {
+  padding: 20px;
+}
+::v-deep(.el-input-number .el-input__inner) {
+  text-align: left;
+}
+</style>

src/views/systemTenant/tenant/userTenant/index.vue

@@ -34,6 +34,12 @@
           </div>
         </template>
 
+        <template #status="{item}">
+          <div style="width:100%">
+            <span :style="{color:item.status==1?'red':''}">{{item.status==1?'停用':'启用'}}</span>
+          </div>
+        </template>
+
       </byTable>
     </div>
 
@@ -208,6 +214,17 @@ const config = computed(() => {
     },
     {
       attrs: {
+        label: "账号状态",
+        prop: "status",
+        slot: "status",
+        width: 100,
+      },
+      render(status) {
+        return status == 1 ? "停用" : "启用";
+      },
+    },
+    {
+      attrs: {
         label: "手机号",
         prop: "phonenumber",
         width: 180,
@@ -396,6 +413,22 @@ const formConfig = computed(() => {
     },
     {
       type: "select",
+      label: "账号状态",
+      prop: "status",
+      multiple: false,
+      data: [
+        {
+          label: "启用",
+          value: "0",
+        },
+        {
+          label: "停用",
+          value: "1",
+        },
+      ],
+    },
+    {
+      type: "select",
       label: "身份",
       prop: "identity",
       multiple: false,
@@ -409,7 +442,7 @@ const formConfig = computed(() => {
           value: 20,
         },
       ],
-      itemWidth: 50,
+      itemWidth: 100,
     },
 
     {
@@ -479,6 +512,7 @@ const rules = ref({
     { required: true, message: "请选择关联公司", trigger: "change" },
   ],
   identity: [{ required: true, message: "请选择", trigger: "change" }],
+  status: [{ required: true, message: "请选择账号状态", trigger: "change" }],
 });
 
 const changeRoleId = (val) => {