Merge branch 'sit' of http://120.46.155.214:3000/xiaodai2022/accout-vue3-ui into sit

src/views/supplierManage/supplierAccoutManage/index.vue

@@ -105,8 +105,9 @@ async function onSearch() {
 
   const { code, data, message } = await httpList({
     ...form,
-    companyNo: currentCompany.value.companyNo,
-    noRela: currentCompany.value.companyNo === ""
+    // companyNo: currentCompany.value.companyNo,
+    noRela: true
+    //currentCompany.value.companyNo === ""
   });
 
   responseHandle({

src/views/supplierManage/supplierAccoutQuery/components/role-modal.vue

@@ -69,7 +69,7 @@ defineExpose({
     visible.value = true;
     modalType.value = type;
     companyNo = _data.companyCode;
-    runRole(httpList({ size: "1000", level: "3" ,noRale: true}));
+    runRole(httpList({ size: "1000", level: "3", noRale: true }));
 
     if (_data) {
       const { mobile, nickname, roleid, id, companyName } = _data;
@@ -125,7 +125,7 @@ defineExpose({
 
       <ElFormItem>
         <div class="flex w-full justify-end">
-          <ElButton type="取消" @click="() => (visible = false)">取消</ElButton>
+          <ElButton @click="() => (visible = false)">取消</ElButton>
           <ElButton type="primary" @click="() => handleSave()">保存</ElButton>
         </div>
       </ElFormItem>

src/views/supplierManage/supplierRole/columns.tsx

@@ -19,10 +19,10 @@ export function useColumns() {
       label: "角色名称",
       prop: "role_name"
     },
-    {
-      label: "业务公司",
-      prop: "companyName"
-    },
+    // {
+    //   label: "业务公司",
+    //   prop: "companyName"
+    // },
     {
       label: "等级",
       prop: "level",

src/views/supplierManage/supplierRole/index.vue

@@ -77,8 +77,8 @@ function handleSelectionChange(val) {
 async function onSearch() {
   loading.value = true;
   const { code, data, message } = await httpList({
-    ...form,
-    companyNo: currentCompany.value.companyNo
+    ...form
+    // companyNo: currentCompany.value.companyNo
   });
   if (code === 0) {
     const { list, count } = data;
@@ -130,10 +130,10 @@ onMounted(() => {
   }
 });
 
-watch(
-  () => currentCompany.value,
-  () => onSearch()
-);
+// watch(
+//   () => currentCompany.value,
+//   () => onSearch()
+// );
 </script>
 
 <template>