部分新需求

src/components/process/SF/CostControl.vue

@@ -123,7 +123,8 @@
                 <el-form-item :prop="'costControlDetailList.' + $index + '.accountPeriodAmountTax'" :rules="rules.accountPeriodAmountTax"
                               :inline-message="true" class="margin-b-0">
                   <el-input-number onmousewheel="return false;" v-model="row.accountPeriodAmountTax" placeholder="请输入" style="width: 100%"
-                                   :precision="2" :controls="false" :min="0" disabled />
+                                   :precision="2" :controls="false" :min="0"
+                                   @change="(val)=>handleChangeMoney(val,$index,'accountPeriodAmountTax')" />
                 </el-form-item>
               </template>
             </el-table-column>
@@ -132,7 +133,7 @@
                 <el-form-item :prop="'costControlDetailList.' + $index + '.accountPeriodAmount'" :rules="rules.accountPeriodAmount"
                               :inline-message="true" class="margin-b-0">
                   <el-input-number onmousewheel="return false;" v-model="row.accountPeriodAmount" placeholder="请输入" style="width: 100%" :precision="2"
-                                   :controls="false" :min="0" disabled />
+                                   :controls="false" :min="0" @change="(val)=>handleChangeMoney(val,$index,'accountPeriodAmount')" />
                 </el-form-item>
               </template>
             </el-table-column>
@@ -150,7 +151,7 @@
                 <el-form-item :prop="'costControlDetailList.' + $index + '.deductionPrepaidTax'" :rules="rules.deductionPrepaidTax"
                               :inline-message="true" class="margin-b-0">
                   <el-input-number onmousewheel="return false;" v-model="row.deductionPrepaidTax" placeholder="请输入" style="width: 100%" :precision="2"
-                                   :controls="false" :min="0" />
+                                   :controls="false" :min="0" @change="(val)=>handleChangeMoney(val,$index,'deductionPrepaidTax')" />
                 </el-form-item>
               </template>
             </el-table-column>
@@ -159,7 +160,7 @@
                 <el-form-item :prop="'costControlDetailList.' + $index + '.deductionPrepaid'" :rules="rules.deductionPrepaid" :inline-message="true"
                               class="margin-b-0">
                   <el-input-number onmousewheel="return false;" v-model="row.deductionPrepaid" placeholder="请输入" style="width: 100%" :precision="2"
-                                   :controls="false" :min="0" />
+                                   :controls="false" :min="0" @change="(val)=>handleChangeMoney(val,$index,'deductionPrepaid')" />
                 </el-form-item>
               </template>
             </el-table-column>
@@ -299,7 +300,7 @@
                 <el-form-item :prop="'costControlDetailList.' + $index + '.currentPayable'" :rules="rules.currentPayable" :inline-message="true"
                               class="margin-b-0">
                   <el-input-number onmousewheel="return false;" v-model="row.currentPayable" placeholder="请输入" style="width: 100%" :precision="2"
-                                   :controls="false" :min="0" @change="handleGetRemark($index)" />
+                                   :controls="false" :min="0" @change="handleGetRemark($index)" :disabled="getCurrentPayableDisabled" />
                 </el-form-item>
               </template>
             </el-table-column>
@@ -472,7 +473,7 @@ const formConfig = computed(() => {
       prop: "costType",
       itemWidth: 25,
       data: paymentTypeData.value,
-      // clearable: true,
+      disabled: isDisabled.value,
       fn: (val) => {
         changeCostType(val);
       },
@@ -500,7 +501,6 @@ const formConfig = computed(() => {
       itemType: "date",
       prop: "applyTime",
       label: "申请日期",
-      disabled: false,
       itemWidth: 25,
       isShow: isShowAtt("applyTime", "mainObj"),
       disabled: true,
@@ -519,6 +519,7 @@ const formConfig = computed(() => {
       label: "快递公司",
       prop: "logisticsCompanyId",
       itemWidth: 25,
+      disabled: isDisabled.value,
       data: logisticsCompanyData.value,
       isShow: isShowAtt("logisticsCompanyId", "mainObj"),
     },
@@ -527,7 +528,7 @@ const formConfig = computed(() => {
       prop: "invoiceTaxPoint",
       label: "开票税点",
       itemType: "text",
-      disabled: false,
+      disabled: isDisabled.value,
       itemWidth: 25,
       isShow: isShowAtt("invoiceTaxPoint", "mainObj"),
     },
@@ -538,6 +539,7 @@ const formConfig = computed(() => {
       prop: "isVoucher",
       itemWidth: 25,
       data: isAfterSubmit.value,
+      disabled: isDisabled.value,
       isShow: isShowAtt("isVoucher", "mainObj"),
     },
     {
@@ -568,6 +570,7 @@ const formConfig = computed(() => {
       //   getDeptData(val);
       // },
       multiple: true,
+      disabled: true,
       isShow:
         isShowAtt("companyId", "mainObj") &&
         currentCostTypeData.value.name == "采购货款",
@@ -595,7 +598,7 @@ const formConfig = computed(() => {
       fn: (val) => {
         changApplyUserId(val);
       },
-      // disabled: true,
+      disabled: isDisabled.value,
       isShow: isShowAtt("applyUserId", "mainObj"),
     },
     {
@@ -622,6 +625,7 @@ const formConfig = computed(() => {
       prop: "isPublicTransfer",
       itemWidth: 25,
       data: isAfterSubmit.value,
+      disabled: isDisabled.value,
       fn: (val) => {
         formData.data.paymentAccountId = "";
         formData.data.paymentAccountName = "";
@@ -642,18 +646,7 @@ const formConfig = computed(() => {
               };
             });
           });
-
-        if (
-          currentCostTypeData.value &&
-          currentCostTypeData.value.name.indexOf("快递") != -1
-        ) {
-          for (let i = 0; i < formData.data.costControlDetailList.length; i++) {
-            const row = formData.data.costControlDetailList[i];
-            row.currentPayable =
-              val == "1" ? row.currentPrepaidTax : row.currentPrepaid;
-            handleGetRemark(i);
-          }
-        }
+        changeIsPublicTransfer(val);
       },
       isShow: isShowAtt("isPublicTransfer", "mainObj"),
     },
@@ -663,6 +656,7 @@ const formConfig = computed(() => {
       prop: "paymentMethod",
       itemWidth: 25,
       data: paymentMethod.value,
+      disabled: isDisabled.value,
       isShow: isShowAtt("paymentMethod", "mainObj"),
       fn: (val) => {
         if (
@@ -694,6 +688,7 @@ const formConfig = computed(() => {
       fn: (val) => {
         changeShroffAccount(val);
       },
+      disabled: isDisabled.value,
       isShow: isShowAtt("paymentAccountId", "mainObj"),
     },
     {
@@ -702,6 +697,7 @@ const formConfig = computed(() => {
       label: "开户行",
       placeholder: "请输入开户行",
       itemWidth: 25,
+      disabled: isDisabled.value,
       isShow: isShowAtt("paymentAccountId", "mainObj"),
     },
     {
@@ -710,6 +706,7 @@ const formConfig = computed(() => {
       label: "开户名",
       placeholder: "请输入开户名",
       itemWidth: 25,
+      disabled: isDisabled.value,
       isShow: isShowAtt("paymentAccountId", "mainObj"),
     },
     {
@@ -718,6 +715,7 @@ const formConfig = computed(() => {
       label: "账号",
       placeholder: "请输入账号",
       itemWidth: 25,
+      disabled: isDisabled.value,
       isShow: isShowAtt("paymentAccountId", "mainObj"),
     },
     {
@@ -732,7 +730,7 @@ const formConfig = computed(() => {
       label: "开户行",
       placeholder: "请输入开户行",
       itemWidth: 25,
-      // isShow:  isShowAtt("accountBank", "mainObj"),
+      disabled: isDisabled.value,
       isShow: getIsShowData("accountBank"),
     },
     {
@@ -741,6 +739,7 @@ const formConfig = computed(() => {
       label: "开户名",
       placeholder: "请输入开户名",
       itemWidth: 25,
+      disabled: isDisabled.value,
       // isShow: isShowAtt("accountName", "mainObj"),
       isShow: getIsShowData("accountName"),
     },
@@ -750,6 +749,7 @@ const formConfig = computed(() => {
       label: "账号",
       placeholder: "请输入账号",
       itemWidth: 25,
+      disabled: isDisabled.value,
       // isShow: isShowAtt("accountNumber", "mainObj"),
       isShow: getIsShowData("accountNumber"),
     },
@@ -960,9 +960,18 @@ const getDeptData = (val) => {
     });
 };
 
+const getCurrentPayableDisabled = ref(false);
 const changeCostType = (val) => {
   currentCostTypeData.value = paymentTypeData.value.find((x) => x.value == val);
   formData.data.tradeType = currentCostTypeData.value.tradeType;
+  if (
+    currentCostTypeData.value.name.indexOf("备用金申请") != -1 ||
+    currentCostTypeData.value.name.indexOf("借款") != -1
+  ) {
+    getCurrentPayableDisabled.value = false;
+  } else {
+    getCurrentPayableDisabled.value = true;
+  }
   if (formData.data && formData.data.applyUserId) {
     changApplyUserId(formData.data.applyUserId);
   }
@@ -995,14 +1004,180 @@ const changeCostType = (val) => {
   }
 };
 
+const changeIsPublicTransfer = (val) => {
+  if (
+    currentCostTypeData.value &&
+    currentCostTypeData.value.name.indexOf("快递费充值") != -1
+  ) {
+    for (let i = 0; i < formData.data.costControlDetailList.length; i++) {
+      const row = formData.data.costControlDetailList[i];
+      row.currentPayable =
+        val == "1" ? row.currentPrepaidTax : row.currentPrepaid;
+      handleGetRemark(i);
+    }
+  } else if (
+    currentCostTypeData.value &&
+    currentCostTypeData.value.name.indexOf("快递费付款") != -1
+  ) {
+    for (let i = 0; i < formData.data.costControlDetailList.length; i++) {
+      const row = formData.data.costControlDetailList[i];
+      row.currentPayable =
+        val == "1"
+          ? Number(
+              parseFloat(
+                row.accountPeriodAmountTax - row.deductionPrepaidTax
+              ).toFixed(2)
+            )
+          : Number(
+              parseFloat(
+                row.accountPeriodAmount - row.deductionPrepaid
+              ).toFixed(2)
+            );
+      handleGetRemark(i);
+    }
+  } else if (
+    currentCostTypeData.value &&
+    currentCostTypeData.value.name.indexOf("采购货款") != -1
+  ) {
+    for (let i = 0; i < formData.data.costControlDetailList.length; i++) {
+      const row = formData.data.costControlDetailList[i];
+      if (formData.data.isAdvance == "1") {
+        row.currentPayable =
+          val == "1"
+            ? Number(
+                parseFloat(
+                  row.balancePrepaidTax - row.currentPrepaidTax
+                ).toFixed(2)
+              )
+            : Number(
+                parseFloat(row.balancePrepaid - row.currentPrepaid).toFixed(2)
+              );
+      } else {
+        row.currentPayable =
+          val == "1"
+            ? Number(
+                parseFloat(
+                  row.accountPeriodAmountTax - row.deductionPrepaidTax
+                ).toFixed(2)
+              )
+            : Number(
+                parseFloat(
+                  row.accountPeriodAmountTax - row.deductionPrepaid
+                ).toFixed(2)
+              );
+      }
+      handleGetRemark(i);
+    }
+  } else if (
+    currentCostTypeData.value &&
+    currentCostTypeData.value.name.indexOf("其他费用") != -1
+  ) {
+    for (let i = 0; i < formData.data.costControlDetailList.length; i++) {
+      const row = formData.data.costControlDetailList[i];
+      if (formData.data.isAdvance == "1") {
+        row.currentPayable =
+          val == "1"
+            ? Number(
+                parseFloat(
+                  row.balancePrepaidTax - row.currentPrepaidTax
+                ).toFixed(2)
+              )
+            : Number(
+                parseFloat(row.balancePrepaid - row.currentPrepaid).toFixed(2)
+              );
+      } else {
+        row.currentPayable =
+          val == "1"
+            ? Number(
+                parseFloat(
+                  row.balancePrepaidTax - row.deductionPrepaidTax
+                ).toFixed(2)
+              )
+            : Number(
+                parseFloat(row.balancePrepaid - row.deductionPrepaid).toFixed(2)
+              );
+      }
+      handleGetRemark(i);
+    }
+  }
+};
+
 const handleChangeMoney = (val, index, att) => {
   let row = formData.data.costControlDetailList[index];
   if (formData.data.isPublicTransfer) {
-    if (formData.data.isPublicTransfer == "1") {
-      row.currentPayable = row.currentPrepaidTax;
-    } else if (formData.data.isPublicTransfer == "0") {
-      row.currentPayable = row.currentPrepaid;
+    // 快递费充值 应付取对应的含税和不含税
+    if (currentCostTypeData.value.name.indexOf("快递费充值") != -1) {
+      row.currentPayable =
+        formData.data.isPublicTransfer == "1"
+          ? row.currentPrepaidTax
+          : row.currentPrepaid;
+    } else if (currentCostTypeData.value.name.indexOf("快递费付款") != -1) {
+      row.currentPayable =
+        formData.data.isPublicTransfer == "1"
+          ? Number(
+              parseFloat(
+                row.accountPeriodAmountTax - row.deductionPrepaidTax
+              ).toFixed(2)
+            )
+          : Number(
+              parseFloat(
+                row.accountPeriodAmount - row.deductionPrepaid
+              ).toFixed(2)
+            );
+    } else if (currentCostTypeData.value.name.indexOf("采购货款") != -1) {
+      // 是否预付
+      if (formData.data.isAdvance == "1") {
+        row.currentPayable =
+          formData.data.isPublicTransfer == "1"
+            ? Number(
+                parseFloat(
+                  row.balancePrepaidTax - row.currentPrepaidTax
+                ).toFixed(2)
+              )
+            : Number(
+                parseFloat(row.balancePrepaid - row.currentPrepaid).toFixed(2)
+              );
+      } else {
+        row.currentPayable =
+          formData.data.isPublicTransfer == "1"
+            ? Number(
+                parseFloat(
+                  row.accountPeriodAmountTax - row.deductionPrepaidTax
+                ).toFixed(2)
+              )
+            : Number(
+                parseFloat(
+                  row.accountPeriodAmountTax - row.deductionPrepaid
+                ).toFixed(2)
+              );
+      }
+    } else if (currentCostTypeData.value.name.indexOf("其他费用") != -1) {
+      // 是否预付
+      if (formData.data.isAdvance == "1") {
+        row.currentPayable =
+          formData.data.isPublicTransfer == "1"
+            ? Number(
+                parseFloat(
+                  row.balancePrepaidTax - row.currentPrepaidTax
+                ).toFixed(2)
+              )
+            : Number(
+                parseFloat(row.balancePrepaid - row.currentPrepaid).toFixed(2)
+              );
+      } else {
+        row.currentPayable =
+          formData.data.isPublicTransfer == "1"
+            ? Number(
+                parseFloat(
+                  row.balancePrepaidTax - row.deductionPrepaidTax
+                ).toFixed(2)
+              )
+            : Number(
+                parseFloat(row.balancePrepaid - row.deductionPrepaid).toFixed(2)
+              );
+      }
     }
+
     handleGetRemark(index);
   }
 };
@@ -1259,6 +1434,7 @@ const clickAdd = () => {
       taxation: null,
       fileList: [],
       invoiceFileList: [],
+      labelName: "",
     });
   } else {
     formData.data.costControlDetailList = [
@@ -1292,6 +1468,7 @@ const clickAdd = () => {
         taxation: null,
         fileList: [],
         invoiceFileList: [],
+        labelName: "",
       },
     ];
   }
@@ -1462,10 +1639,12 @@ const getAllData = (businessId) => {
   });
 };
 
+const isDisabled = ref(false);
 onMounted(() => {
   formData.data.companyIdSet.push(proxy.useUserStore().user.companyId);
   getDeptData(formData.data.companyId);
-  formOption.disabled = judgeStatus();
+  isDisabled.value = judgeStatus();
+  // formOption.disabled = judgeStatus();
   if (route.query && route.query.businessId && route.query.processType) {
     let businessId = route.query.businessId;
     getAllData(businessId);

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

@@ -133,8 +133,8 @@
               </el-table-column>
               <!-- <el-table-column label="采购数量" prop="purchaseQuantity" width="100" /> -->
               <el-table-column label="到货数量" prop="quantity" width="100" />
-              <el-table-column label="实际入库数量" prop="quantity" width="110" />
-              <el-table-column label="入库状态" prop="quantity" width="100" />
+              <el-table-column label="实际入库数量" prop="receiptQuantity " width="110" />
+              <el-table-column label="入库状态" prop="receiptStatus" width="100" :formatter="(row)=>dictValueLabel(row.receiptStatus,inBoundStatus)" />
               <el-table-column label="账期" width="150">
                 <template #default="{ row, $index }">
                   <div style="width: 100%">
@@ -147,7 +147,6 @@
                   </div>
                 </template>
               </el-table-column>
-
             </el-table>
           </div>
         </el-tab-pane>
@@ -210,6 +209,20 @@ const status = ref([
     value: 99,
   },
 ]);
+const inBoundStatus = ref([
+  {
+    label: "待入库",
+    value: 0,
+  },
+  {
+    label: "部分入库",
+    value: 1,
+  },
+  {
+    label: "入库完成",
+    value: 2,
+  },
+]);
 const payStatus = ref([
   {
     label: "未付款",

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

@@ -334,7 +334,7 @@ const config = computed(() => {
                 .msgConfirm()
                 .then((res) => {
                   proxy
-                    .post("/contract/delete", {
+                    .post("/stockWait/endStorage", {
                       id: row.id,
                     })
                     .then((res) => {

src/views/systemTenant/otherManage/artCopyright/index.vue

@@ -4,7 +4,7 @@
       <byTable :source="sourceList.data" :pagination="sourceList.pagination" :config="config" :loading="loading" highlight-current-row
                :selectConfig="selectConfig" :action-list="[
               {
-                text: '添加',
+                text: '添加版权',
                 action: () => openModal('add'),
                 disabled: false,
               },
@@ -18,7 +18,7 @@
 
       </byTable>
     </div>
-    <el-dialog :title="modalType == 'add' ? '添加' : '编辑'" v-model="dialogVisible" width="500px" destroy-on-close>
+    <el-dialog :title="modalType == 'add' ? '添加版权' : '编辑版权'" v-model="dialogVisible" width="500px" destroy-on-close>
       <byForm :formConfig="formConfig" :formOption="formOption" v-model="formData.data" :rules="rules" ref="formDom" v-loading="submitLoading">
       </byForm>
       <template #footer>
@@ -60,34 +60,34 @@ const config = computed(() => {
     },
     {
       attrs: {
-        label: "编号",
+        label: "版权编号",
         prop: "code",
       },
     },
     {
       attrs: {
-        label: "名称",
+        label: "版权名称",
         prop: "name",
       },
     },
-    {
-      attrs: {
-        label: "开户行",
-        prop: "accountBank",
-      },
-    },
-    {
-      attrs: {
-        label: "开户名",
-        prop: "accountName",
-      },
-    },
-    {
-      attrs: {
-        label: "账号",
-        prop: "accountNumber",
-      },
-    },
+    // {
+    //   attrs: {
+    //     label: "开户行",
+    //     prop: "accountBank",
+    //   },
+    // },
+    // {
+    //   attrs: {
+    //     label: "开户名",
+    //     prop: "accountName",
+    //   },
+    // },
+    // {
+    //   attrs: {
+    //     label: "账号",
+    //     prop: "accountNumber",
+    //   },
+    // },
     {
       attrs: {
         label: "操作",
@@ -120,7 +120,7 @@ const config = computed(() => {
                 .msgConfirm()
                 .then((res) => {
                   proxy
-                    .post("/shopInfo/delete", {
+                    .post("/artCopyright/delete", {
                       id: row.id,
                     })
                     .then((res) => {
@@ -149,7 +149,7 @@ const formConfig = computed(() => {
   return [
     {
       type: "treeSelect",
-      prop: "deptId",
+      prop: "companyId",
       label: "业务公司",
       data: treeData.value,
       propsTreeLabel: "deptName",
@@ -160,44 +160,44 @@ const formConfig = computed(() => {
     {
       type: "input",
       prop: "name",
-      label: "名称",
+      label: "版权名称",
       itemWidth: 100,
       disabled: false,
     },
     {
       type: "input",
       prop: "code",
-      label: "版权号",
+      label: "版权编号",
       itemWidth: 100,
       disabled: false,
     },
-    {
-      type: "input",
-      prop: "accountBank",
-      label: "开户行",
-      placeholder: "请输入开户行",
-      itemWidth: 100,
-    },
-    {
-      type: "input",
-      prop: "accountName",
-      label: "开户名",
-      placeholder: "请输入开户名",
-      itemWidth: 100,
-    },
-    {
-      type: "input",
-      prop: "accountNumber",
-      label: "账号",
-      placeholder: "请输入账号",
-      itemWidth: 100,
-    },
+    // {
+    //   type: "input",
+    //   prop: "accountBank",
+    //   label: "开户行",
+    //   placeholder: "请输入开户行",
+    //   itemWidth: 100,
+    // },
+    // {
+    //   type: "input",
+    //   prop: "accountName",
+    //   label: "开户名",
+    //   placeholder: "请输入开户名",
+    //   itemWidth: 100,
+    // },
+    // {
+    //   type: "input",
+    //   prop: "accountNumber",
+    //   label: "账号",
+    //   placeholder: "请输入账号",
+    //   itemWidth: 100,
+    // },
   ];
 });
 const rules = ref({
-  deptId: [{ required: true, message: "请选择业务公司", trigger: "change" }],
-  name: [{ required: true, message: "请输入名称", trigger: "blur" }],
-  code: [{ required: true, message: "请输入编号", trigger: "blur" }],
+  companyId: [{ required: true, message: "请选择业务公司", trigger: "change" }],
+  name: [{ required: true, message: "请输入版权名称", trigger: "blur" }],
+  code: [{ required: true, message: "请输入版权编号", trigger: "blur" }],
 });
 
 const getDeptData = () => {
@@ -207,6 +207,7 @@ const getDeptData = () => {
       pageSize: 9999,
       keyword: "",
       tenantId: proxy.useUserStore().user.tenantId,
+      type: 0,
     })
     .then((res) => {
       treeData.value = proxy.handleTree(res.data, "deptId");
@@ -217,7 +218,7 @@ getDeptData();
 const getList = async (req) => {
   sourceList.value.pagination = { ...sourceList.value.pagination, ...req };
   loading.value = true;
-  proxy.post("/shopInfo/page", sourceList.value.pagination).then((res) => {
+  proxy.post("/artCopyright/page", sourceList.value.pagination).then((res) => {
     sourceList.value.data = res.rows;
     sourceList.value.pagination.total = res.total;
     setTimeout(() => {
@@ -238,7 +239,7 @@ const openModal = () => {
 const submitForm = () => {
   formDom.value.handleSubmit((valid) => {
     submitLoading.value = true;
-    proxy.post("/shopInfo/" + modalType.value, formData.data).then(
+    proxy.post("/artCopyright/" + modalType.value, formData.data).then(
       (res) => {
         proxy.msgTip("操作成功", 1);
         dialogVisible.value = false;
@@ -254,7 +255,7 @@ const submitForm = () => {
 
 const getDtl = (row) => {
   modalType.value = "edit";
-  proxy.post("/shopInfo/detail", { id: row.id }).then((res) => {
+  proxy.post("/artCopyright/detail", { id: row.id }).then((res) => {
     formData.data = res;
     dialogVisible.value = true;
   });

src/views/systemTenant/otherManage/contractor/index.vue

@@ -115,7 +115,7 @@ const config = computed(() => {
                 .msgConfirm()
                 .then((res) => {
                   proxy
-                    .post("/logisticsCompanyInfo/delete", {
+                    .post("/contractor/delete", {
                       id: row.id,
                     })
                     .then((res) => {
@@ -132,19 +132,16 @@ const config = computed(() => {
   ];
 });
 const corporationList = ref([]);
-
 const getList = async (req) => {
   sourceList.value.pagination = { ...sourceList.value.pagination, ...req };
   loading.value = true;
-  proxy
-    .post("/logisticsCompanyInfo/page", sourceList.value.pagination)
-    .then((res) => {
-      sourceList.value.data = res.rows;
-      sourceList.value.pagination.total = res.total;
-      setTimeout(() => {
-        loading.value = false;
-      }, 200);
-    });
+  proxy.post("/contractor/page", sourceList.value.pagination).then((res) => {
+    sourceList.value.data = res.rows;
+    sourceList.value.pagination.total = res.total;
+    setTimeout(() => {
+      loading.value = false;
+    }, 200);
+  });
 };
 getList();
 const modalType = ref("add");
@@ -253,7 +250,7 @@ const isRepeat = (arr) => {
 const submitForm = () => {
   submit.value.handleSubmit(() => {
     loadingDialog.value = true;
-    proxy.post("/logisticsCompanyInfo/" + modalType.value, formData.data).then(
+    proxy.post("/contractor/" + modalType.value, formData.data).then(
       () => {
         proxy.msgTip("操作成功", 1);
         dialogVisible.value = false;

src/views/systemTenant/otherManage/patentManage/index.vue

@@ -70,24 +70,24 @@ const config = computed(() => {
         prop: "name",
       },
     },
-    {
-      attrs: {
-        label: "开户行",
-        prop: "accountBank",
-      },
-    },
-    {
-      attrs: {
-        label: "开户名",
-        prop: "accountName",
-      },
-    },
-    {
-      attrs: {
-        label: "账号",
-        prop: "accountNumber",
-      },
-    },
+    // {
+    //   attrs: {
+    //     label: "开户行",
+    //     prop: "accountBank",
+    //   },
+    // },
+    // {
+    //   attrs: {
+    //     label: "开户名",
+    //     prop: "accountName",
+    //   },
+    // },
+    // {
+    //   attrs: {
+    //     label: "账号",
+    //     prop: "accountNumber",
+    //   },
+    // },
     {
       attrs: {
         label: "操作",
@@ -120,7 +120,7 @@ const config = computed(() => {
                 .msgConfirm()
                 .then((res) => {
                   proxy
-                    .post("/shopInfo/delete", {
+                    .post("/patent/delete", {
                       id: row.id,
                     })
                     .then((res) => {
@@ -149,7 +149,7 @@ const formConfig = computed(() => {
   return [
     {
       type: "treeSelect",
-      prop: "deptId",
+      prop: "companyId",
       label: "业务公司",
       data: treeData.value,
       propsTreeLabel: "deptName",
@@ -171,31 +171,31 @@ const formConfig = computed(() => {
       itemWidth: 100,
       disabled: false,
     },
-    {
-      type: "input",
-      prop: "accountBank",
-      label: "开户行",
-      placeholder: "请输入开户行",
-      itemWidth: 100,
-    },
-    {
-      type: "input",
-      prop: "accountName",
-      label: "开户名",
-      placeholder: "请输入开户名",
-      itemWidth: 100,
-    },
-    {
-      type: "input",
-      prop: "accountNumber",
-      label: "账号",
-      placeholder: "请输入账号",
-      itemWidth: 100,
-    },
+    // {
+    //   type: "input",
+    //   prop: "accountBank",
+    //   label: "开户行",
+    //   placeholder: "请输入开户行",
+    //   itemWidth: 100,
+    // },
+    // {
+    //   type: "input",
+    //   prop: "accountName",
+    //   label: "开户名",
+    //   placeholder: "请输入开户名",
+    //   itemWidth: 100,
+    // },
+    // {
+    //   type: "input",
+    //   prop: "accountNumber",
+    //   label: "账号",
+    //   placeholder: "请输入账号",
+    //   itemWidth: 100,
+    // },
   ];
 });
 const rules = ref({
-  deptId: [{ required: true, message: "请选择业务公司", trigger: "change" }],
+  companyId: [{ required: true, message: "请选择业务公司", trigger: "change" }],
   name: [{ required: true, message: "请输入专利名称", trigger: "blur" }],
   code: [{ required: true, message: "请输入专利编号", trigger: "blur" }],
 });
@@ -207,6 +207,7 @@ const getDeptData = () => {
       pageSize: 9999,
       keyword: "",
       tenantId: proxy.useUserStore().user.tenantId,
+      type: 0,
     })
     .then((res) => {
       treeData.value = proxy.handleTree(res.data, "deptId");
@@ -217,7 +218,7 @@ getDeptData();
 const getList = async (req) => {
   sourceList.value.pagination = { ...sourceList.value.pagination, ...req };
   loading.value = true;
-  proxy.post("/shopInfo/page", sourceList.value.pagination).then((res) => {
+  proxy.post("/patent/page", sourceList.value.pagination).then((res) => {
     sourceList.value.data = res.rows;
     sourceList.value.pagination.total = res.total;
     setTimeout(() => {
@@ -238,7 +239,7 @@ const openModal = () => {
 const submitForm = () => {
   formDom.value.handleSubmit((valid) => {
     submitLoading.value = true;
-    proxy.post("/shopInfo/" + modalType.value, formData.data).then(
+    proxy.post("/patent/" + modalType.value, formData.data).then(
       (res) => {
         proxy.msgTip("操作成功", 1);
         dialogVisible.value = false;
@@ -254,7 +255,7 @@ const submitForm = () => {
 
 const getDtl = (row) => {
   modalType.value = "edit";
-  proxy.post("/shopInfo/detail", { id: row.id }).then((res) => {
+  proxy.post("/patent/detail", { id: row.id }).then((res) => {
     formData.data = res;
     dialogVisible.value = true;
   });

src/views/systemTenant/otherManage/trademarkManage/index.vue

@@ -70,24 +70,24 @@ const config = computed(() => {
         prop: "name",
       },
     },
-    {
-      attrs: {
-        label: "开户行",
-        prop: "accountBank",
-      },
-    },
-    {
-      attrs: {
-        label: "开户名",
-        prop: "accountName",
-      },
-    },
-    {
-      attrs: {
-        label: "账号",
-        prop: "accountNumber",
-      },
-    },
+    // {
+    //   attrs: {
+    //     label: "开户行",
+    //     prop: "accountBank",
+    //   },
+    // },
+    // {
+    //   attrs: {
+    //     label: "开户名",
+    //     prop: "accountName",
+    //   },
+    // },
+    // {
+    //   attrs: {
+    //     label: "账号",
+    //     prop: "accountNumber",
+    //   },
+    // },
     {
       attrs: {
         label: "操作",
@@ -120,7 +120,7 @@ const config = computed(() => {
                 .msgConfirm()
                 .then((res) => {
                   proxy
-                    .post("/shopInfo/delete", {
+                    .post("/trademark/delete", {
                       id: row.id,
                     })
                     .then((res) => {
@@ -149,7 +149,7 @@ const formConfig = computed(() => {
   return [
     {
       type: "treeSelect",
-      prop: "deptId",
+      prop: "companyId",
       label: "业务公司",
       data: treeData.value,
       propsTreeLabel: "deptName",
@@ -171,31 +171,31 @@ const formConfig = computed(() => {
       itemWidth: 100,
       disabled: false,
     },
-    {
-      type: "input",
-      prop: "accountBank",
-      label: "开户行",
-      placeholder: "请输入开户行",
-      itemWidth: 100,
-    },
-    {
-      type: "input",
-      prop: "accountName",
-      label: "开户名",
-      placeholder: "请输入开户名",
-      itemWidth: 100,
-    },
-    {
-      type: "input",
-      prop: "accountNumber",
-      label: "账号",
-      placeholder: "请输入账号",
-      itemWidth: 100,
-    },
+    // {
+    //   type: "input",
+    //   prop: "accountBank",
+    //   label: "开户行",
+    //   placeholder: "请输入开户行",
+    //   itemWidth: 100,
+    // },
+    // {
+    //   type: "input",
+    //   prop: "accountName",
+    //   label: "开户名",
+    //   placeholder: "请输入开户名",
+    //   itemWidth: 100,
+    // },
+    // {
+    //   type: "input",
+    //   prop: "accountNumber",
+    //   label: "账号",
+    //   placeholder: "请输入账号",
+    //   itemWidth: 100,
+    // },
   ];
 });
 const rules = ref({
-  deptId: [{ required: true, message: "请选择业务公司", trigger: "change" }],
+  companyId: [{ required: true, message: "请选择业务公司", trigger: "change" }],
   name: [{ required: true, message: "请输入商标名称", trigger: "blur" }],
   code: [{ required: true, message: "请输入商标编号", trigger: "blur" }],
 });
@@ -207,6 +207,7 @@ const getDeptData = () => {
       pageSize: 9999,
       keyword: "",
       tenantId: proxy.useUserStore().user.tenantId,
+      type: 0,
     })
     .then((res) => {
       treeData.value = proxy.handleTree(res.data, "deptId");
@@ -217,7 +218,7 @@ getDeptData();
 const getList = async (req) => {
   sourceList.value.pagination = { ...sourceList.value.pagination, ...req };
   loading.value = true;
-  proxy.post("/shopInfo/page", sourceList.value.pagination).then((res) => {
+  proxy.post("/trademark/page", sourceList.value.pagination).then((res) => {
     sourceList.value.data = res.rows;
     sourceList.value.pagination.total = res.total;
     setTimeout(() => {
@@ -238,7 +239,7 @@ const openModal = () => {
 const submitForm = () => {
   formDom.value.handleSubmit((valid) => {
     submitLoading.value = true;
-    proxy.post("/shopInfo/" + modalType.value, formData.data).then(
+    proxy.post("/trademark/" + modalType.value, formData.data).then(
       (res) => {
         proxy.msgTip("操作成功", 1);
         dialogVisible.value = false;
@@ -254,7 +255,7 @@ const submitForm = () => {
 
 const getDtl = (row) => {
   modalType.value = "edit";
-  proxy.post("/shopInfo/detail", { id: row.id }).then((res) => {
+  proxy.post("/trademark/detail", { id: row.id }).then((res) => {
     formData.data = res;
     dialogVisible.value = true;
   });

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

@@ -261,7 +261,6 @@ const selection = ref({
 });
 const select = (_selection, row) => {
   selection.value.data = _selection;
-  console.log(_selection.length);
 };
 const getSubset = (list, data) => {
   for (let i = 0; i < list.length; i++) {

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

@@ -429,6 +429,19 @@ const arrayRecursion = (arr, definition) => {
   });
   return arr;
 };
+
+const allData = ref([]);
+const getSubset = (list, data) => {
+  for (let i = 0; i < list.length; i++) {
+    if (list[i].children && list[i].children.length > 0) {
+      getSubset(list[i].children, data);
+    } else {
+      data.push(list[i].id);
+    }
+  }
+  return data;
+};
+
 const getUserList = () => {
   proxy
     .get(
@@ -460,15 +473,6 @@ const getUserList = () => {
       }));
     });
 
-  // proxy
-  //   .post("/productClassify/tree", {
-  //     parentId: "",
-  //     name: "",
-  //     definition: "",
-  //   })
-  //   .then((res) => {
-  //     productTreeData.value = res;
-  //   });
   Promise.all([
     proxy.post("/productClassify/tree", {
       parentId: "",
@@ -508,6 +512,7 @@ const getUserList = () => {
           ],
         },
       ];
+      allData.value = getSubset(productTreeData.value, []);
     }
   });
 };
@@ -590,6 +595,7 @@ const submitForm = () => {
         .getHalfCheckedKeys()
         .concat(productTree.value.getCheckedKeys())
     );
+    data = data.filter((x) => !["-999", "-99", "-9"].includes(x));
     formData.data.purchaseRange = data.join(",");
     proxy.post("/tenantUser", formData.data, method).then(() => {
       if (formData.data.password && formData.data.userId) {
@@ -628,6 +634,7 @@ const submitForm = () => {
     });
   });
 };
+
 const getDtl = (row) => {
   companyData.value = companyData.value.map((x) => ({
     ...x,
@@ -639,6 +646,11 @@ const getDtl = (row) => {
     if (res.data && res.data.purchaseRange) {
       formData.data.purchaseRange = [];
       formData.data.purchaseRangeOne = res.data.purchaseRange.split(",");
+      formData.data.purchaseRangeOne = formData.data.purchaseRangeOne.filter(
+        (item) => {
+          return allData.value.some((i) => item == i);
+        }
+      );
     } else {
       formData.data.purchaseRangeOne = [];
     }