| src/views/procurementManagement/procurementLedger/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/salesManagement/salesLedger/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/views/procurementManagement/procurementLedger/index.vue
@@ -26,13 +26,13 @@ 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" @@ -125,10 +125,10 @@ prop="supplierName" width="160" show-overflow-tooltip /> <el-table-column label="项目名称" <!-- <el-table-column label="项目名称" prop="projectName" width="320" show-overflow-tooltip /> show-overflow-tooltip /> --> <el-table-column label="审批状态" prop="approvalStatus" width="100" @@ -240,16 +240,14 @@ </el-select> </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" placeholder="请输入" clearable /> </el-form-item> </el-col> </el-row> <el-row :gutter="30"> </el-col> --> <el-col :span="12"> <el-form-item label="付款方式"> <el-input v-model="form.paymentMethod" @@ -257,6 +255,8 @@ clearable /> </el-form-item> </el-col> </el-row> <el-row :gutter="30"> <el-col :span="12"> <el-form-item label="签订日期：" prop="executionDate"> @@ -269,8 +269,6 @@ clearable /> </el-form-item> </el-col> </el-row> <el-row :gutter="30"> <el-col :span="12"> <el-form-item label="录入人：" prop="recorderId"> @@ -285,6 +283,8 @@ </el-select> </el-form-item> </el-col> </el-row> <el-row :gutter="30"> <el-col :span="12"> <el-form-item label="录入日期：" prop="entryDate"> @@ -852,16 +852,16 @@ currentTemplateId.value = matchedTemplate.id; // 选中已有模板时，不应视为“模板名称重复导致不可保存” isTemplateNameDuplicate.value = false; // 如果找到模板，只赋值供应商、项目名称、付款方式和产品信息 // 如果找到模板，只赋值供应商、付款方式和产品信息 if (matchedTemplate.supplierId) { form.value.supplierId = matchedTemplate.supplierId; } if (matchedTemplate.supplierName) { form.value.supplierName = matchedTemplate.supplierName; } if (matchedTemplate.projectName) { form.value.projectName = matchedTemplate.projectName; } // if (matchedTemplate.projectName) { // form.value.projectName = matchedTemplate.projectName; // } if (matchedTemplate.paymentMethod) { form.value.paymentMethod = matchedTemplate.paymentMethod; } @@ -898,7 +898,7 @@ supplierName: "", // 供应商名称 purchaseContractNumber: "", // 采购合同编号 salesContractNo: "", // 销售合同编号 projectName: "", // 项目名称 // projectName: "", // 项目名称 entryDate: null, // 录入日期 entryDateStart: undefined, entryDateEnd: undefined, @@ -906,7 +906,7 @@ form: { purchaseContractNumber: "", salesLedgerId: "", projectName: "", // projectName: "", recorderId: "", entryDate: "", productData: [], @@ -923,9 +923,9 @@ approverId: [ { required: true, message: "请选择审批人", trigger: "change" }, ], 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" }], @@ -1132,7 +1132,7 @@ supplierId: form.value.supplierId, paymentMethod: form.value.paymentMethod, recorderId: form.value.recorderId, projectName: form.value.projectName, // projectName: form.value.projectName, approveUserIds: approveUserIds, templateName: templateName.value.trim(), }; src/views/salesManagement/salesLedger/index.vue
@@ -10,10 +10,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" /> @@ -111,7 +111,7 @@ <el-table-column label="销售合同号" prop="salesContractNo" 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" /> @@ -168,26 +168,24 @@ </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 :disabled="operationType === 'view'" /> </el-form-item> </el-col> </el-row> <el-row :gutter="30"> <el-col :span="12"> <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-col :span="12"> <el-form-item label="项目名称：" prop="projectName"> <el-input v-model="form.projectName" placeholder="请输入" clearable :disabled="operationType === 'view'" /> </el-form-item> </el-col> --> </el-row> <el-row :gutter="30"> <el-col :span="12"> <el-form-item label="付款方式"> <el-input v-model="form.paymentMethod" placeholder="请输入" clearable :disabled="operationType === 'view'" /> </el-form-item> </el-col> </el-row> <el-row :gutter="30"> <el-col :span="12"> <el-form-item label="录入人：" prop="entryPerson"> <el-select v-model="form.entryPerson" @@ -198,21 +196,21 @@ </el-select> </el-form-item> </el-col> </el-row> <el-row :gutter="30"> <el-col :span="12"> <el-form-item label="录入日期：" prop="entryDate"> <el-date-picker style="width: 100%" v-model="form.entryDate" value-format="YYYY-MM-DD" format="YYYY-MM-DD" type="date" placeholder="请选择" clearable /> </el-form-item> </el-col> </el-row> <el-row :gutter="30"> <el-col :span="12"> <el-col :span="12"> <el-form-item label="交货日期：" prop="entryDate"> <el-date-picker style="width: 100%" v-model="form.deliveryDate" value-format="YYYY-MM-DD" format="YYYY-MM-DD" type="date" placeholder="请选择" clearable /> </el-form-item> </el-col> </el-row> </el-row> <el-row> <el-form-item label="产品信息：" prop="entryDate"> <el-button v-if="operationType !== 'view'" type="primary" @click="openProductForm('add')">添加</el-button>
