| src/components/makepager/CommonFormTableView.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/components/makepager/FormBtnsView.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/operate/inventoryAdjustment/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/overview/AddOverviewDialog.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/productManage/product/AddProductDialog.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/reportForm/inventoryReport/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/warehouseManage/bussinessType/AddBussinessType.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/warehouseManage/bussinessType/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/warehouseManage/listingRules/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/components/makepager/CommonFormTableView.vue
@@ -9,7 +9,9 @@ > <el-table :data="tableList.tableData" border style="width: 100%" :height="'calc(100% - 0px)'" :class="{ setHeight: isinventory || islistingrules }" :header-cell-style="{ background: '#f1f3f8', color: '#000009' }" :row-class-name="tableRowClassName" @@ -552,9 +554,12 @@ .custom-name { display: flex; justify-content: center; font-size: 12px; line-height: 17px; font-family: PingFangSC; .common-select-btn { margin-left: 5px; font-size: 18px; font-size: 13px; cursor: pointer; } } @@ -564,21 +569,22 @@ .el-form-item__label { display: none; } .el-form-item__content { // height: 28px; /* 设置高度 */ line-height: 22px; /* 设置行高 */ } .el-table__footer-wrapper tbody td.el-table__cell { background-color: #fff; // text-align: right; font-weight: bold; } .el-input--suffix .el-input__inner { padding-right: 0px; } .el-table .cell, .el-table th.el-table__cell > .cell { padding: 0 5px; } .el-input__inner { text-align: left; } // .el-input__inner { // text-align: left; // } } ::v-deep .el-table .cell { @@ -596,27 +602,5 @@ padding: 6px 0 !important; height: 35px; text-align: center; } ::v-deep { .el-table .cell .el-button--text.el-button--small { padding: 4px 0; } } ::v-deep .el-table .el-table__cell { padding: 6px 0 !important; height: 35px; text-align: center; } .overSpread1 { width: 100%; height: 100%; position: fixed; top: 0; left: 0; background: rgba(0, 0, 0, 0); z-index: 10; } </style> src/components/makepager/FormBtnsView.vue
@@ -7,17 +7,20 @@ <div class="right-label">额外的价格</div> </div> </div> --> <div v-if="!showProduct && !showWarehouse && !showPosition && !addProduct" class="sub-number left_border no-cursor"> <div v-if="!showProduct && !showWarehouse && !showPosition && !addProduct" class="sub-number left_border cursor_pointer" @click="inLibraryClick()" > <div class="left"><i class="el-icon-present"></i></div> <div class="right"> <div class="right-label">{{ countObject.inLibrary + "件" }}</div> <div class="right-label">{{ (countObject?.inLibrary ?? 0) + "件" }}</div> <div class="right-label">在库</div> </div> </div> <div v-if="!showProduct && !showWarehouse && !showPosition && !addProduct" class="sub-number no-cursor"> <div class="left"><i class="el-icon-present"></i></div> <div class="right"> <div class="right-label">{{ countObject.forecast + "件" }}</div> <div class="right-label">{{ (countObject?.forecast ?? 0) + "件" }}</div> <div class="right-label">预测</div> </div> </div> @@ -29,8 +32,8 @@ > <div class="left icon-view"><i class="el-icon-sort"></i></div> <div class="right"> <div class="right-label">{{ "进: " + countObject.enter }}</div> <div class="right-label">{{ "出: " + countObject.exit }}</div> <div class="right-label">{{ "进: " + (countObject?.enter ?? 0) }}</div> <div class="right-label">{{ "出: " + (countObject?.exit ?? 0) }}</div> </div> </div> <!-- <div @@ -48,14 +51,14 @@ <div v-if="!showProduct && !showWarehouse && !showPosition" class="sub-number no-cursor"> <div class="left"><i class="el-icon-refresh"></i></div> <div class="right"> <div class="right-label">{{ countObject.reorderRule }}</div> <div class="right-label">{{ (countObject?.reorderRule ?? 0) }}</div> <div class="right-label">重订货规则</div> </div> </div> <div v-if="showProduct" class="sub-number left_border yes-cursor" @click="productClick"> <div class="left"><i class="el-icon-s-fold"></i></div> <div class="right"> <div class="right-label">{{ countObject.product }}</div> <div class="right-label">{{ (countObject?.product ?? 0) }}</div> <div class="right-label">产品</div> </div> </div> @@ -146,6 +149,10 @@ // 产品 productClick() { this.$emit("productClick") }, // 在库 inLibraryClick(){ this.$emit("inLibraryClick") } } } src/views/operate/inventoryAdjustment/index.vue
@@ -25,7 +25,7 @@ @tableRowClick="tableRowClick" > <template slot="tableButton"> <el-table-column label="操作" width="180" fixed="right" align="center"> <el-table-column label="操作" width="180" align="center"> <template slot-scope="scope"> <span v-if="scope.row.isEdit" @click.stop="handleHistoryClick(scope.row)" class="yes-cursor"> <i class="el-icon-refresh-left"></i> @@ -125,7 +125,8 @@ ...item, isSet: false, isEdit: true, editable: true editable: true, adjustAmount: 0 } }) this.tableList.tableData = list || [] @@ -152,7 +153,7 @@ this.operationId = 0 this.currentRowId = 0 this.countId++ this.tableData.push({ this.tableData.unshift({ countId: this.countId, amount: 0, adjustAmount: 0, @@ -212,7 +213,7 @@ item.isEdit = true }) } else { this.tableData.splice(this.tableData.length - 1, 1) this.tableData.splice(0, 1) } this.addTitle = "新建" this.showDiscard = false src/views/overview/AddOverviewDialog.vue
@@ -29,7 +29,6 @@ label-position="right" label-width="120px" size="mini" style="height: 60vh; overflow-x: hidden" > <div> <!-- <div>aaa</div> --> @@ -164,62 +163,58 @@ </el-select> </el-form-item> </el-col> </el-row> </div> <div class="bottom"> <el-tabs v-model="activeName" type="card"> <!-- <el-tab-pane v-if="workType !== 1" label="详情" name="detail"> </el-tab-pane> --> <el-tab-pane label="操作" name="first"> </el-tab-pane> <el-tab-pane label="其他信息" name="second"> <div class="purchase-view"> <div class="left"> <!-- <div class="second-label">其他信息</div> --> <!-- <el-form-item v-if="workType !== 1" label="送货策略" prop="client_name"> <el-select v-model="editConfig.infomation.memberId" placeholder="请选择" size="mini" style="width: 90%" :disabled="!showFooter" > <el-option v-for="item in memberOptions" :key="item.id" :label="item.username" :value="item.id"> </el-option> </el-select> </el-form-item> --> <el-form-item label="负责人" prop="contacterName"> <el-select v-model="editConfig.infomation.contacterName" placeholder="请选择" size="mini" style="width: 90%" :disabled="!showFooter" @change="contacterChange" > <el-option v-for="item in memberOptions" :key="item.id" :label="item.name" :value="{ value: item.id, label: item.name }" > </el-option> </el-select> </el-form-item> </div> <div class="right"></div> </div> </el-tab-pane> <el-tab-pane label="备注" name="third"> <el-col :span="12"> <el-form-item label="负责人" prop="contacterName"> <el-select v-model="editConfig.infomation.contacterName" placeholder="请选择" size="mini" style="width: 90%" :disabled="!showFooter" @change="contacterChange" > <el-option v-for="item in memberOptions" :key="item.id" :label="item.name" :value="{ value: item.id, label: item.name }" > </el-option> </el-select> </el-form-item> </el-col> <!-- <el-col :span="12"> <el-form-item v-if="workType !== 1" label="送货策略" prop="client_name"> <el-select v-model="editConfig.infomation.memberId" placeholder="请选择" size="mini" style="width: 90%" :disabled="!showFooter" > <el-option v-for="item in memberOptions" :key="item.id" :label="item.username" :value="item.id"> </el-option> </el-select> </el-form-item> </el-col> --> <el-col :span="24"> <el-form-item label="备注" prop="comment"> <el-input v-model.trim="editConfig.infomation.comment" size="mini" type="textarea" style="width: 85%" :autosize="{ minRows: 8 }" style="width: 96%" :autosize="{ minRows: 3 }" :disabled="!showFooter" ></el-input> </el-form-item> </el-tab-pane> </el-col> </el-row> </div> <div class="bottom"> <el-tabs v-model="activeName" type="card"> <!-- <el-tab-pane v-if="workType !== 1" label="详情" name="detail"> </el-tab-pane> --> <el-tab-pane label="产品" name="first"> </el-tab-pane> </el-tabs> <!-- 操作 --> <div v-if="activeName === 'first'"> @@ -759,8 +754,8 @@ border-bottom: none; } .el-tabs__item.is-active { color: #fff; background: #2a78fb; color: #333; background: #f1f3f8; } .el-tabs__item { height: 30px; @@ -768,5 +763,8 @@ font-size: 13px; background: #f3f3f3; } .el-tabs__header { margin: 0 0 1px; } } </style> src/views/productManage/product/AddProductDialog.vue
@@ -39,7 +39,9 @@ <FormBtnsView :add-product="addProduct" @inOutBoundClick="inOutBoundClick" @inLibraryClick="inLibraryClick" :show-procure="showProcure" :countObject="statisticsMap" :show-sale="showSale" /> <div class="bottom"> @@ -524,7 +526,10 @@ { name: "辅料", id: "辅料" }, { name: "耗材", id: "耗材" }, { name: "其他", id: "其他" } ] ], statisticsMap: { inLibrary: 0 // 在库 } } }, created() { @@ -532,6 +537,7 @@ this.getProductList() this.setTableForm() this.setBottonView() this.statisticsMap.inLibrary = this.editConfig?.infomation?.amount ?? 0 }, methods: { // 获取产品类别 @@ -724,6 +730,19 @@ }) } }, // 在库点击 inLibraryClick(){ if (this.editConfig.title !== "新建") { console.log(this.editConfig.infomation) this.$router.push({ name: "inventoryReport", params: { name: this.editConfig.infomation.name, id: this.editConfig.infomation.id } }) } }, // 可销售/可采购 checkboxChange(val, param) { if (val === "采购") { src/views/reportForm/inventoryReport/index.vue
@@ -332,6 +332,7 @@ async getData() { let params = { categoryIds: this.categoryListId, keyWord:this.productName, page: this.pagerOptions.currPage, pageSize: this.pagerOptions.pageSize, warehouseCode: this.warehouseListName src/views/warehouseManage/bussinessType/AddBussinessType.vue
@@ -36,7 +36,7 @@ <div class="basic-info-view"> <div class="purchase-view"> <div class="left"> <el-form-item label="入库类型" prop="name"> <el-form-item label="业务类型" prop="name"> <el-input v-model="editConfig.infomation.name" placeholder="请填写" @@ -56,30 +56,25 @@ </el-option> </el-select> </el-form-item> <el-form-item label="序号前缀" prop="prefix"> <el-input v-model="editConfig.infomation.prefix" placeholder="" :disabled="!showFooter" style="width: 100%" ></el-input> </el-form-item> <el-form-item label="仓库" prop="warehouseId"> <el-form-item label="默认源位置" prop="defaultLocationSrcId"> <el-select v-model="editConfig.infomation.warehouseId" v-model="editConfig.infomation.defaultLocationSrcId" placeholder="请选择" size="mini" style="width: 100%" :disabled="!showFooter" > <el-option v-for="item in warehouseList" :key="item.id" :label="item.name" :value="item.id"> <el-option v-for="item in positionlist" :key="item.id" :label="item.name" :value="item.id"> </el-option> </el-select> </el-form-item> <el-form-item label="默认源位置" prop="defaultLocationSrcId"> <el-form-item v-if="editConfig.infomation.baseOperationType !== 1" label="默认目的位置" prop="defaultLocationDestId" > <el-select v-model="editConfig.infomation.defaultLocationSrcId" v-model="editConfig.infomation.defaultLocationDestId" placeholder="请选择" size="mini" style="width: 100%" @@ -104,7 +99,54 @@ </el-form-item> --> </div> <div class="right"> <el-form-item label="序号前缀" prop="prefix"> <el-input v-model="editConfig.infomation.prefix" placeholder="" :disabled="!showFooter" style="width: 100%" ></el-input> </el-form-item> <el-form-item v-if="editConfig.infomation.baseOperationType !== 1" label="保留方式" prop="reservationMethod" > <el-radio-group v-model="editConfig.infomation.reservationMethod" :disabled="!showFooter"> <el-radio v-for="item in reservationMethodList" :key="item.id" :value="item.id" :label="item.id" >{{ item.name }} </el-radio> </el-radio-group> </el-form-item> <el-form-item label="仓库" prop="warehouseId"> <el-select v-model="editConfig.infomation.warehouseId" placeholder="请选择" size="mini" style="width: 100%" :disabled="!showFooter" > <el-option v-for="item in warehouseList" :key="item.id" :label="item.name" :value="item.id"> </el-option> </el-select> </el-form-item> <el-form-item v-if="editConfig.infomation.baseOperationType === 1" label="默认目的位置" prop="defaultLocationDestId" > <el-select v-model="editConfig.infomation.defaultLocationDestId" placeholder="请选择" size="mini" style="width: 100%" :disabled="!showFooter" > <el-option v-for="item in positionlist" :key="item.id" :label="item.name" :value="item.id"> </el-option> </el-select> </el-form-item> <!-- <el-form-item v-if="editConfig.infomation.baseOperationType" label="退货类型" prop="returnOperationTypeID" @@ -146,32 +188,7 @@ prop="earlyOperations" > <el-checkbox v-model="editConfig.infomation.earlyOperations" :disabled="!showFooter"></el-checkbox> </el-form-item> <el-form-item v-if="editConfig.infomation.baseOperationType !== 1" label="保留方式" prop="reservationMethod" > <el-radio-group v-model="editConfig.infomation.reservationMethod" :disabled="!showFooter"> <!-- <div style="margin-top: 8px"> --> <el-radio v-for="item in reservationMethodList" :key="item.id" :value="item.id" :label="item.id" >{{ item.name }} </el-radio> <!-- </div> --> </el-radio-group> </el-form-item> <el-form-item label="默认目的位置" prop="defaultLocationDestId"> <el-select v-model="editConfig.infomation.defaultLocationDestId" placeholder="请选择" size="mini" style="width: 100%" :disabled="!showFooter" > <el-option v-for="item in positionlist" :key="item.id" :label="item.name" :value="item.id"> </el-option> </el-select> </el-form-item> </el-form-item> --> </div> </div> </div> @@ -179,7 +196,6 @@ </el-form> <!-- 尾 --> <div slot="footer" class="dialog-footer"> <!-- <el-button type="primary" size="small" @click="editConfig.visible = false">保并提交审批</el-button> --> <el-button type="primary" size="small" @click="saveClick('form')" :disabled="!showFooter">保存</el-button> <el-button size="small" @click="editConfig.visible = false">取消</el-button> </div> @@ -217,7 +233,7 @@ dialogWidth: "50%", editConfig: this.editCommonConfig, rules: { // 入库类型 // 业务类型 name: [{ required: true, message: "请输入", trigger: "change" }], // 前缀 prefix: [{ required: true, message: "请输入", trigger: "change" }], @@ -310,7 +326,7 @@ let data = JSON.parse(JSON.stringify(this.editConfig.infomation)) let params = { // 入库类型 // 业务类型 name: data.name, // 前缀 prefix: data.prefix, src/views/warehouseManage/bussinessType/index.vue
@@ -3,7 +3,7 @@ <div class="top"> <SearchCommonView :add-title="'新建'" :placeholder="'请输入入库类型'" :placeholder="'请输入业务类型'" :amount-view="false" @addCommonClick="addBtnClick" @searchClick="getList" @@ -77,7 +77,7 @@ console.log(showcol) let tableColumn = [ { label: "入库类型", label: "业务类型", prop: "name", isShowColumn: true, default: true src/views/warehouseManage/listingRules/index.vue
@@ -23,11 +23,11 @@ @selProductClick="selProductClick" > <template slot="tableButton"> <el-table-column label="操作" width="90" fixed="right" align="center"> <el-table-column label="操作" width="90" align="center"> <template slot-scope="scope"> <el-button v-if="scope.row.isEdit" @click.stop="delClick(scope)" type="text" size="small" >删除</el-button > <span v-if="scope.row.isEdit" @click.stop="delClick(scope)" class="yes-cursor"> <span style="color: #2a78fb">删除</span> </span> </template> </el-table-column> </template> @@ -155,7 +155,7 @@ this.isRowClick = false this.currentRowId = 0 this.countId++ this.tableData.push({ this.tableData.unshift({ countId: this.countId, areaId: 0, areaName: "", @@ -201,9 +201,9 @@ }).then((res) => { console.log(res) if (res.code === 200) { this.getData() let tipStr = this.currentRowId === 0 ? "添加成功" : "修改成功" this.$message.success(tipStr) this.getData() } }) } @@ -227,7 +227,7 @@ item.isEdit = true }) } else { this.tableData.splice(this.tableData.length - 1, 1) this.tableData.splice(0, 1) } this.addTitle = "新建" this.showDiscard = false
