From d68b036a3b3c67273b8effa3c9925ef3869a91ba Mon Sep 17 00:00:00 2001 From: haoxuan <haoxuan> Date: 星期三, 07 二月 2024 13:56:50 +0800 Subject: [PATCH] wms项目 wms系统参数设置的页面开发+路由+是否显示表头配置 --- src/views/operate/scrap/AddScrapDialog.vue | 311 ++++++++++++++++++++++++++------------------------- 1 files changed, 159 insertions(+), 152 deletions(-) diff --git a/src/views/operate/scrap/AddScrapDialog.vue b/src/views/operate/scrap/AddScrapDialog.vue index 8e2b8c3..626fb4a 100644 --- a/src/views/operate/scrap/AddScrapDialog.vue +++ b/src/views/operate/scrap/AddScrapDialog.vue @@ -18,14 +18,7 @@ <i class="el-icon-s-tools"></i> <span>鍔ㄤ綔</span> </span> - <el-button - v-if="showEdit" - plain - size="mini" - style="margin-left: 15px" - @click="editClick" - >缂栬緫</el-button - > + <el-button v-if="showEdit" plain size="mini" style="margin-left: 15px" @click="editClick">缂栬緫</el-button> </div> </div> <!-- 鍐呭 --> @@ -51,27 +44,36 @@ <div class="basic-info-view"> <el-row> <el-col :span="12"> - <el-form-item label="浜у搧" prop="productName"> - <el-select - v-model="editConfig.infomation.productName" - placeholder="璇烽�夋嫨" - size="mini" - style="width: 90%" - :disabled="!showFooter" - @change="selProductChange" + <el-form-item label="鎶ュ簾鍗曞彿" prop="number"> + <el-input + style="width: 85%" + v-if=" + editConfig.title == '缂栬緫' || + editConfig.title == '鏌ョ湅' || + (editConfig.title == '鏂板缓' && codenumer && (explain != '' || isIdDisabled)) + " + :disabled="editConfig.title != '鏂板缓'" + v-model="editConfig.infomation.number" + placeholder="璇疯緭鍏ョ紪鐮�" > - <el-option - v-for="item in productOptions" - :key="item.id" - :label="item.name" - :value="{ - value: item.id, - label: item.name, - unit: item.unit, - }" - > - </el-option> - </el-select> + </el-input> + <span v-else-if="editConfig.title == '鏂板缓'" style="color: #f56c6c; width: 85%" + >璇蜂紭鍏堥厤缃紪鐮佽鑼� <el-button type="text" @click="numberClick"> 閰嶇疆瑙勮寖 </el-button></span + > + </el-form-item> + </el-col> + <el-col :span="12"> + <el-form-item label="浜у搧" prop="productName"> + <SimpleSearchInput + :echoValue="editConfig.infomation.productName" + :echoName="editConfig.infomation.productName" + checkedNum="1" + :clearable="true" + @select-user="selProductChange" + :disabled="!showFooter" + style="width: 90%" + > + </SimpleSearchInput> </el-form-item> </el-col> <el-col :span="12"> @@ -83,12 +85,7 @@ style="width: 90%" :disabled="!showFooter" > - <el-option - v-for="item in toLocationOptions" - :key="item.id" - :label="item.name" - :value="item.id" - > + <el-option v-for="item in toLocationOptions" :key="item.id" :label="item.name" :value="item.id"> </el-option> </el-select> </el-form-item> @@ -101,7 +98,7 @@ :min="0" :precision="2" :controls="false" - style="width: 85%" + style="width: 90%" :disabled="!showFooter" ></el-input-number> <span>{{ " " + unit }}</span> @@ -116,12 +113,7 @@ style="width: 90%" :disabled="!showFooter" > - <el-option - v-for="item in toLocationOptions" - :key="item.id" - :label="item.name" - :value="item.id" - > + <el-option v-for="item in toLocationOptions1" :key="item.id" :label="item.name" :value="item.id"> </el-option> </el-select> </el-form-item> @@ -142,27 +134,22 @@ </el-form> <!-- 灏� --> <div slot="footer" class="dialog-footer"> - <el-button - type="primary" - size="small" - @click="saveClick('form')" - :disabled="!showFooter" - >淇濆瓨</el-button - > - <el-button 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> </el-dialog> </div> </template> <script> -import { getProductList } from "@/api/product/product"; -import { getLocationList } from "@/api/overview/overview"; -import { addDisuse, finishDisuse, updateScrap } from "@/api/operate/scrap"; +import { getProductList } from "@/api/product/product" +import { getLocationList } from "@/api/overview/overview" +import { addDisuse, finishDisuse, updateScrap } from "@/api/operate/scrap" +import SimpleSearchInput from "@/components/makepager/SimpleSearchInput" +import codeMixin from "@/views/overview/mixin/codeMixin" export default { name: "AddScrapDialog", + mixins: [codeMixin], props: { editCommonConfig: { type: Object, @@ -170,12 +157,12 @@ return { visible: false, title: "鏂板缓", - infomation: {}, - }; - }, - }, + infomation: {} + } + } + } }, - components: {}, + components: { SimpleSearchInput }, computed: {}, data() { return { @@ -183,182 +170,202 @@ editConfig: this.editCommonConfig, rules: { // 浜у搧锛屾暟閲忓繀濉� - productName: [ - { required: true, message: "璇烽�夋嫨浜у搧", trigger: "change" }, - ], + productName: [{ required: true, validator: this.validatorProduct, trigger: "change" }], amount: [{ required: true, message: "璇疯緭鍏ユ暟閲�", trigger: "blur" }], - fromLocationId: [ - { required: true, message: "璇烽�夋嫨婧愪綅缃�", trigger: "change" }, - ], - toLocationId: [ - { required: true, message: "璇烽�夋嫨鎶ュ簾浣嶇疆", trigger: "change" }, - ], - sourceNumber: [ - { required: true, message: "璇疯緭鍏ユ潵婧愬崟鎹�", trigger: "blur" }, - ], + fromLocationId: [{ required: true, message: "璇烽�夋嫨婧愪綅缃�", trigger: "change" }], + toLocationId: [{ required: true, message: "璇烽�夋嫨鎶ュ簾浣嶇疆", trigger: "change" }], + sourceNumber: [{ required: true, message: "璇疯緭鍏ユ潵婧愬崟鎹�", trigger: "blur" }], + number: [{ required: true, validator: this.validateCheckCode, trigger: ["change", "blur"] }] }, memberOptions: [], productOptions: [], toLocationOptions: [], + toLocationOptions1: [], list: [ { label: "鑽夌", status: "todo", value: 1 }, { label: "灏辩华", status: "todo", value: 3 }, - { label: "瀹屾垚", status: "todo", value: 4 }, + { label: "瀹屾垚", status: "todo", value: 4 } ], showEdit: false, // 鏄惁鏄剧ず缂栬緫鎸夐挳 showFooter: false, // 鏄惁鏄剧ず鍙栨秷淇濆瓨 currentState: "todo", // 褰撳墠鐘舵�� unit: "", showButton: true, - isValidateClick: false, // 楠岃瘉鏄惁鏄剧ず - }; + isValidateClick: false // 楠岃瘉鏄惁鏄剧ず + } }, created() { - this.setBottonView(); - this.getProductList(); - this.getLocationList(); - this.unit = this.editConfig.infomation.unit || ""; + this.setBottonView() + this.getProductList() + this.getLocationList({ + isScrapLocation: true, + page: 0, + pageSize: 0 + }) + this.getLocationList({ + // isScrapLocation: true, + page: 0, + pageSize: 0 + }) + this.unit = this.editConfig.infomation.unit || "" + this.formInfo() }, methods: { + formInfo() { + this.objCode.type = "浠撳簱鎶ュ簾缂栫爜" + this.objCode.codeStandID = "" + if (this.editConfig.infomation.codeStandardID) { + this.objCode.codeStandID = this.editConfig.infomation.codeStandardID + } + this.getRCodeStandardList() + }, // 浜у搧 async getProductList() { await getProductList({ page: 1, - pageSize: 100, + pageSize: 100 }).then((res) => { // console.log(res.data) if (res.code === 200) { if (res.data && res.data.length > 0) { - this.productOptions = res.data; + this.productOptions = res.data } } - }); + }) }, // 鑾峰彇浠撳簱浣嶇疆鍒楄〃 - async getLocationList() { - await getLocationList({ - keyWord: "", - page: 0, - pageSize: 0, - }).then((res) => { - console.log(res); - if (res.code === 200) { - this.toLocationOptions = res.data; - } - }); + async getLocationList(params) { + if(params.isScrapLocation){ + await getLocationList(params).then((res) => { + console.log(res) + if (res.code === 200) { + this.toLocationOptions1 = res.data + } + }) + }else{ + await getLocationList(params).then((res) => { + console.log(res) + if (res.code === 200) { + this.toLocationOptions = res.data + } + }) + } }, // 璁剧疆鍒犻櫎/鎵撳嵃/缂栬緫鏄惁鏄剧ず setBottonView() { - if ( - this.editConfig.title === "鏂板缓" || - this.editConfig.title === "缂栬緫" - ) { - this.showButton = false; - this.showEdit = false; - this.showFooter = true; - this.isValidateClick = false; + if (this.editConfig.title === "鏂板缓" || this.editConfig.title === "缂栬緫") { + this.showButton = false + this.showEdit = false + this.showFooter = true + this.isValidateClick = false } else if (this.editConfig.infomation.status === 4) { - this.showButton = false; - this.showEdit = false; - this.showFooter = false; - this.isValidateClick = false; + this.showButton = false + this.showEdit = false + this.showFooter = false + this.isValidateClick = false } else { - this.showButton = true; - this.showEdit = false; - this.showFooter = false; - this.isValidateClick = true; + this.showButton = true + this.showEdit = false + this.showFooter = false + this.isValidateClick = true } if (this.editConfig.title === "鏂板缓") { - this.list[0].status = "active"; + this.list[0].status = "active" } else { this.list.map((item) => { if (item.value === this.editConfig.infomation.status) { - item.status = "active"; + item.status = "active" } else { - item.status = "todo"; + item.status = "todo" } - }); + }) } }, // 鍏抽棴 handleClose() { - this.editConfig.visible = false; + this.editConfig.visible = false }, // 缂栬緫 editClick() { - this.showEdit = false; - this.showFooter = true; + this.showEdit = false + this.showFooter = true }, // 淇濆瓨 saveClick(formName) { if (this.editCommonConfig.title === "鏂板缓") { this.$refs[formName].validate((valid) => { if (valid) { - this.editConfig.infomation.productId = this.productId; - this.editConfig.infomation.productName = this.productName; - this.editConfig.infomation.unit = this.unit; + this.editConfig.infomation.productId = this.productId + this.editConfig.infomation.productName = this.productName + this.editConfig.infomation.unit = this.unit addDisuse({ - ...this.editConfig.infomation, + ...this.editConfig.infomation }).then((res) => { - console.log(res); - this.editConfig.visible = false; + console.log(res) + this.editConfig.visible = false if (res.code === 200) { - this.$message.success("娣诲姞鎴愬姛"); - this.$parent.getData(); + this.$message.success("娣诲姞鎴愬姛") + this.$parent.getData() } - }); + }) } - }); + }) } else if (this.editCommonConfig.title === "缂栬緫") { this.$refs[formName].validate((valid) => { if (valid) { - this.editConfig.infomation.productId = this.productId; - this.editConfig.infomation.productName = this.productName; - this.editConfig.infomation.unit = this.unit; - updateScrap({ - amount:this.editConfig.infomation.amount, //鏁伴噺 - baseOperationType: 1, + let params = { + amount: this.editConfig.infomation.amount, + baseOperationType: this.editConfig.infomation.baseOperationType, fromLocationId: this.editConfig.infomation.fromLocationId, id: this.editConfig.infomation.id, number: this.editConfig.infomation.number, - operationDate:this.editConfig.infomation.operationDate, + operationDate: this.editConfig.infomation.operationDate, productId: this.editConfig.infomation.productId, sourceNumber: this.editConfig.infomation.sourceNumber, status: this.editConfig.infomation.status, - toLocationId: this.editConfig.infomation.toLocationId, - }).then((res) => { - console.log(res); - this.editConfig.visible = false; + toLocationId: this.editConfig.infomation.toLocationId + } + updateScrap(params).then((res) => { + console.log(res) + this.editConfig.visible = false if (res.code === 200) { - this.$message.success("淇敼鎴愬姛"); - this.$parent.getData(); + this.$message.success("淇敼鎴愬姛") + this.$parent.getData() } - }); + }) } - console.log(this.editConfig.infomation, "鐪嬬湅鏄暐"); - }); + }) } }, // 閫夋嫨浜у搧 selProductChange(val) { - this.unit = val.unit; - this.productName = val.label; - this.productId = val.value; + this.unit = val.unit + this.productName = val.name + this.productId = val.id + this.editConfig.infomation.productName = val.name }, // 楠岃瘉 async validateClick() { - console.log(this.editConfig.infomation.id, "xxx"); + console.log(this.editConfig.infomation.id, "xxx") await finishDisuse(this.editConfig.infomation.id).then((res) => { - console.log(res); - this.editConfig.visible = false; + console.log(res) + this.editConfig.visible = false if (res.code === 200) { - this.$message.success("楠岃瘉鎴愬姛"); - this.$parent.getData(); + this.$message.success("楠岃瘉鎴愬姛") + this.$parent.getData() } - }); + }) }, - }, -}; + // 浜у搧鍗曠嫭鏍¢獙 + validatorProduct(rule, value, callback) { + if (this.editConfig.infomation.productName && this.editConfig.infomation.productName.length > 0) { + callback() + } else { + callback(new Error("璇烽�夋嫨浜у搧")) + } + } + } +} </script> <!-- Add "scoped" attribute to limit CSS to this component only --> -- Gitblit v1.8.0