dev

2025-04-25 15:00:39 +08:00 · 2025-04-25 15:00:39 +08:00 · 0caad78089
parent 0d8e8932f0
commit 0caad78089
8 changed files with 113 additions and 80 deletions
--- a/src/components/inventory/goods/Edit.vue
+++ b/src/components/inventory/goods/Edit.vue
@ -420,7 +420,7 @@ const storageConditionsOptions =
      }
    ]
 const emit = defineEmits(['close'])
-let edit_data: any = ref({trdnFlag: false, extra: {}, minPackagingUnit: "只", packagingUnit: "盒", pricingModel: "2"});
+let edit_data: any = ref({trdnFlag: false, extra: {}, minPackagingUnit: "只", packagingUnit: "盒", pricingModel: 2});
 const idCode = ref("");
 const showPopover = ref(false);
 const idCodeList = ref<string[]>([]);
--- a/src/components/inventory/goods/Search.vue
+++ b/src/components/inventory/goods/Search.vue
@ -80,7 +80,6 @@ onMounted(() => {
 })
 const change_current_search_data_index = (val: any) => {
  current_search_data = JSON.parse(JSON.stringify(val));
-  console.log(current_search_data.id)
  // proos.changeData(current_search_data)
 }
 const init = (_type: number,_name:string) => {
@ -104,12 +103,12 @@ function init_search_data() {
 }

 let confirm = () => {
-  let jsondata = current_search_data.json;
+  let jsondata = current_search_data;
  let data = {
    id: null,
    type: null,
-    name: jsondata.name,
-    commonName: jsondata.common_name,
+    name: jsondata?.name,
+    commonName: jsondata?.common_name,
    hilistCode: jsondata.code,
    unitPrice: null,
    purchaseUnitPrice: null,
@ -130,7 +129,6 @@ let confirm = () => {

    }
  }
-  console.log("data",data)
  emit('confirm',data)
  show.value = false;

--- a/src/components/inventory/purchase/EditOrder.vue
+++ b/src/components/inventory/purchase/EditOrder.vue
@ -174,7 +174,7 @@ import {ElMessage, ElMessageBox} from "element-plus";
 import GoodsSearch from "@/components/inventory/GoodsSearch.vue";
 import CloseBtn from "@/components/CloseBtn.vue";

-let {code} = defineProps({
+let props = defineProps({
  code: {
    type: String,
    default: null
@ -303,7 +303,7 @@ const getSupplierList = () => {
  })
 }
 const getOrderDetail = () => {
-  post("inventory/order/detail", {code: code}).then((res: any) => {
+  post("inventory/order/detail", {code: props.code}).then((res: any) => {
    inventory_order_data.value = res.inventoryOrder
    table_list.value = res.inventoryOrderGoodsList
    console.log(res)
--- a/src/views/inventory/goods.vue
+++ b/src/views/inventory/goods.vue
@ -2,6 +2,7 @@
  <div class="container-wrapper">
    <div class="top">
      <div class="search">
+        <div class="left">
          <el-form :inline="true" :model="searchModel">
            <el-form-item>
              <el-input placeholder="请输入名称"
@ -54,10 +55,12 @@
                </template>
              </el-input>
            </el-form-item>
-          <el-form-item>
-            <el-button type="primary" @click="searchGoods">搜索</el-button>
-          </el-form-item>
          </el-form>
+          <div class="btn">
+            <el-button type="primary" @click="searchGoods">搜索</el-button>
+            <el-button type="primary" @click="resetSearch">重置</el-button>
+          </div>
+        </div>
        <div class="right">
          <el-checkbox v-model="inventoryNumber" label="不看0库存" size="large" @change="searchGoods"/>
          <el-checkbox v-model="status" label="不看已停用" size="large" @change="searchGoods"/>
@ -158,13 +161,10 @@
      </div>
    </div>
  </div>
-  <Mask :is-show="is_add" :top="50" :height="900">
+  <Mask :is-show="is_add" :height="900" @close="is_add = false" title="新增">
    <Edit ref="editRef" @close="is_add = false;init()"/>
  </Mask>
-  <Mask :is-show="open" :top="50" :height="600">
-    <div style="height: 50px">
-      <CloseBtn @click="closeMack"></CloseBtn>
-    </div>
+  <Mask :is-show="open" :top="50" :height="600" @close="open = false" title="编辑">
    <el-tabs v-model="activeName" @tab-change="changeTab">
      <el-tab-pane label="商品信息" name="first">
        <Edit ref="editRef" @close="open = false;init()"/>
@ -182,7 +182,7 @@
 import {nextTick, onMounted, ref} from "vue";
 import {ElTabPane} from "element-plus";
 import {post} from '@/utils/request.ts';
-import Mask from "@/components/Mask.vue";
+import Mask from "@/components/common/Mask.vue";
 import Edit from "@/components/inventory/goods/Edit.vue";
 import InventoryBatchDetail from "@/components/inventory/goods/InventoryBatchDetail.vue";
 import InventoryStatistics from "@/components/inventory/goods/InventoryStatistics.vue";
@ -253,6 +253,7 @@ const searchGoods = () => {
  })
  post("goods/goods/searchDetail", {query: data}).then((res: any) => {
    tableData.value = res.list
+    total.value = res.total_count
  })
 }
 const getTagsArray = (tags: string) => {
@ -377,6 +378,16 @@ const changeTab = (name: string) => {
  }
 }
 const activeName = ref('first')
+const resetSearch = () => {
+  searchModel.value = {
+    name: "",
+    cateId: [],
+    minInterestRate: "",
+    maxInterestRate: "",
+    curProfitCate: []
+  }
+  init()
+}
 </script>
 <style scoped lang="scss">
 .v-enter-active,
@ -398,15 +409,23 @@ const activeName = ref('first')
    height: 112px;
    padding: 24px 24px 0;
    background: #fff;
+    display: flex;
+    flex-direction: column;

    .search {
      display: flex;
      justify-content: space-between;
-
+      .left{
+        flex: 1;
+        display: flex;
+        justify-content: space-between;
+        margin-right: 24px;
        .el-form-item {
          margin-right: 5px;
        }
      }
+
+    }
  }

  .content_goods {
--- a/src/views/inventory/inventory.vue
+++ b/src/views/inventory/inventory.vue
@ -69,8 +69,8 @@ let open_code = ref(null)
 onMounted(() => {
  init()
 })
-let open_add = (code: any) => {
-  open_code.value = code
+let open_add = (row: any) => {
+  open_code.value = row.code
  is_add.value = true
 }

--- a/src/views/settings/item.vue
+++ b/src/views/settings/item.vue
@ -18,7 +18,7 @@
      </div>
      <div class="title-btn">
        <el-button type="primary" @click="initData()">查询</el-button>
-        <el-button type="primary" @click="search={}">重置</el-button>
+        <el-button type="primary" @click="resetSearch">重置</el-button>
        <el-button type="primary" :icon="Plus" @click="isShow=true">新建项目</el-button>
        <el-button type="primary" @click="openSetMenu">组套</el-button>
      </div>
@ -126,7 +126,7 @@ const rowClick = ((row: any) => {

 const tableData = ref<any>([])
 const initData = () => {
-  post('item/list', {page: page.value, size: pageSize.value}).then((res: any) => {
+  post('item/list', {page: page.value, size: pageSize.value, ...search.value}).then((res: any) => {
    tableData.value = res.list
    total.value = res.total_count
  })
@ -149,6 +149,10 @@ const pageSize = ref(20);
 const page = ref(1);
 const total = ref(0);
 const search = ref<any>({})
+const resetSearch = () => {
+  search.value = {}
+  initData()
+}
 </script>
 <style scoped lang="scss">
 .container-wrapper {
--- a/src/views/settings/member.vue
+++ b/src/views/settings/member.vue
@ -26,7 +26,7 @@
      </div>
      <div class="title-btn">
        <el-button type="primary" @click="init()">查询</el-button>
-        <el-button type="primary" @click="search={}">重置</el-button>
+        <el-button type="primary" @click="resetSearch">重置</el-button>
        <el-button type="primary" :icon="Plus" @click="isShow=true">新增</el-button>
      </div>
    </div>
@ -53,7 +53,11 @@
            {{ sectionList.find((item: any) => item.id === scope.row.memberInfo.sectionId)?.name || '-' }}
          </template>
        </el-table-column>
-        <el-table-column prop="memo" label="备注"/>
+        <el-table-column prop="memo" label="备注">
+          <template #default="scope">
+            {{ scope.row.memberInfo.memo }}
+          </template>
+        </el-table-column>
      </el-table>
    </div>
    <div class="bottom">
@ -128,7 +132,7 @@ const roleList = [
 ]
 const init = (() => {
  isShow.value = false
-  post('organization/member/list ', {page: page.value, size: pageSize.value}).then((res: any) => {
+  post('organization/member/list ', {page: page.value, size: pageSize.value, ...search.value}).then((res: any) => {
    tableData.value = res.list
    list()
  })
@ -155,6 +159,10 @@ const page = ref(1);
 const total = ref(0);

 const search = ref<any>({})
+const resetSearch = () => {
+  search.value = {}
+  init()
+}
 </script>
 <style scoped lang="scss">
@use "@/assets/scss/base.scss";
--- a/src/views/settings/section.vue
+++ b/src/views/settings/section.vue
@ -18,7 +18,7 @@
      </div>
      <div class="title-btn">
        <el-button type="primary" @click="init()">查询</el-button>
-        <el-button type="primary" @click="search={}">重置</el-button>
+        <el-button type="primary" @click="resetSearch">重置</el-button>
        <el-button type="primary" :icon="Plus" @click="isShow=true">新增</el-button>
      </div>
    </div>
@ -111,7 +111,7 @@ interface Dept {

 const init = () => {
  isShow.value = false
-  post('organization/section/list', {page: page.value, size: pageSize.value}).then((res: any) => {
+  post('organization/section/list', {page: page.value, size: pageSize.value, ...search.value}).then((res: any) => {
    tableData.value = res.list
    tableData.value.forEach((item: any) => {
      let dept: Dept = deptsObj
@ -141,6 +141,10 @@ const options = Object.entries(depts).map(([key, value]) => {
    };
  }
 });
+const resetSearch = () => {
+  search.value = {}
+  init()
+}
 </script>
 <style scoped lang="scss">
@use "@/assets/scss/base.scss";