Merge branch 'dev_RT_AY' of http://114.132.189.42:9002/r/product-inventory-...

张诺

2025-12-11 834c77e1c1132352d1d1aa61551f3bf46894172d

Merge branch 'dev_RT_AY' of http://114.132.189.42:9002/r/product-inventory-management into dev_RT_AY

 src/views/basicData/product/index.vue

@@ -146,7 +146,7 @@
            <el-form-item label="规格型号：" prop="model">
              <el-input
                v-model="modelForm.model"
                placeholder="请输入规格型号(g*袋数)"
                placeholder="请输入规格型号"
                clearable
                @keydown.enter.prevent
              />
@@ -272,12 +272,7 @@
  },
  modelRules: {
    model: [
      { required: true, message: "请输入", trigger: "blur" },
      { 
        pattern: /^[0-9*]*$/, 
        message: "只能输入数字和*号", 
        trigger: "blur" 
      }
      { required: true, message: "请输入", trigger: "blur" }
    ],
    unit: [{ required: true, message: "请输入", trigger: "blur" }],
    speculativeTradingName: [{ required: true, message: "请选择绑定机器", trigger: "change" }],

 src/views/inventoryManagement/dispatchLog/index.vue

@@ -23,6 +23,13 @@
                            clearable
                            @change="handleQuery"
                        />
                        <span class="search_title ml10">产品大类：</span>
                        <el-input
                            v-model="searchForm.productCategory"
                            style="width: 240px"
                            placeholder="请输入"
                            clearable
                        />
                        <el-button type="primary" @click="handleQuery" style="margin-left: 10px">搜索</el-button>
                    </div>
                    <div>
@@ -90,6 +97,13 @@
                            format="YYYY-MM-DD"
                            clearable
                            @change="handleQuery"
                        />
                        <span class="search_title ml10">产品大类：</span>
                        <el-input
                            v-model="searchForm.productCategory"
                            style="width: 240px"
                            placeholder="请输入"
                            clearable
                        />
                        <el-button type="primary" @click="handleQuery" style="margin-left: 10px">搜索</el-button>
                    </div>
@@ -358,6 +372,7 @@
    searchForm: {
        supplierName: "",
        customerName: "",
        productCategory:'',
        timeStr: getCurrentDate(),
    },
    form: {
@@ -403,6 +418,7 @@
        params.supplierName = searchForm.value.supplierName
        params.timeStr = searchForm.value.timeStr
    }
      params.productCategory = searchForm.value.productCategory
    
    // 根据不同的 tab 类型调用不同的接口
    const apiCall = activeTab.value === 'production' 

 src/views/inventoryManagement/issueManagement/index.vue

@@ -17,6 +17,13 @@
              clearable
              @change="handleQuery"
            />
            <span class="search_title ml10">产品大类：</span>
            <el-input
              v-model="searchForm.productCategory"
              style="width: 240px"
              placeholder="请输入"
              clearable
            />
            <el-button type="primary" @click="handleQuery" style="margin-left: 10px">搜索</el-button>
          </div>
          <div>
@@ -66,6 +73,13 @@
              format="YYYY-MM-DD"
              clearable
              @change="handleQuery"
            />
            <span class="search_title ml10">产品大类：</span>
            <el-input
              v-model="searchForm.productCategory"
              style="width: 240px"
              placeholder="请输入"
              clearable
            />
            <el-button type="primary" @click="handleQuery" style="margin-left: 10px">搜索</el-button>
          </div>
@@ -223,6 +237,7 @@
    inboundTime:'',
    nickName: '',
    userId: '',
    productCategory:'',
    timeStr: getCurrentDate(),
  },
  form: {
@@ -257,6 +272,7 @@
    params.supplierName = searchForm.value.supplierName
    params.timeStr = searchForm.value.timeStr
  }
  params.productCategory = searchForm.value.productCategory
  let apiCall
  if (activeTab.value === 'production') {
    apiCall = getStockInPageByProduction(params)

 src/views/inventoryManagement/receiptManagement/index.vue

@@ -17,6 +17,13 @@
              clearable
              @change="handleQuery"
            />
            <span class="search_title ml10">产品大类：</span>
            <el-input
              v-model="searchForm.productCategory"
              style="width: 240px"
              placeholder="请输入"
              clearable
            />
            <el-button type="primary" @click="handleQuery" style="margin-left: 10px">搜索</el-button>
          </div>
          <div>
@@ -61,6 +68,13 @@
              format="YYYY-MM-DD"
              clearable
              @change="handleQuery"
            />
            <span class="search_title ml10">产品大类：</span>
            <el-input
              v-model="searchForm.productCategory"
              style="width: 240px"
              placeholder="请输入"
              clearable
            />
            <el-button type="primary" @click="handleQuery" style="margin-left: 10px">搜索</el-button>
          </div>
@@ -200,6 +214,7 @@
  searchForm: {
    supplierName: '',
    customerName: '',
    productCategory:'',
    timeStr: getCurrentDate(),
  },
})
@@ -227,6 +242,7 @@
    params.supplierName = searchForm.value.supplierName
    params.timeStr = searchForm.value.timeStr
  }
  params.productCategory = searchForm.value.productCategory
  
  // 根据不同的 tab 类型调用不同的接口
  const apiCall = activeTab.value === 'production' 

 src/views/inventoryManagement/stockManagement/index.vue

@@ -17,6 +17,13 @@
              clearable
              @change="handleQuery"
            />
                        <span class="search_title ml10">产品大类：</span>
                        <el-input
                            v-model="searchForm.productCategory"
                            style="width: 240px"
                            placeholder="请输入"
                            clearable
                        />
            <el-button type="primary" @click="handleQuery" style="margin-left: 10px">搜索</el-button>
          </div>
          <div>
@@ -71,6 +78,13 @@
              clearable
              @change="handleQuery"
            />
                        <span class="search_title ml10">产品大类：</span>
                        <el-input
                            v-model="searchForm.productCategory"
                            style="width: 240px"
                            placeholder="请输入"
                            clearable
                        />
            <el-button type="primary" @click="handleQuery" style="margin-left: 10px">搜索</el-button>
          </div>
          <div>
@@ -309,6 +323,7 @@
  searchForm: {
    supplierName: '',
    customerName: '',
    productCategory:'',
    timeStr: getCurrentDate(),
  },
  form: {
@@ -372,6 +387,7 @@
  } else {
    params.supplierName = searchForm.value.supplierName
  }
  params.productCategory = searchForm.value.productCategory
  return params
}