Merge branch 'dev_天津军泰伟业' of http://114.132.189.42:9002/r/product-inventory...

zhangwencui

5 天以前 0493e98447ce106ba344f4515b447ca812a8f389

Merge branch 'dev_天津军泰伟业' of http://114.132.189.42:9002/r/product-inventory-management into dev_天津军泰伟业

 src/views/financialManagement/expenseManagement/index.vue

@@ -226,9 +226,11 @@

const changeDaterange = (value) => {
  if (value) {
    filters.entryDate = value;
    filters.entryDateStart = dayjs(value[0]).format("YYYY-MM-DD");
    filters.entryDateEnd = dayjs(value[1]).format("YYYY-MM-DD");
  } else {
    filters.entryDate = null;
    filters.entryDateStart = undefined;
    filters.entryDateEnd = undefined;
  }
@@ -256,12 +258,6 @@
};

onMounted(() => {
  filters.entryDate = [
    dayjs().format("YYYY-MM-DD"),
    dayjs().add(1, "day").format("YYYY-MM-DD"),
  ]
  filters.entryDateStart = dayjs().format("YYYY-MM-DD")
  filters.entryDateEnd = dayjs().add(1, "day").format("YYYY-MM-DD")
  getTableData();
});
</script>

 src/views/qualityManagement/rawMaterialInspection/components/formDia.vue

@@ -14,6 +14,7 @@
                  v-model="form.supplier"
                  placeholder="请选择"
                  clearable
                                    filterable
              >
                <el-option
                    v-for="item in supplierList"

 src/views/salesManagement/salesLedger/index.vue

@@ -211,7 +211,7 @@
        <el-row :gutter="30">
          <el-col :span="24">
            <el-form-item label="规格型号：" prop="productModelId">
              <el-select v-model="productForm.productModelId" placeholder="请选择" clearable @change="getProductModel">
              <el-select v-model="productForm.productModelId" placeholder="请选择" clearable @change="getProductModel" filterable>
                <el-option v-for="item in modelOptions" :key="item.id" :label="item.model" :value="item.id" />
              </el-select>
            </el-form-item>

 src/views/salesManagement/salesQuotation/index.vue

@@ -19,6 +19,7 @@
        <el-col :span="8">
          <el-select v-model="searchForm.customer"
                     placeholder="请选择客户"
                                         filterable
                     clearable>
            <el-option v-for="item in customerOption"
                       :key="item.id"
@@ -135,6 +136,7 @@
                            prop="customer">
                <el-select v-model="form.customer"
                           placeholder="请选择客户"
                                                     filterable
                           style="width: 100%"
                           @change="handleCustomerChange">
                  <el-option v-for="item in customerOption"
@@ -152,6 +154,7 @@
              <el-form-item label="业务员"
                            prop="salesperson">
                <el-select v-model="form.salesperson"
                                                     filterable
                           placeholder="请选择业务员"
                           style="width: 100%">
                  <el-option v-for="item in userList"
@@ -233,6 +236,7 @@
                             width="150">
              <template #default="scope">
                <el-select v-model="scope.row.specificationId"
                                                     filterable
                           placeholder="请选择"
                           clearable
                           @change="getProductModel($event, scope.row)">