src/api/viewIndex.js

@@ -44,4 +44,11 @@
        url: '/sales/ledger/getAmountHalfYear',
        method: 'get'
    })
}
}
// 生产数据
export const productionStatistics = () => {
    return request({
        url: '/home/productionStatistics',
        method: 'get'
    })
}

 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/collaborativeApproval/noticeManagement/index.vue

@@ -153,7 +153,7 @@
          </el-col>
          <el-col :span="12">
            <el-form-item label="公告类型" prop="type">
              <el-select v-model="form.type" placeholder="请选择公告类型" style="width: 100%">
              <el-select v-model="form.type" placeholder="请选择公告类型" filterable style="width: 100%">
                <el-option label="放假通知" :value="1"/>
                <el-option label="设备维修通知" :value="2"/>
              </el-select>

 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
}


 src/views/procurementManagement/invoiceEntry/components/Modal.vue

@@ -33,7 +33,7 @@
            />
          </el-form-item>
        </el-col>
        <el-col :span="12">
        <!-- <el-col :span="12">
          <el-form-item label="项目名称：" prop="projectName">
            <el-input
              v-model="form.projectName"
@@ -42,7 +42,7 @@
              disabled
            />
          </el-form-item>
        </el-col>
        </el-col> -->
        <el-col :span="12">
          <el-form-item label="发票号：" prop="invoiceNumber">
            <el-input
@@ -84,6 +84,18 @@
          </el-form-item>
        </el-col>
        <el-col :span="12">
          <el-form-item label="录入日期：" prop="enterDate">
            <el-date-picker
              style="width: 100%"
              v-model="form.enterDate"
              type="date"
              value-format="YYYY-MM-DD"
              format="YYYY-MM-DD"
              clearable
            />
          </el-form-item>
        </el-col>
        <el-col :span="12">
          <el-form-item label="上传附件">
            <FileUpload
              :showTip="false"
@@ -96,18 +108,6 @@
              :limit="10"
              @success="uploadSuccess"
              @remove="removeFile"
            />
          </el-form-item>
        </el-col>
        <el-col :span="12">
          <el-form-item label="录入日期：" prop="enterDate">
            <el-date-picker
              style="width: 100%"
              v-model="form.enterDate"
              type="date"
              value-format="YYYY-MM-DD"
              format="YYYY-MM-DD"
              clearable
            />
          </el-form-item>
        </el-col>
@@ -184,7 +184,7 @@
  purchaseLedgerNo: undefined, // 采购合同号
  salesContractNo: undefined, // 销售合同号
  supplierName: undefined, // 供应商名称
  projectName: undefined, // 项目名称
  // projectName: undefined, // 项目名称
  invoiceNumber: undefined, // 发票号
  invoiceAmount: undefined, // 发票金额(元)
  issUerId: userStore.id, // 录入人
@@ -316,7 +316,7 @@

    const { data: infoData } = await getInfo({ id });
    form.salesContractNo = infoData.salesContractNo;
    form.projectName = infoData.projectName;
    // form.projectName = infoData.projectName;
    form.supplierName = infoData.supplierName;
    form.productData = infoData.productData;
  } else if (type == "edit") {
@@ -325,7 +325,7 @@
    form.invoiceAmount = data.invoiceAmount;
    form.invoiceNumber = data.invoiceNumber;
    form.salesContractNo = data.salesContractNo;
    form.projectName = data.projectName;
    // form.projectName = data.projectName;
    form.supplierName = data.supplierName;
    form.entryDate = data.entryDate;
    form.productData = data.productData;
@@ -425,7 +425,7 @@
        invoiceNumber: form.invoiceNumber,
        invoiceAmount: form.invoiceAmount,
        salesContractNo: form.salesContractNo,
        projectName: form.projectName,
        // projectName: form.projectName,
        productData: form.productData,
        issueDate: form.entryDate,
        issUerId: form.issUerId, // 录入人id

 src/views/procurementManagement/invoiceEntry/index.vue

@@ -28,13 +28,13 @@
              clearable
          />
        </el-form-item>
        <el-form-item label="项目名称">
        <!-- <el-form-item label="项目名称">
          <el-input
              v-model="filters.projectName"
              placeholder="请输入项目名称"
              clearable
          />
        </el-form-item>
        </el-form-item> -->
        <el-form-item>
          <el-button type="primary" @click="getTableData"> 搜索 </el-button>
          <el-button @click="resetFilters"> 重置 </el-button>
@@ -142,11 +142,11 @@
      prop: "supplierName",
      width:300
    },
    {
      label: "项目名称",
      prop: "projectName",
      width:400
    },
    // {
    //   label: "项目名称",
    //   prop: "projectName",
    //   width:400
    // },
    {
      label: "录入人",
      prop: "recorderName",

 src/views/procurementManagement/invoiceEntry/indexOld.vue

@@ -104,11 +104,11 @@
          prop="supplierName"
          show-overflow-tooltip
        />
        <el-table-column
        <!-- <el-table-column
          label="项目名称"
          prop="projectName"
          show-overflow-tooltip
        />
        /> -->
        <el-table-column
          label="合同金额(元)"
          prop="contractAmount"
@@ -186,28 +186,6 @@
        </el-row>
        <el-row :gutter="30">
          <el-col :span="12">
            <el-form-item label="供应商名称：" prop="supplierName">
              <el-input
                v-model="form.supplierName"
                placeholder="自动填充"
                clearable
                disabled
              />
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="项目名称：" prop="projectName">
              <el-input
                v-model="form.projectName"
                placeholder="自动填充"
                clearable
                disabled
              />
            </el-form-item>
          </el-col>
        </el-row>
        <el-row :gutter="30">
          <el-col :span="12">
            <el-form-item label="发票号：" prop="invoiceNumber">
              <el-input
                v-model="form.invoiceNumber"
@@ -253,6 +231,28 @@
        </el-row>
        <el-row :gutter="30">
          <el-col :span="12">
            <el-form-item label="供应商名称：" prop="supplierName">
              <el-input
                v-model="form.supplierName"
                placeholder="自动填充"
                clearable
                disabled
              />
            </el-form-item>
          </el-col>
          <!-- <el-col :span="12">
            <el-form-item label="项目名称：" prop="projectName">
              <el-input
                v-model="form.projectName"
                placeholder="自动填充"
                clearable
                disabled
              />
            </el-form-item>
          </el-col> -->
        </el-row>
        <el-row :gutter="30">
          <el-col :span="24">
            <el-form-item label="上传附件">
              <FileUpload :showTip="false" accept="*" :autoUpload="true" />
            </el-form-item>
@@ -599,7 +599,7 @@
  getInfo({ id: value }).then((res) => {
    let result = res.data;
    form.value.salesContractNo = result.salesContractNo;
    form.value.projectName = result.projectName;
    // form.value.projectName = result.projectName;
    productData.value = result.productData;
    form.value.supplierName = result.supplierName;
  });

 src/views/procurementManagement/procurementInvoiceLedger/index.vue

@@ -162,11 +162,11 @@
      prop: "salesContractNo",
      width: 150,
    },
    {
      label: "项目名称",
      prop: "projectName",
      width: 240,
    },
    // {
    //   label: "项目名称",
    //   prop: "projectName",
    //   width: 240,
    // },
    {
      label: "供应商名称",
      prop: "supplierName",

 src/views/procurementManagement/procurementLedger/index.vue

@@ -21,10 +21,10 @@
            <el-input v-model="searchForm.salesContractNo" placeholder="请输入" clearable prefix-icon="Search"
                      @change="handleQuery" />
          </el-form-item>
          <el-form-item label="项目名称：">
          <!-- <el-form-item label="项目名称：">
            <el-input v-model="searchForm.projectName" placeholder="请输入" clearable prefix-icon="Search"
                      @change="handleQuery" />
          </el-form-item>
          </el-form-item> -->
          <el-form-item label="录入日期：">
            <el-date-picker v-model="searchForm.entryDate" value-format="YYYY-MM-DD" format="YYYY-MM-DD" type="daterange"
                            placeholder="请选择" clearable @change="changeDaterange" />
@@ -112,12 +112,12 @@
          prop="supplierName"
          show-overflow-tooltip
        />
        <el-table-column
        <!-- <el-table-column
          label="项目名称"
          prop="projectName"
          width="420"
          show-overflow-tooltip
        />
        /> -->
        <el-table-column
          label="付款方式"
          width="100"
@@ -218,33 +218,6 @@
            </el-form-item>
          </el-col>
        </el-row>
        <el-row :gutter="30">
          <el-col :span="12">
            <el-form-item label="供应商名称：" prop="supplierId">
              <el-select
                v-model="form.supplierId"
                placeholder="请选择"
                clearable
              >
                <el-option
                  v-for="item in supplierList"
                  :key="item.id"
                  :label="item.supplierName"
                  :value="item.id"
                />
              </el-select>
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="项目名称：" prop="projectName">
              <el-input
                v-model="form.projectName"
                placeholder="请输入"
                clearable
              />
            </el-form-item>
          </el-col>
        </el-row>
                <el-row :gutter="30">
                    <el-col :span="12">
                        <el-form-item label="付款方式">
@@ -302,6 +275,33 @@
              />
            </el-form-item>
          </el-col>
        </el-row>
        <el-row :gutter="30">
          <el-col :span="12">
            <el-form-item label="供应商名称：" prop="supplierId">
              <el-select
                v-model="form.supplierId"
                placeholder="请选择"
                clearable
              >
                <el-option
                  v-for="item in supplierList"
                  :key="item.id"
                  :label="item.supplierName"
                  :value="item.id"
                />
              </el-select>
            </el-form-item>
          </el-col>
          <!-- <el-col :span="12">
            <el-form-item label="项目名称：" prop="projectName">
              <el-input
                v-model="form.projectName"
                placeholder="请输入"
                clearable
              />
            </el-form-item>
          </el-col> -->
        </el-row>
        <el-row>
          <el-form-item label="产品信息：" prop="entryDate">
@@ -638,29 +638,6 @@
        </el-row>
        <el-row :gutter="20">
          <el-col :span="12">
            <el-form-item label="项目名称：" prop="projectName">
              <el-input
                v-model="scanAddForm.projectName"
                placeholder="请输入"
                clearable
              />
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="合同金额(元)：" prop="contractAmount">
              <el-input-number
                v-model="scanAddForm.contractAmount"
                :precision="2"
                :step="0.1"
                clearable
                style="width: 100%"
                placeholder="请输入"
              />
            </el-form-item>
          </el-col>
        </el-row>
        <el-row :gutter="20">
          <el-col :span="12">
            <el-form-item label="付款方式：">
              <el-input
                v-model="scanAddForm.paymentMethod"
@@ -672,6 +649,29 @@
          <el-col :span="12">
            <el-form-item label="录入人：">
              <el-input v-model="scanAddForm.recorderName" disabled />
            </el-form-item>
          </el-col>
        </el-row>
        <el-row :gutter="20">
          <!-- <el-col :span="12">
            <el-form-item label="项目名称：" prop="projectName">
              <el-input
                v-model="scanAddForm.projectName"
                placeholder="请输入"
                clearable
              />
            </el-form-item>
          </el-col> -->
          <el-col :span="12">
            <el-form-item label="合同金额(元)：" prop="contractAmount">
              <el-input-number
                v-model="scanAddForm.contractAmount"
                :precision="2"
                :step="0.1"
                clearable
                style="width: 100%"
                placeholder="请输入"
              />
            </el-form-item>
          </el-col>
        </el-row>
@@ -725,18 +725,6 @@
        </el-row>
        <el-row :gutter="20">
          <el-col :span="12">
            <el-form-item label="项目名称：">
              <el-input v-model="scanForm.projectName" disabled />
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="扫码时间：">
              <el-input v-model="scanForm.scanTime" disabled />
            </el-form-item>
          </el-col>
        </el-row>
        <el-row :gutter="20">
          <el-col :span="12">
            <el-form-item label="扫码人：">
              <el-input v-model="scanForm.scannerName" disabled />
            </el-form-item>
@@ -746,6 +734,18 @@
              <el-tag :type="scanForm.scanStatus === '已扫码' ? 'success' : 'warning'">
                {{ scanForm.scanStatus }}
              </el-tag>
            </el-form-item>
          </el-col>
        </el-row>
        <el-row :gutter="20">
          <!-- <el-col :span="12">
            <el-form-item label="项目名称：">
              <el-input v-model="scanForm.projectName" disabled />
            </el-form-item>
          </el-col> -->
          <el-col :span="12">
            <el-form-item label="扫码时间：">
              <el-input v-model="scanForm.scanTime" disabled />
            </el-form-item>
          </el-col>
        </el-row>
@@ -852,7 +852,7 @@
    supplierName: "", // 供应商名称
    purchaseContractNumber: "", // 采购合同编号
    salesContractNo: "", // 销售合同编号
    projectName: "", // 项目名称
    // projectName: "", // 项目名称
    entryDate: null, // 录入日期
    entryDateStart: undefined,
    entryDateEnd: undefined,
@@ -860,7 +860,7 @@
  form: {
    purchaseContractNumber: "",
    salesLedgerId: "",
    projectName: "",
    // projectName: "",
    recorderId: "",
    entryDate: "",
    productData: [],
@@ -873,7 +873,7 @@
    purchaseContractNumber: [
      { required: true, message: "请输入", trigger: "blur" },
    ],
    projectName: [{ required: true, message: "请输入", trigger: "blur" }],
    // projectName: [{ required: true, message: "请输入", trigger: "blur" }],
    supplierId: [{ required: true, message: "请输入", trigger: "blur" }],
        entryDate: [{ required: true, message: "请选择", trigger: "change" }],
        executionDate: [{ required: true, message: "请选择", trigger: "change" }],
@@ -1405,7 +1405,7 @@
  var index = salesContractList.value.findIndex((item) => item.id == row);
  console.log("index", index);
  if (index > -1) {
    form.value.projectName = salesContractList.value[index].projectName;
    // form.value.projectName = salesContractList.value[index].projectName;
    await querygProductInfoByContractNo();
  }
};
@@ -1466,7 +1466,7 @@
  scanContent: "",
  purchaseContractNumber: "",
  supplierName: "",
  projectName: "",
  // projectName: "",
  contractAmount: "",
  paymentMethod: "",
  recorderName: "",
@@ -1475,7 +1475,7 @@
const scanAddRules = {
  purchaseContractNumber: [{ required: true, message: "请输入采购合同号", trigger: "blur" }],
  supplierName: [{ required: true, message: "请输入供应商名称", trigger: "blur" }],
  projectName: [{ required: true, message: "请输入项目名称", trigger: "blur" }],
  // projectName: [{ required: true, message: "请输入项目名称", trigger: "blur" }],
};

// 扫码登记对话框相关变量
@@ -1483,7 +1483,7 @@
const scanForm = reactive({
  purchaseContractNumber: "",
  supplierName: "",
  projectName: "",
  // projectName: "",
  scanTime: "",
  scannerName: "",
  scanStatus: "未扫码",
@@ -1499,7 +1499,7 @@
  scanAddForm.scanContent = "";
  scanAddForm.purchaseContractNumber = "";
  scanAddForm.supplierName = "";
  scanAddForm.projectName = "";
  // scanAddForm.projectName = "";
  scanAddForm.contractAmount = "";
  scanAddForm.paymentMethod = "";
  scanAddForm.recorderName = userStore.nickName;
@@ -1517,7 +1517,7 @@
  if (parts.length >= 3) {
    scanAddForm.purchaseContractNumber = parts[0] || "";
    scanAddForm.supplierName = parts[1] || "";
    scanAddForm.projectName = parts[2] || "";
    // scanAddForm.projectName = parts[2] || "";
    scanAddForm.contractAmount = parts[3] || "";
    scanAddForm.paymentMethod = parts[4] || "";
  }
@@ -1537,7 +1537,7 @@
      const newData = {
        purchaseContractNumber: scanAddForm.purchaseContractNumber,
        supplierName: scanAddForm.supplierName,
        projectName: scanAddForm.projectName,
        // projectName: scanAddForm.projectName,
        contractAmount: scanAddForm.contractAmount,
        paymentMethod: scanAddForm.paymentMethod,
        recorderName: scanAddForm.recorderName,
@@ -1560,7 +1560,7 @@
const openScanDialog = (row) => {
  scanForm.purchaseContractNumber = row.purchaseContractNumber;
  scanForm.supplierName = row.supplierName;
  scanForm.projectName = row.projectName;
  // scanForm.projectName = row.projectName;
  scanForm.scanTime = getCurrentDateTime();
  scanForm.scannerName = userStore.nickName;
  scanForm.scanStatus = "未扫码";

 src/views/productionManagement/operationScheduling/index.vue

@@ -7,11 +7,11 @@
                                        style="width: 200px;"
                                        @change="handleQuery" />
                </el-form-item>
                <el-form-item label="项目名称:">
                <!-- <el-form-item label="项目名称:">
                    <el-input v-model="searchForm.projectName" placeholder="请输入" clearable prefix-icon="Search"
                                        style="width: 200px;"
                                        @change="handleQuery" />
                </el-form-item>
                </el-form-item> -->
                <el-form-item label="派工日期:">
                    <el-date-picker v-model="searchForm.entryDate" value-format="YYYY-MM-DD" format="YYYY-MM-DD" type="daterange"
                                                    placeholder="请选择" clearable @change="changeDaterange" />
@@ -125,11 +125,11 @@
        prop: "customerName",
        width: 200,
    },
    {
        label: "项目名称",
        prop: "projectName",
        width:300
    },
    // {
    //     label: "项目名称",
    //     prop: "projectName",
    //     width:300
    // },
    {
        label: "产品大类",
        prop: "productCategory",

 src/views/productionManagement/productionCosting/index.vue

@@ -71,11 +71,11 @@
        prop: "customerName",
        width: 250,
    },
    {
        label: "项目名称",
        prop: "projectName",
        width:300
    },
    // {
    //     label: "项目名称",
    //     prop: "projectName",
    //     width:300
    // },
    {
        label: "产品大类",
        prop: "productCategory",

 src/views/productionManagement/productionDispatching/components/autoDispatchDia.vue

@@ -18,7 +18,7 @@
          <el-table-column label="序号" type="index" width="60" align="center" />
          <el-table-column label="合同号" prop="salesContractNo" width="200" />
          <el-table-column label="客户名称" prop="customerName" width="200" />
          <el-table-column label="项目名称" prop="projectName" width="250" />
          <!-- <el-table-column label="项目名称" prop="projectName" width="250" /> -->
          <el-table-column label="产品大类" prop="productCategory" width="150" />
          <el-table-column label="规格型号" prop="specificationModel" width="200" />
<!--          <el-table-column label="绑定机器" prop="speculativeTradingName" width="120" />-->

 src/views/productionManagement/productionDispatching/components/formDia.vue

@@ -7,18 +7,7 @@
        @close="closeDia"
    >
      <el-form :model="form" label-width="140px" label-position="top" :rules="rules" ref="formRef">
        <el-row :gutter="30">
          <el-col :span="12">
            <el-form-item label="项目名称：" prop="projectName">
              <el-input v-model="form.projectName" placeholder="请输入" clearable disabled/>
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="产品大类：" prop="productCategory">
              <el-input v-model="form.productCategory" placeholder="请输入" clearable disabled/>
            </el-form-item>
          </el-col>
        </el-row>
      
        <el-row :gutter="30">
          <el-col :span="12">
            <el-form-item label="规格型号：" prop="specificationModel">
@@ -131,6 +120,18 @@
            </el-form-item>
          </el-col>
        </el-row>
        <el-row :gutter="30">
          <!-- <el-col :span="12">
            <el-form-item label="项目名称：" prop="projectName">
              <el-input v-model="form.projectName" placeholder="请输入" clearable disabled/>
            </el-form-item>
          </el-col> -->
          <el-col :span="12">
            <el-form-item label="产品大类：" prop="productCategory">
              <el-input v-model="form.productCategory" placeholder="请输入" clearable disabled/>
            </el-form-item>
          </el-col>
        </el-row>
      </el-form>
      <template #footer>
        <div class="dialog-footer">
@@ -157,7 +158,7 @@
const operationType = ref('')
const data = reactive({
  form: {
        projectName: "",
        // projectName: "",
        productCategory: "",
        specificationModel: "", // 规格型号
        quantity: "",

 src/views/productionManagement/productionDispatching/index.vue

@@ -38,7 +38,7 @@
                    clearable
                    prefix-icon="Search"
                />
                <span class="search_title ml10">项目名称：</span>
                <!-- <span class="search_title ml10">项目名称：</span>
                <el-input
                    v-model="searchForm.projectName"
                    style="width: 240px"
@@ -46,7 +46,7 @@
                    @change="handleQuery"
                    clearable
                    prefix-icon="Search"
                />
                /> -->
                <span class="search_title ml10">录入日期：</span>
                <el-date-picker v-model="searchForm.entryDate" value-format="YYYY-MM-DD" format="YYYY-MM-DD" type="daterange"
                                        placeholder="请选择" clearable @change="changeDaterange" />
@@ -87,7 +87,7 @@
const data = reactive({
    searchForm: {
        customerName: "",
        projectName: "",
        // projectName: "",
        status: "",
        entryDate: [dayjs().format("YYYY-MM-DD"), dayjs().format("YYYY-MM-DD")], // 录入日期，默认当天
        entryDateStart: dayjs().format("YYYY-MM-DD"),
@@ -111,11 +111,11 @@
        prop: "customerName",
        width: 250,
    },
    {
        label: "项目名称",
        prop: "projectName",
        width:300
    },
    // {
    //     label: "项目名称",
    //     prop: "projectName",
    //     width:300
    // },
    {
        label: "产品大类",
        prop: "productCategory",

 src/views/productionManagement/productionOrder/index.vue

@@ -11,7 +11,7 @@
                    clearable
                    prefix-icon="Search"
                />
                <span class="search_title ml10">项目名称：</span>
                <!-- <span class="search_title ml10">项目名称：</span>
                <el-input
                    v-model="searchForm.projectName"
                    style="width: 240px"
@@ -19,7 +19,7 @@
                    @change="handleQuery"
                    clearable
                    prefix-icon="Search"
                />
                /> -->
                <span class="search_title ml10">录入日期：</span>
                <el-date-picker v-model="searchForm.entryDate" value-format="YYYY-MM-DD" format="YYYY-MM-DD" type="daterange"
                                                placeholder="请选择" clearable @change="changeDaterange" />
@@ -72,11 +72,11 @@
        prop: "customerName",
        width: 250,
    },
    {
        label: "项目名称",
        prop: "projectName",
        width:300
    },
    // {
    //     label: "项目名称",
    //     prop: "projectName",
    //     width:300
    // },
    {
        label: "付款状态",
        prop: "status",
@@ -132,7 +132,7 @@
const data = reactive({
    searchForm: {
        customerName: "",
        projectName: "",
        // projectName: "",
        status: "",
        entryDate: [dayjs().format("YYYY-MM-DD"), dayjs().format("YYYY-MM-DD")], // 录入日期，默认当天
        entryDateStart: dayjs().format("YYYY-MM-DD"),

 src/views/productionManagement/productionReporting/index.vue

@@ -7,11 +7,11 @@
                                        style="width: 200px;"
                                        @change="handleQuery" />
                </el-form-item>
                <el-form-item label="项目名称:">
                <!-- <el-form-item label="项目名称:">
                    <el-input v-model="searchForm.projectName" placeholder="请输入" clearable prefix-icon="Search"
                                        style="width: 200px;"
                                        @change="handleQuery" />
                </el-form-item>
                </el-form-item> -->
                <el-form-item label="排产日期:">
                    <el-date-picker v-model="searchForm.entryDate" value-format="YYYY-MM-DD" format="YYYY-MM-DD" type="daterange"
                                                    placeholder="请选择" clearable @change="changeDaterange" />
@@ -149,7 +149,7 @@
const data = reactive({
    searchForm: {
        customerName: "",
        projectName: "",
        // projectName: "",
        status: "",
        entryDate: [dayjs().format("YYYY-MM-DD"), dayjs().format("YYYY-MM-DD")], // 录入日期，默认当天
        entryDateStart: dayjs().format("YYYY-MM-DD"),
@@ -213,11 +213,11 @@
        prop: "customerName",
        width: 200,
    },
    {
        label: "项目名称",
        prop: "projectName",
        width:300
    },
    // {
    //     label: "项目名称",
    //     prop: "projectName",
    //     width:300
    // },
    {
        label: "产品大类",
        prop: "productCategory",

 src/views/reportAnalysis/dataDashboard/index.vue

@@ -99,13 +99,13 @@
      <div class="center-panel">
        <!-- 顶部统计卡片 -->
        <div class="stats-cards">
          <div class="stat-card">
          <!-- <div class="stat-card">
            <img src="@/assets/BI/icon@2x.png" alt="图标" class="card-icon" />
            <div class="card-content">
              <span class="card-label">员工总数</span>
              <span class="card-value">{{totalStaff}}</span>
            </div>
          </div>
          </div> -->
          <div class="stat-card">
            <img src="@/assets/BI/icon@2x.png" alt="图标" class="card-icon" />
            <div class="card-content">
@@ -174,14 +174,14 @@
        </div>
                
                <div class="financial-header">
                    <span class="financial-title">财务分析</span>
                    <span class="financial-title">生产分析</span>
                </div>
                <div class="main-panel">
                    <div class="panel-item-customers">
                        <div class="event-header">
                            <img src="@/assets/BI/shijianmingxiicon@2x.png" alt="图标" class="event-icon" />
                            <span class="event-title">经营成果分析</span>
                        </div>
<!--                        <div class="event-header">-->
<!--                            <img src="@/assets/BI/shijianmingxiicon@2x.png" alt="图标" class="event-icon" />-->
<!--                            <span class="event-title">经营成果分析</span>-->
<!--                        </div>-->
                        <Echarts ref="chart"
                                         :chartStyle="chartStyle"
                                         :grid="grid"
@@ -245,7 +245,7 @@
import useUserStore from '@/store/modules/user'
import {
    analysisCustomerContractAmounts, getAmountHalfYear,
    homeTodos,
    homeTodos, productionStatistics,
    qualityStatistics,
    statisticsReceivablePayable
} from "@/api/viewIndex.js";
@@ -417,11 +417,11 @@
const barLegend1 = {
    show: true,
    textStyle: { color: '#B8C8E0' },
    data: ['总收入', '总支出', '净收入']
    data: ['待生产', '生产中', '已生产']
}
const barSeries11 = ref([
    {
        name: '总收入',
        name: '待生产',
        type: 'bar',
        barGap: 0,
        emphasis: {
@@ -443,7 +443,7 @@
        data: []
    },
    {
        name: '总支出',
        name: '生产中',
        type: 'bar',
        emphasis: {
            focus: 'series'
@@ -464,7 +464,7 @@
        data: []
    },
    {
        name: '净收入',
        name: '已生产',
        type: 'bar',
        emphasis: {
            focus: 'series'
@@ -649,6 +649,15 @@
        barSeries11.value[2].data = res.data.netIncome
    })
}
// 财务统计
const productionStatisticsInfo = () => {
    productionStatistics().then((res) => {
        xAxis3.value[0].data = res.data.days
        barSeries11.value[0].data = res.data.totalIncome
        barSeries11.value[1].data = res.data.totalExpense
        barSeries11.value[2].data = res.data.netIncome
    })
}
const getNum = () => {
    const params = {
        pageNum: -1,
@@ -672,10 +681,14 @@
    getLedgerPage(params).then((res) => {
        equipmentNum.value = res.data.total
    });
    getRepairPage(params).then((res) => {
    getRepairPage({pageNum: -1,
        pageSize: -1, status: 0}).then((res) => {
            console.log(999,res)
        equipmentRepair.value = res.data.total
    });
    getUpkeepPage(params).then((res) => {
    getUpkeepPage({pageNum: -1,
        pageSize: -1, status: 0}).then((res) => {
        console.log(123,res)
        equipmentMaintain.value = res.data.total
    });
    measuringInstrumentListPage(params).then((res) => {
@@ -982,6 +995,7 @@
  window.addEventListener('resize', handleResize)
  analysisCustomer()
  qualityStatisticsInfo()
    productionStatisticsInfo()
    accountStatisticsInfo()
  getNum()
  getLedgerNum()

 src/views/reportAnalysis/projectProfit/index.vue

@@ -64,11 +64,11 @@
      align: "center",
      prop: "customerName",
    },
    {
      label: "项目名称",
      align: "center",
      prop: "projectName",
    },
    // {
    //   label: "项目名称",
    //   align: "center",
    //   prop: "projectName",
    // },
    {
      label: "合同金额",
      align: "center",

 src/views/salesManagement/invoiceLedger/index.vue

@@ -33,7 +33,7 @@
        <el-table-column label="销售合同号" prop="salesContractNo" show-overflow-tooltip width="180" />
        <el-table-column label="客户合同号" prop="customerContractNo" show-overflow-tooltip width="180" />
        <el-table-column label="客户名称" prop="customerName" show-overflow-tooltip width="240" />
        <el-table-column label="项目" prop="projectName" width="320" />
        <!-- <el-table-column label="项目" prop="projectName" width="320" /> -->
        <el-table-column label="产品大类" prop="productCategory" width="200" />
        <el-table-column label="规格型号" prop="specificationModel" width="160" show-overflow-tooltip />
        <el-table-column label="发票号" prop="invoiceNo" width="200" show-overflow-tooltip />

 src/views/salesManagement/invoiceRegistration/index.vue

@@ -19,13 +19,13 @@
            clearable
          />
        </el-form-item>
        <el-form-item label="项目名称">
        <!-- <el-form-item label="项目名称">
          <el-input
            v-model="searchForm.projectName"
            placeholder="请输入项目名称"
            clearable
          />
        </el-form-item>
        </el-form-item> -->
        <el-form-item>
          <el-checkbox
            v-model="searchForm.status"
@@ -142,13 +142,14 @@
          show-overflow-tooltip
          width="240"
        />
        <el-table-column label="业务员" prop="salesman" show-overflow-tooltip width="90"/>
        <el-table-column
        <!-- width="90" -->
        <el-table-column label="业务员" prop="salesman" show-overflow-tooltip />
        <!-- <el-table-column
          label="项目名称"
          prop="projectName"
          show-overflow-tooltip
          width="200"
        />
        /> -->
        <el-table-column
          label="合同金额(元)"
          prop="contractAmount"
@@ -217,26 +218,6 @@
        </el-row>
        <el-row :gutter="30">
          <el-col :span="12">
            <el-form-item label="业务员：" prop="salesman">
              <el-input
                v-model="form.salesman"
                placeholder="自动填充"
                disabled
              />
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="项目名称：" prop="projectName">
              <el-input
                v-model="form.projectName"
                placeholder="自动填充"
                disabled
              />
            </el-form-item>
          </el-col>
        </el-row>
        <el-row :gutter="30">
          <el-col :span="12">
            <el-form-item label="录入人" prop="createUer">
              <el-input v-model="form.createUer" placeholder="请输入录入人" />
            </el-form-item>
@@ -276,6 +257,26 @@
              />
            </el-form-item>
          </el-col>
        </el-row>
        <el-row :gutter="30">
          <el-col :span="12">
            <el-form-item label="业务员：" prop="salesman">
              <el-input
                v-model="form.salesman"
                placeholder="自动填充"
                disabled
              />
            </el-form-item>
          </el-col>
          <!-- <el-col :span="12">
            <el-form-item label="项目名称：" prop="projectName">
              <el-input
                v-model="form.projectName"
                placeholder="自动填充"
                disabled
              />
            </el-form-item>
          </el-col> -->
        </el-row>
        <el-row>
          <el-form-item label="产品信息：" prop="entryDate"> </el-form-item>
@@ -438,7 +439,7 @@
    customerName: "",
    status: false,
    customerContractNo: undefined, // 客户合同号
    projectName: undefined, // 项目名称
    // projectName: undefined, // 项目名称
    createUer: undefined, // 登记人
    issueDate: undefined, // 开票日期
    createTime: undefined, // 录入日期：
@@ -447,7 +448,7 @@
    salesLedgerId: "",
    customerName: "",
    salesman: "",
    projectName: "",
    // projectName: "",
    productData: [],
    invoiceNo: "",
    createUer: userStore.nickName,

 src/views/salesManagement/receiptPayment/index.vue

@@ -22,7 +22,7 @@
                prefix-icon="Search"
              />
            </el-form-item>
            <el-form-item label="项目名称">
            <!-- <el-form-item label="项目名称">
              <el-input
                v-model="searchForm.projectName"
                placeholder="请输入"
@@ -30,7 +30,7 @@
                clearable
                prefix-icon="Search"
              />
            </el-form-item>
            </el-form-item> -->
            <el-form-item>
              <el-checkbox
                v-model="searchForm.status"
@@ -166,12 +166,12 @@
          show-overflow-tooltip
          width="240"
        />
        <el-table-column
        <!-- <el-table-column
          label="项目名称"
          prop="projectName"
          show-overflow-tooltip
          width="340"
        />
        /> -->
        <el-table-column
          label="回款状态"
          prop="statusName"
@@ -397,7 +397,7 @@
    status: true,
    customerName: "",
    customerContractNo: "",
    projectName: "",
    // projectName: "",
  },
  form: {
    salesContractNo: "",

 src/views/salesManagement/receiptPaymentHistory/index.vue

@@ -19,7 +19,7 @@
          :prefix-icon="Search"
        />
      </el-form-item>
      <el-form-item label="项目名称">
      <!-- <el-form-item label="项目名称">
        <el-input
          v-model="searchForm.projectName"
          placeholder="输入项目名称"
@@ -27,7 +27,7 @@
          clearable
          :prefix-icon="Search"
        />
      </el-form-item>
      </el-form-item> -->
      <el-form-item label="回款日期">
        <el-date-picker
          v-model="searchForm.receiptPaymentDate"
@@ -94,11 +94,11 @@
    prop: "customerName",
    width:240
  },
  {
    label: "项目名称",
    prop: "projectName",
    width:200
  },
  // {
  //   label: "项目名称",
  //   prop: "projectName",
  //   width:200
  // },
  {
    label: "回款金额（元）",
    prop: "receiptPaymentAmount",
@@ -150,7 +150,7 @@
  receiptPaymentDateStart: undefined,
  receiptPaymentDateEnd: undefined,
  customerContractNo: undefined,
  projectName: undefined,
  // projectName: undefined,
});
const { receipt_payment_type } = proxy.useDict("receipt_payment_type");
const isShowSummarySon = ref(true);

 src/views/salesManagement/salesLedger/index.vue

@@ -14,10 +14,10 @@
          <el-input v-model="searchForm.salesContractNo" placeholder="请输入" clearable prefix-icon="Search"
            @change="handleQuery" />
        </el-form-item>
        <el-form-item label="项目名称：">
        <!-- <el-form-item label="项目名称：">
          <el-input v-model="searchForm.projectName" placeholder="请输入" clearable prefix-icon="Search"
            @change="handleQuery" />
        </el-form-item>
        </el-form-item> -->
        <el-form-item label="录入日期：">
          <el-date-picker v-model="searchForm.entryDate" value-format="YYYY-MM-DD" format="YYYY-MM-DD" type="daterange"
            placeholder="请选择" clearable @change="changeDaterange" />
@@ -63,7 +63,7 @@
        <el-table-column label="客户合同号" prop="customerContractNo" width="180" show-overflow-tooltip />
        <el-table-column label="客户名称" prop="customerName" width="300" show-overflow-tooltip />
        <el-table-column label="业务员" prop="salesman" width="100" show-overflow-tooltip />
        <el-table-column label="项目名称" prop="projectName" width="180" show-overflow-tooltip />
        <!-- <el-table-column label="项目名称" prop="projectName" width="180" show-overflow-tooltip /> -->
        <el-table-column label="付款方式" prop="paymentMethod" show-overflow-tooltip />
        <el-table-column label="合同金额(元)" prop="contractAmount" width="220" show-overflow-tooltip
          :formatter="formattedNumber" />
@@ -120,7 +120,7 @@
            </el-form-item>
          </el-col>
        </el-row>
        <el-row :gutter="30">
        <!-- <el-row :gutter="30">
          <el-col :span="12">
            <el-form-item label="项目名称：" prop="projectName">
              <el-input v-model="form.projectName" placeholder="请输入" clearable :disabled="operationType === 'view'" />
@@ -132,7 +132,7 @@
                                                            format="YYYY-MM-DD" type="date" placeholder="请选择" clearable :disabled="operationType === 'view'" />
                        </el-form-item>
                    </el-col>
        </el-row>
        </el-row> -->
        <el-row :gutter="30">
                    <el-col :span="12">
                        <el-form-item label="录入人：" prop="entryPerson">
@@ -156,6 +156,12 @@
              <el-input v-model="form.paymentMethod" placeholder="请输入" clearable :disabled="operationType === 'view'" />
            </el-form-item>
          </el-col>
          <el-col :span="12">
                        <el-form-item label="签订日期：" prop="executionDate">
                            <el-date-picker style="width: 100%" v-model="form.executionDate" value-format="YYYY-MM-DD"
                                                            format="YYYY-MM-DD" type="date" placeholder="请选择" clearable :disabled="operationType === 'view'" />
                        </el-form-item>
                    </el-col>
        </el-row>
        <el-row>
          <el-form-item label="产品信息：" prop="entryDate">
@@ -516,7 +522,7 @@
    customerName: "", // 客户名称
    customerContractNo: "", // 客户合同编号
    salesContractNo: "", // 销售合同编号
    projectName: "", // 项目名称
    // projectName: "", // 项目名称
    entryDate: null, // 录入日期
    entryDateStart: undefined,
    entryDateEnd: undefined,
@@ -526,7 +532,7 @@
    salesman: "",
    customerContractNo: "",
    customerId: "",
    projectName: "",
    // projectName: "",
    entryPerson: "",
    entryDate: "",
    maintenanceTime: "",
@@ -540,7 +546,7 @@
      { required: true, message: "请输入", trigger: "blur" },
    ],
    customerId: [{ required: true, message: "请选择", trigger: "change" }],
    projectName: [{ required: true, message: "请输入", trigger: "blur" }],
    // projectName: [{ required: true, message: "请输入", trigger: "blur" }],
    entryPerson: [{ required: true, message: "请选择", trigger: "change" }],
    entryDate: [{ required: true, message: "请选择", trigger: "change" }],
    executionDate: [{ required: true, message: "请选择", trigger: "change" }],