From dd7fe1db0b9ca604664b59a906545fc1e13d55e2 Mon Sep 17 00:00:00 2001 From: zuozhengqing <a13193816592@163.com> Date: 星期六, 30 三月 2024 10:37:08 +0800 Subject: [PATCH] 入库出库修改列表状态 --- src/views/overview/AddOverviewDialog.vue | 791 ++++++++++++++++++++++++++++++++++++++++--------------- 1 files changed, 571 insertions(+), 220 deletions(-) diff --git a/src/views/overview/AddOverviewDialog.vue b/src/views/overview/AddOverviewDialog.vue index 9845bf6..e84bc86 100644 --- a/src/views/overview/AddOverviewDialog.vue +++ b/src/views/overview/AddOverviewDialog.vue @@ -10,7 +10,7 @@ <div slot="title" class="dialog-header"> <span>{{ editCommonConfig.title === "鏌ョ湅" ? editCommonConfig.title : editCommonConfig.title + addName }}</span> <div class="header_btns"> - <span class="btn" @click="btnPrint"> + <span class="btn" :style="{ cursor: thatCursor, color: thatColor }" @click="btnPrint" :disabled="true"> <i class="el-icon-printer"></i> <span>鎵撳嵃</span> </span> @@ -18,7 +18,15 @@ <i class="el-icon-s-tools"></i> <span>鍔ㄤ綔</span> </span> - <el-button v-if="showEdit" :disabled="this.editConfig.infomation.status===5" plain size="mini" style="margin-left: 15px" @click="editClick">缂栬緫</el-button> + <el-button + v-if="showEdit" + :disabled="this.editConfig.infomation.status === 5" + plain + size="mini" + style="margin-left: 15px" + @click="editClick" + >缂栬緫</el-button + > </div> </div> <!-- 鍐呭 --> @@ -48,9 +56,29 @@ <div class="basic-info-view"> <el-row> <el-col :span="12"> + <el-form-item prop="number"> + <span slot="label">{{ workType === 1 ? "鍏ュ簱" : workType === 2 ? "鍑哄簱" : "璋冩嫧" }}鍗曞彿</span> + <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-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 prop="companyName"> <span slot="label">{{ workType === 1 ? "渚涘簲鍟�" : workType === 2 ? "瀹㈡埛" : "鑱旂郴浜�" }}</span> - + <el-select v-if="workType === 1" v-model="editConfig.infomation.companyName" @@ -94,7 +122,7 @@ :disabled="!showFooter" @change="companyChange" > - <el-option + <el-option v-for="item in companyOptions" :key="item.id" :label="item.name" @@ -102,7 +130,6 @@ > </el-option> </el-select> - </el-form-item> </el-col> <!-- <el-col :span="12"> @@ -176,38 +203,20 @@ </el-form-item> </el-col> <el-col :span="12"> - <el-form-item v-if="workType !== 1" label="婧愪綅缃�" prop="fromLocationId"> + <el-form-item :label="workType === 1 ? '浠撳簱浣嶇疆' : '璋冨嚭浣嶇疆'" prop="location"> <el-select - v-model="editConfig.infomation.fromLocationId" + @change="rootLocationChange" + v-model="editConfig.infomation.location" placeholder="璇烽�夋嫨" size="mini" style="width: 90%" :disabled="!showFooter" > <el-option - v-for="item in toLocationOptions" + v-for="item in formLocationOptions" :key="item.id" :label="item.jointName" - :value="item.id" - > - </el-option> - </el-select> - </el-form-item> - </el-col> - <el-col :span="12"> - <el-form-item v-if="workType !== 2" label="浠撳簱浣嶇疆" prop="toLocationId"> - <el-select - v-model="editConfig.infomation.toLocationId" - placeholder="璇烽�夋嫨" - size="mini" - style="width: 90%" - :disabled="!showFooter" - > - <el-option - v-for="item in toLocationOptions" - :key="item.id" - :label="item.jointName" - :value="item.id" + :value="{ label: item.jointName, value: item.id }" > </el-option> </el-select> @@ -228,6 +237,26 @@ :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" v-if="workType === 3"> + <el-form-item label="璋冨叆浣嶇疆" prop="toLocation"> + <el-select + @change="toLocationChange" + v-model="editConfig.infomation.toLocation" + placeholder="璇烽�夋嫨" + size="mini" + style="width: 90%" + :disabled="!showFooter" + > + <el-option + v-for="item in toLocationOptions" + :key="item.id" + :label="item.jointName" + :value="{ label: item.jointName, value: item.id }" > </el-option> </el-select> @@ -265,77 +294,118 @@ <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="two" v-if="this.workType===2"></el-tab-pane> + <el-tab-pane label="鐗╂祦淇℃伅" name="two" v-if="this.workType === 2"></el-tab-pane> </el-tabs> <!-- 鎿嶄綔 --> <div v-if="activeName === 'first'"> <CommonFormTableView + ref="tableView" + :islistingrules="true" + :addTypeIdMultiple="true" :product-table-list="productTableList" :detail-enter="!showFooter" @inputContent="inputContent" @addProductClick="addProductClick('鎿嶄綔')" + @getSelectArray="getSelectArray" + @emptyProductClick="emptyProductClick" + @clearupProduct="clearupProduct" > <template v-if="showFooter" slot="tableButton"> <el-table-column label="鎿嶄綔" width="60" fixed="right" align="center"> <template slot-scope="scope"> - <div @click="handleDelClick(scope, '鎿嶄綔')"> + <!-- <div @click="handleDelClick(scope, '鎿嶄綔')"> <i class="el-icon-delete"></i> - </div> + </div> --> + <el-button type="text" size="small" @click.stop="handleDelClick(scope, '鎿嶄綔')">鍒犻櫎</el-button> </template> </el-table-column> </template> </CommonFormTableView> </div> <!-- 鐗╂祦淇℃伅 --> - <div v-if="activeName==='two'&&this.workType===2"> - <el-form - label-position="right" - :model="shipmentsInfo" + <div v-if="activeName === 'two' && this.workType === 2"> + <el-form + :rules="rules2" + ref="shipmentsInfo" + label-position="right" + :model="editConfig.infomation" label-width="120px" size="mini" - style="margin-top: 20px;" + style="margin-top: 20px" > <el-col :span="12"> - <el-form-item label="鎵胯繍鍟�" > - <el-select - size="mini" :disabled="!showFooter" v-model="editConfig.infomation.logisticCompanyId" placeholder="璇烽�夋嫨" style="width: 90%;"> + <el-form-item label="鎵胯繍鍟�"> + <el-select + size="mini" + :disabled="!showFooter" + v-model="editConfig.infomation.logisticCompanyId" + placeholder="璇烽�夋嫨" + style="width: 90%" + > <el-option - v-for="item in shipmentsInfo.carrier" + v-for="item in editConfig.infomation.carrier" :key="item.id" :label="item.name" - :value="item.id"> + :value="item.id" + > </el-option> </el-select> </el-form-item> </el-col> <el-col :span="12"> - <el-form-item label="杩愬崟鍙�" > - <el-input style="width: 90%;" :disabled="!showFooter" v-model="editConfig.infomation.waybillNumber"></el-input> + <el-form-item label="杩愬崟鍙�"> + <el-input + style="width: 90%" + :disabled="!showFooter" + v-model="editConfig.infomation.waybillNumber" + ></el-input> </el-form-item> </el-col> <el-col :span="12"> <el-form-item label="鏀惰揣浜�"> - <el-input style="width: 90%;" :disabled="!showFooter" v-model="editConfig.infomation.receiverName"></el-input> + <el-input + style="width: 90%" + :disabled="!showFooter" + v-model="editConfig.infomation.receiverName" + ></el-input> </el-form-item> </el-col> <el-col :span="12"> - <el-form-item label="鑱旂郴鐢佃瘽"> - <el-input style="width: 90%;" :disabled="!showFooter" v-model="editConfig.infomation.receiverPhone"></el-input> + <el-form-item label="鑱旂郴鐢佃瘽" prop="receiverPhone"> + <el-input + style="width: 90%" + :disabled="!showFooter" + v-model="editConfig.infomation.receiverPhone" + ></el-input> </el-form-item> </el-col> <el-col :span="12"> <el-form-item label="鏀惰揣鍦板潃"> - <el-input style="width: 90%;" :disabled="!showFooter" v-model="editConfig.infomation.receiverAddr"></el-input> + <el-input + style="width: 90%" + :disabled="!showFooter" + v-model="editConfig.infomation.receiverAddr" + ></el-input> </el-form-item> </el-col> <el-col :span="12"> <el-form-item label="閲嶉噺"> - <el-input style="width: 90%;" :disabled="!showFooter" v-model="editConfig.infomation.weight"></el-input> + <el-input + style="width: 90%" + :disabled="!showFooter" + type="number" + v-model="editConfig.infomation.weight" + ></el-input> </el-form-item> </el-col> <el-col :span="12"> <el-form-item label="鐗╂祦閲嶉噺"> - <el-input style="width: 90%;" :disabled="!showFooter" v-model="editConfig.infomation.logisticWeight"></el-input> + <el-input + style="width: 90%" + :disabled="!showFooter" + type="number" + v-model="editConfig.infomation.logisticWeight" + ></el-input> </el-form-item> </el-col> </el-form> @@ -365,7 +435,7 @@ <!-- 灏� --> <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 type="primary" size="small" @click="saveClick" :disabled="!showFooter">淇濆瓨</el-button> <el-button size="small" @click="editConfig.visible = false">鍙栨秷</el-button> </div> </el-dialog> @@ -385,9 +455,11 @@ getLogisticCompanyList, printReceipts } from "@/api/overview/overview" -import { getSupplierList,getCompanyList,getClientList } from "@/api/common/other" +import { getSupplierList, getCompanyList, getClientList } from "@/api/common/other" +import codeMixin from "@/views/overview/mixin/codeMixin" export default { name: "AddOverviewDialog", + mixins: [codeMixin], props: { editCommonConfig: { type: Object, @@ -402,7 +474,10 @@ }, workType: { type: Number, - default: 1 + default: function () { + // return JSON.parse(window.sessionStorage.getItem('paramsData')).workType|| 1; + return 1 + } }, addName: { type: String, @@ -422,15 +497,27 @@ rules: { sourceNumber: [{ required: true, message: "璇疯緭鍏ユ潵婧愬崟鎹�", trigger: "blur" }], operationDate: [{ required: true, message: "璇烽�夋嫨鏃ユ湡", trigger: "change" }], - toLocationId: [{ required: true, message: "璇烽�夋嫨浠撳簱浣嶇疆", trigger: "change" }], - fromLocationId: [{ required: true, message: "璇烽�夋嫨婧愪綅缃�", trigger: "change" }], - operationTypeId: [{ required: true, message: "璇烽�夋嫨鍏ュ簱绫诲瀷", trigger: "change" }] + toLocation: [{ required: true, message: "璇烽�夋嫨浣嶇疆", trigger: "change" }], + location: [{ required: true, message: "璇烽�夋嫨璋冨嚭浣嶇疆", trigger: "change" }], + operationTypeId: [{ required: true, message: "璇烽�夋嫨鍏ュ簱绫诲瀷", trigger: "change" }], + number: [{ required: true, validator: this.validateCheckCode, trigger: ["change", "blur"] }] + }, + rules2: { + receiverPhone: [ + // {required: true, message: "璇疯緭鍏ユ墜鏈哄彿", trigger: "change" }, + { + pattern: /^1(3\d|4[5-9]|5[0-35-9]|6[2567]|7[0-8]|8\d|9[0-35-9])\d{8}$/, + message: "璇疯緭鍏ユ纭殑鎵嬫満鍙�", + trigger: ["blur", "change"] + } + ] }, companyOptions: [], // 鍏徃 - supplierOptions:[],//渚涘簲鍟� - clientOptions:[],//瀹㈡埛 + supplierOptions: [], //渚涘簲鍟� + clientOptions: [], //瀹㈡埛 memberOptions: [{ id: 1, name: "绠$悊鍛�" }], - toLocationOptions: [], // 婧愪綅缃� 浠撳簱浣嶇疆 + formLocationOptions: [], // 璋冨嚭浣嶇疆 + toLocationOptions: [], // 浠撳簱浣嶇疆 showButton: true, activeName: "first", productTableList: {}, @@ -439,7 +526,7 @@ isNoProduct: true, // 娣诲姞鏄庣粏琛屾椂鏄惁鏈変骇鍝佹湭閫夋嫨 showEdit: false, // 鏄惁鏄剧ず缂栬緫鎸夐挳 isDelClick: false, // 鍒犻櫎鎸夐挳鏄惁鍙偣鍑� - isCancel:false, //楠岃瘉鎸夐挳鏄惁鍙偣鍑� + isCancel: false, //楠岃瘉鎸夐挳鏄惁鍙偣鍑� showFooter: false, // 鏄惁鏄剧ず鍙栨秷淇濆瓨 currentState: "todo", // 褰撳墠鐘舵�� detailTableList: {}, @@ -453,13 +540,17 @@ isValidateClick: false, // 楠岃瘉鏄惁鏄剧ず operationTypeOptions: [], // 鍏ュ簱绫诲瀷鍒楄〃 shipmentsInfo: { - carrier:[], - waybillNumber:'', - weight:0, - logisticWeight:0, + carrier: [], + waybillNumber: "", + weight: 0, + logisticWeight: 0, + receiverPhone: "" }, - showCancel:false, // 鍙栨秷鏄惁鍙互鏄剧ず - list:[], + showCancel: false, // 鍙栨秷鏄惁鍙互鏄剧ず + list: [], + pdfParams: {}, + thatCursor: this.workType === 3 ? "no-drop" : "pointer", + thatColor: this.workType === 3 ? "#ccc" : "#000" } }, created() { @@ -469,25 +560,42 @@ this.setBottonView() this.setDetailTableForm() this.getLocationList() - this.receiptType = this.editConfig.title === "鏌ョ湅" ? this.editConfig.infomation.operationTypeName : this.addName + this.receiptType = + this.editConfig.title === "鏌ョ湅" || this.editConfig.title === "缂栬緫" + ? this.editConfig.infomation.operationTypeName + : this.addName if (this.showOperationType) { this.getListTransfer() } this.getLogisticCompanyList() + this.formInfo() + if (this.editConfig.title === "鏌ョ湅" || this.editConfig.title === "缂栬緫") { + setTimeout(() => { + this.$refs.tableView.setLocationList(this.editConfig.infomation.location.label) + }, 100) + } }, + mounted() {}, methods: { - setStatusList(){ - console.log(this.editConfig.infomation,"edit") - if(this.editConfig.infomation.status===5){ - this.list=[ + formInfo() { + this.objCode.type = this.workType === 1 ? "鍏ュ簱缂栫爜" : this.workType === 2 ? "鍑哄簱缂栫爜" : "璋冩嫧缂栫爜" + this.objCode.codeStandID = "" + if (this.editConfig.infomation.codeStandardID) { + this.objCode.codeStandID = this.editConfig.infomation.codeStandardID + } + this.getRCodeStandardList() + }, + setStatusList() { + if (this.editConfig.infomation.status === 5) { + this.list = [ { label: "鑽夌", status: "todo", value: 1 }, { label: "姝e湪绛夊緟", status: "todo", value: 2 }, { label: "灏辩华", status: "todo", value: 3 }, { label: "瀹屾垚", status: "todo", value: 4 }, { label: "宸插彇娑�", status: "todo", value: 5 } ] - }else{ - this.list=[ + } else { + this.list = [ { label: "鑽夌", status: "todo", value: 1 }, { label: "姝e湪绛夊緟", status: "todo", value: 2 }, { label: "灏辩华", status: "todo", value: 3 }, @@ -497,34 +605,45 @@ }, // 鑾峰彇鍏徃鍒楄〃 async getCompanyList() { - if(this.workType === 1){ + if (this.workType === 1) { await getSupplierList().then((res) => { console.log(res) if (res.code === 200) { this.supplierOptions = res.data } }) - }else if(this.workType === 2){ + } else if (this.workType === 2) { await getClientList().then((res) => { console.log(res) if (res.code === 200) { this.clientOptions = res.data } }) - }else{ + } else { await getCompanyList().then((res) => { console.log(res) if (res.code === 200) { this.companyOptions = res.data } }) - } + } }, - // 鑾峰彇浠撳簱浣嶇疆鍒楄〃 + // 鑾峰彇璋冨嚭浣嶇疆/浠撳簱浣嶇疆鍒楄〃 async getLocationList() { await getLocationList({ keyWord: "", jointName: this.editConfig.code, + page: 0, + pageSize: 0 + }).then((res) => { + console.log(res) + if (res.code === 200) { + this.formLocationOptions = res.data + } + }) + await getLocationList({ + keyWord: "", + // jointName: this.editConfig.code, page: 0, pageSize: 0 }).then((res) => { @@ -573,13 +692,13 @@ this.showFooter = false if (this.editConfig.infomation.status === "瀹屾垚") { this.isValidateClick = false - }else if(this.editConfig.infomation.status === 3){ + } else if (this.editConfig.infomation.status === 3) { this.isValidateClick = true - this.showCancel=true - }else if(this.editConfig.infomation.status===5){ - this.isCancel=true - this.isValidateClick=true - }else{ + this.showCancel = true + } else if (this.editConfig.infomation.status === 5) { + this.isCancel = true + this.isValidateClick = true + } else { this.isValidateClick = true } } else if (this.editConfig.infomation.status === 4 || this.editConfig.infomation.status === "瀹屾垚") { @@ -589,7 +708,7 @@ this.showFooter = false this.isValidateClick = false } else if (this.editConfig.infomation.status === 5) { - this.isCancel=true + this.isCancel = true this.showButton = true this.showEdit = false this.showFooter = false @@ -600,7 +719,7 @@ this.showEdit = true this.showFooter = false this.isValidateClick = true - this.showCancel=true + this.showCancel = true } if (this.editConfig.title === "鏂板缓") { this.list[0].status = "active" @@ -626,17 +745,27 @@ this.showFooter = true this.setTableForm() }, - async getLogisticCompanyList(){ + async getLogisticCompanyList() { await getLogisticCompanyList().then((res) => { - if(res.code===200){ - this.shipmentsInfo.carrier=res.data + if (res.code === 200) { + this.editConfig.infomation.carrier = res.data } }) }, // 淇濆瓨 - saveClick(formName) { - this.$refs[formName].validate((valid) => { - if (valid) { + saveClick() { + let validArr = [] + if (this.workType === 2) { + console.log("鍑哄簱") + validArr = [this.$refs.form.validate()] + } else { + console.log("鍏ュ簱") + validArr = [this.$refs.form.validate()] + } + console.log(validArr, "xxx") + Promise.all(validArr) + .then((results) => { + console.log(results, "鎵ц鎴愬姛", this.tableData) for (let i = 0; i < this.tableData.length; i++) { if (this.tableData[i].productName.length === 0) { this.isNoProduct = true @@ -648,21 +777,112 @@ if (this.isNoProduct) { this.$message.error("璇锋坊鍔犳槑缁嗚鎴栭�夋嫨浜у搧涓嶈兘涓虹┖") } else { - let requestUrl = this.editConfig.title === "鏂板缓" ? addOperation : updateOperation let params = this.saveParams() + // if(this.workType===2){ + // params.details.map((item)=>{ + // item.fromLocationId=item.fromLocationId.value + // }) + // }else if(this.workType===3){ + // params.details.map((item)=>{ + // item.fromLocationId=item.fromLocationId.value + // item.toLocationId=item.toLocationId.value + // }) + // } + // 浜у搧鍒楄〃瑙f瀯 + if (this.editConfig.title === "缂栬緫" || this.editConfig.title === "鏌ョ湅") { + let arr = [] + if (this.workType === 1) { + params.details.map((item) => { + arr.push({ + operationId: item.operationId, + amount: item.amount, + productId: item.productId + }) + }) + params.details = arr + } else if (this.workType === 2) { + params.details.map((item) => { + if (item.fromLocationId.value) { + arr.push({ + operationId: item.operationId, + amount: item.amount, + fromLocationId: item.fromLocationId.value, + productId: item.productId + }) + } else { + arr.push({ + operationId: item.operationId, + amount: item.amount, + fromLocationId: item.fromLocation.id, + productId: item.productId + }) + } + }) + params.details = arr + } else if (this.workType === 3) { + console.log(params.details, "鐪嬬湅") + params.details.map((item) => { + arr.push({ + operationId: item.operationId, + amount: item.amount, + fromLocationId: item.fromLocationId.value ? item.fromLocationId.value : item.fromLocation.id, + toLocationId: item.toLocationId.value ? item.toLocationId.value : item.toLocation.id, + productId: item.productId + }) + // if(item.fromLocationId.value){ + // arr.push({ + // operationId:item.operationId, + // amount:item.amount, + // fromLocationId:item.fromLocationId.value, + // toLocationId:item.toLocation.id, + // productId:item.productId, + // }) + // }else{ + // arr.push({ + // operationId:item.operationId, + // amount:item.amount, + // fromLocationId:item.fromLocation.id, + // toLocationId:item.toLocation.id, + // productId:item.productId, + // }) + // } + }) + params.details = arr + } + } else if (this.editConfig.title === "鏂板缓") { + if (this.workType === 2) { + params.details.map((item) => { + item.fromLocationId = item.fromLocationId.value + }) + } else if (this.workType === 3) { + params.details.map((item) => { + item.fromLocationId = item.fromLocationId.value + item.toLocationId = item.toLocationId.value + }) + } + } + let requestUrl = this.editConfig.title === "鏂板缓" ? addOperation : updateOperation + // let params = this.saveParams() requestUrl({ ...params }).then((res) => { - console.log(res) this.editConfig.visible = false if (res.code === 200) { - this.$message.success("娣诲姞鎴愬姛") + if (this.editConfig.title === "鏂板缓") { + this.$message.success("娣诲姞鎴愬姛") + } else { + this.$message.success("缂栬緫鎴愬姛") + } this.$parent.getData() + } else { + this.$message.success(res.msg) } }) } - } - }) + }) + .catch((error) => { + console.error("琛ㄥ崟鏍¢獙鏈�氳繃:", error) + }) }, saveParams() { let data = this.editConfig.infomation @@ -681,30 +901,59 @@ contacterID = Object.keys(this.contacterObj).length === 0 ? data.contacterID : this.contacterObj.value contacterName = Object.keys(this.contacterObj).length === 0 ? data.contacterName : this.contacterObj.label } - let params = { - baseOperationType: data.baseOperationType, - comment: data.comment || "", - companyID: companyID, - companyName: companyName, - contacterID: contacterID, - contacterName: contacterName, - details: this.tableData, - fromLocationId: data.fromLocationId || 0, - id: data.id, - number: data.number || "", - operationDate: data.operationDate || "", - operationTypeId: this.showOperationType ? data.operationTypeId : this.editConfig.operationTypeId, - operationTypeName: this.receiptType, - sourceNumber: data.sourceNumber || "", - status: 3, - toLocationId: data.toLocationId || 0, - waybillNumber:data.waybillNumber||'', - weight:data.weight||0, - logisticWeight:data.logisticWeight||0, - logisticCompanyId:data.logisticCompanyId, - receiverAddr:data.receiverAddr||'', - receiverName:data.receiverName||'', - receiverPhone:data.receiverPhone||'' + let params = {} + if (this.workType === 1 || this.workType === 2) { + params = { + baseOperationType: data.baseOperationType, + comment: data.comment || "", + companyID: companyID, + companyName: companyName, + contacterID: contacterID, + contacterName: contacterName, + details: this.tableData, + locationId: data.location.value || 0, + id: data.id, + number: data.number || "", + operationDate: data.operationDate || "", + operationTypeId: this.showOperationType ? data.operationTypeId : this.editConfig.operationTypeId, + operationTypeName: this.receiptType, + sourceNumber: data.sourceNumber || "", + status: 3, + // toLocationId: data.toLocation.value||0, + waybillNumber: data.waybillNumber || "", + weight: data.weight || 0, + logisticWeight: data.logisticWeight || 0, + logisticCompanyId: data.logisticCompanyId, + receiverAddr: data.receiverAddr || "", + receiverName: data.receiverName || "", + receiverPhone: data.receiverPhone || "" + } + } else if (this.workType === 3) { + params = { + baseOperationType: data.baseOperationType, + comment: data.comment || "", + companyID: companyID, + companyName: companyName, + contacterID: contacterID, + contacterName: contacterName, + details: this.tableData, + locationId: data.location.value || 0, + id: data.id, + number: data.number || "", + operationDate: data.operationDate || "", + operationTypeId: this.showOperationType ? data.operationTypeId : this.editConfig.operationTypeId, + operationTypeName: this.receiptType, + sourceNumber: data.sourceNumber || "", + status: 3, + toLocationId: data.toLocation.value || 0, + waybillNumber: data.waybillNumber || "", + weight: data.weight || 0, + logisticWeight: data.logisticWeight || 0, + logisticCompanyId: data.logisticCompanyId, + receiverAddr: data.receiverAddr || "", + receiverName: data.receiverName || "", + receiverPhone: data.receiverPhone || "" + } } return params }, @@ -730,6 +979,7 @@ return { ...item, productName: item.product.name, + productId: item.product.id, unit: item.product.unit } }) @@ -738,23 +988,48 @@ this.tableData = [] } // this.tableData = this.editConfig.title !== "鏂板缓" ? list : [] + let tableColumnArr = [] + if (this.workType === 1) { + tableColumnArr = [ + { label: "浜у搧鍚嶇О", prop: "productName", productName: true, isRequird: true }, + { label: "浜у搧缂栫爜", prop: "productId" }, + { label: "璁¢噺鍗曚綅", prop: "unit" }, + { label: "浜у搧瑙勬牸", prop: "specs" }, + { label: "浜у搧鍨嬪彿", prop: "model" }, + { label: "鏁伴噺", prop: "amount", inputFloat: true } + ] + } else if (this.workType === 2) { + tableColumnArr = [ + { label: "浜у搧鍚嶇О", prop: "productName", productName: true, isRequird: true }, + { label: "浜у搧缂栫爜", prop: "productId" }, + { label: "璁¢噺鍗曚綅", prop: "unit" }, + { label: "浜у搧瑙勬牸", prop: "specs" }, + { label: "浜у搧鍨嬪彿", prop: "model" }, + { label: "璋冨叆浣嶇疆", prop: "fromLocationId", sonLocation: true, isRequird: true }, + { label: "鏁伴噺", prop: "amount", inputFloat: true } + ] + } else if (this.workType === 3) { + tableColumnArr = [ + { label: "浜у搧鍚嶇О", prop: "productName", productName: true, isRequird: true }, + { label: "浜у搧缂栫爜", prop: "productId" }, + { label: "璁¢噺鍗曚綅", prop: "unit" }, + { label: "浜у搧瑙勬牸", prop: "specs" }, + { label: "浜у搧鍨嬪彿", prop: "model" }, + { label: "璋冨叆浣嶇疆", prop: "fromLocationId", sonLocation: true, isRequird: true }, + { label: "璋冨嚭浣嶇疆", prop: "toLocationId", toLocation: true, isRequird: true }, + { label: "鏁伴噺", prop: "amount", inputFloat: true } + ] + } this.productTableList = { tableData: this.tableData, - tableColumn: [ - { label: "浜у搧", prop: "productName", productName: true, isRequird: true }, - // { label: "璇存槑", prop: "number", input: true }, - // { label: "鏃ユ湡", prop: "amount", date: true, isRequird: true }, - // { label: "鎴鏃ユ湡", prop: "price", date: true }, - { label: "鏁伴噺", prop: "amount", inputFloat: true }, - { label: "璁¢噺鍗曚綅", prop: "unit" } - ] + tableColumn: tableColumnArr } }, // 鎿嶄綔杈撳叆 inputContent(val, prop, row) { this.countId = row.countId this.tableData.map((item) => { - if (item.countId === row.countId) { + if (item.id === row.id) { item[prop] = val } }) @@ -762,56 +1037,92 @@ // 鏂板 addProductClick(value) { console.log(value) - if (value === "鎿嶄綔") { - console.log(this.tableData) - for (let i = 0; i < this.tableData.length; i++) { - if (this.tableData[i].productName.length === 0) { - this.isNoProduct = false - break - } else { - this.isNoProduct = true - } - } - if (this.isNoProduct) { - this.countId++ - this.tableData.push({ - countId: this.countId, - productId: "", - amount: 0, - unit: "", - productName: "" - }) - } - } else { - console.log(this.detailTableData) - for (let i = 0; i < this.detailTableData.length; i++) { - if (this.detailTableData[i].name.length === 0) { - this.isNoDetail = true - break - } else { - this.isNoDetail = false - } - } - if (!this.isNoDetail) { - this.detailId++ - this.detailTableData.push({ - detailId: this.detailId, - id: 0, - amount: 0, - desc: "", - name: "", - number: "", - price: 0, - total: 0 - }) - } + // if (value === "鎿嶄綔") { + // console.log(this.tableData) + // for (let i = 0; i < this.tableData.length; i++) { + // if (this.tableData[i].productName.length === 0) { + // this.isNoProduct = false + // break + // } else { + // this.isNoProduct = true + // } + // } + // if (this.isNoProduct) { + // this.countId++ + // this.tableData.push({ + // countId: this.countId, + // productId: "", + // amount: 0, + // unit: "", + // productName: "" + // }) + // } + // } else { + // console.log(this.detailTableData) + // for (let i = 0; i < this.detailTableData.length; i++) { + // if (this.detailTableData[i].name.length === 0) { + // this.isNoDetail = true + // break + // } else { + // this.isNoDetail = false + // } + // } + // if (!this.isNoDetail) { + // this.detailId++ + // this.detailTableData.push({ + // detailId: this.detailId, + // id: 0, + // amount: 0, + // desc: "", + // name: "", + // number: "", + // price: 0, + // total: 0 + // }) + // } + // } + }, + // 鏂板鏂瑰紡淇敼 + getSelectArray(val, index) { + if (this.tableData.length == 1 && this.tableData[0].number.length == 0) { + this.tableData = [] } + if (index < this.tableData.length) { + this.tableData.splice(index, 1) + val.map((item, ind) => { + this.tableData.splice(index + ind, 0, item) + }) + } else { + this.tableData = this.tableData.concat(val) + } + console.log(this.tableData) + let list = this.tableData.map((res) => { + return { + ...res, + amount: 1, + productName: res.name, + productId: res.id + } + }) + this.tableData = list + this.productTableList.tableData = list + // this.showSummary.show = true + }, + // 浜у搧娓呯┖ + emptyProductClick() { + this.tableData = [] + this.productTableList.tableData = this.tableData + }, + clearupProduct(data) { + this.tableData = data + this.productTableList.tableData = this.tableData }, // 鍒犻櫎 handleDelClick(scope, value) { - console.log(scope) if (value === "鎿嶄綔") { this.tableData.splice(scope.$index, 1) + this.productTableList.tableData = this.tableData + this.$message.success("鍒犻櫎鎴愬姛锛�") } else { this.detailTableData.splice(scope.$index, 1) } @@ -873,50 +1184,72 @@ }, // 鍙栨秷 - btnCancel(){ - this.$confirm('纭畾鍙栨秷鍚楋紵', '鎻愮ず', { - confirmButtonText: '纭畾', - cancelButtonText: '鍙栨秷', - type: 'warning' - }).then(() => { - stateCancel(this.editConfig.infomation.id).then((res) => { - console.log(res) - this.editConfig.visible = false - if (res.code === 200) { - this.$message.success("鍙栨秷璋冩嫧") - this.$parent.getData() - } - }) - this.list.map((item) => { - if (item.label==="宸插彇娑�") { - item.status = "active" - } else { - item.status = "todo" - } - }) - }).catch(() => { - }); - }, - //鎵撳嵃 - async btnPrint(){ - await printReceipts(this.editCommonConfig.infomation.id).then((res) => { - console.log(res) - if (res.code === 200) { - // this.$message.success("鎵撳嵃鎴愬姛") - // const link = document.createElement('a'); - // link.href = res.data; - // link.download = '鍑哄簱鍗�.xlsx'; - // link.click(); - this.$router.push({ - name:"previewExcel", - params:{ - url:res.data, - baseOperationType:this.editConfig.infomation.baseOperationType||undefined, - cutAfterWidth:this.editConfig.infomation.baseOperationType===2?370:325 + btnCancel() { + this.$confirm("纭畾鍙栨秷鍚楋紵", "鎻愮ず", { + confirmButtonText: "纭畾", + cancelButtonText: "鍙栨秷", + type: "warning" + }) + .then(() => { + stateCancel(this.editConfig.infomation.id).then((res) => { + console.log(res) + this.editConfig.visible = false + if (res.code === 200) { + this.$message.success("鍙栨秷璋冩嫧") + this.$parent.getData() } }) + this.list.map((item) => { + if (item.label === "宸插彇娑�") { + item.status = "active" + } else { + item.status = "todo" + } + }) + }) + .catch(() => {}) + }, + //鎵撳嵃 + async btnPrint() { + if (this.workType !== 3) { + localStorage.removeItem("pdfParams") + try { + let res = await printReceipts(this.editCommonConfig.infomation.id) + console.log(res) + if (res.code === 200) { + console.log(this.editConfig.infomation.baseOperationType, "绫诲瀷") + let pdfParams = { + url: res.data, + baseOperationType: this.editConfig.infomation.baseOperationType || undefined, + cutAfterWidth: this.editConfig.infomation.baseOperationType === 2 ? 50.8 : 53.3 + } + var { href } = this.$router.resolve({ + path: "/overview/previewExcel", + query: { + ...pdfParams + } + }) + window.open(href, "_blank") + } + } catch (error) { + console.error(error) } - }) + } + }, + // 璋冨嚭浣嶇疆閫夋嫨 + rootLocationChange(val) { + this.editConfig.infomation.location = val + // this.productTableList.tableData.map((item)=>{ + // console.log(item,"item") + // // item.toLocationId={} + // // item.fromLocationId={} + // }) + this.$refs.tableView.setLocationList(val.label, "fromLocation") + }, + // 浠撳簱浣嶇疆閫夋嫨 + toLocationChange(val) { + this.editConfig.infomation.toLocation = val + this.$refs.tableView.setLocationList(val.label, "toLocation") } } } @@ -929,20 +1262,26 @@ align-items: center; font-size: 14px; color: #333; + .header_btns { margin-left: auto; margin-right: 60px; + .btn { cursor: pointer; } - .btn:nth-of-type(2){ + + .btn:nth-of-type(2) { cursor: no-drop; + color: #ccc; } } } + .content-status { display: flex; } + .basic-info { height: calc(100% - 80px); overflow: auto; @@ -955,34 +1294,42 @@ // margin-top: 20px; // } } + .purchase-view { display: flex; + .left { width: 50%; } + .right { width: 50%; } } + .second-label { margin-left: 20px; border-bottom: 1px solid #d9d9d9; margin-bottom: 10px; } + ::v-deep { .el-dialog__headerbtn { position: absolute; top: 15px; } + .el-button { &:hover { border: 1px solid #dcdfe6; color: #333; } } + .el-tabs--card > .el-tabs__header { border-bottom: none; } + // .el-tabs__item.is-active { // color: #333; // background: #f1f3f8; @@ -993,20 +1340,24 @@ font-size: 13px; background: #f3f3f3; } + .el-tabs__header { margin: 0 0 1px; } - .bottom{ - .el-form{ + + .bottom { + .el-form { // border-top: 1px solid #EBEEF5; } - .el-form-item{ + + .el-form-item { height: 28px; + .el-input { - input{ + input { height: 28px; } - } + } } } } -- Gitblit v1.8.0