From 43b705c29b0e089bdc1cf1cc9076b83f500b1ff5 Mon Sep 17 00:00:00 2001 From: zouyu <2723363702@qq.com> Date: 星期四, 14 十二月 2023 11:31:47 +0800 Subject: [PATCH] modified: src/const/crud/customerOrder/customerOrderForm.js modified: src/views/plan/customerorder/sample-customerorder-form.vue modified: src/views/technology/structure/single-structure-form.vue --- src/views/plan/customerorder/sample-customerorder-form.vue | 268 +++++++++++------------------------------------------ 1 files changed, 55 insertions(+), 213 deletions(-) diff --git a/src/views/plan/customerorder/sample-customerorder-form.vue b/src/views/plan/customerorder/sample-customerorder-form.vue index 8a89e4c..8b895f7 100644 --- a/src/views/plan/customerorder/sample-customerorder-form.vue +++ b/src/views/plan/customerorder/sample-customerorder-form.vue @@ -51,14 +51,6 @@ <el-input v-model="dataForm.entityName" placeholder=""></el-input> </el-form-item> </el-col> - <!-- <el-col :span="6"> - <el-form-item label="浜嬩笟閮�" prop="salesDepartment"> - <el-input - v-model="dataForm.salesDepartment" - placeholder="" - ></el-input> - </el-form-item> - </el-col> --> <el-col :span="6"> <el-form-item label="鐪佷唤" prop="province"> <el-input v-model="dataForm.province" placeholder=""></el-input> @@ -156,6 +148,7 @@ </el-divider> <div> <avue-crud ref="crud" + class="l-mes" show-hide="false" :option="option" :data="tableData"> @@ -175,196 +168,6 @@ </template> </avue-crud> </div> - <!-- <div class="l-mes normal-form"> - <el-row :gutter="20"> - <el-col :span="2"> - <span>闆朵欢鍙�</span> - </el-col> - <el-col :span="6"> - <el-input - v-model="dataForm.customerOrder.partNo" - placeholder="" - readonly - > - <el-button - slot="append" - icon="el-icon-search" - @click="openPartDialog()" - ></el-button> - </el-input> - </el-col> - <el-col :span="2"> - <span>鍗曚綅</span> - </el-col> - <el-col :span="6"> - <el-select - v-model="dataForm.customerOrder.unit" - placeholder="" - style="width: 100%" - > - <el-option - v-for="item in units" - :key="item.value" - :label="item.label" - :value="item.value" - /> - </el-select> - </el-col> - <el-col :span="2"> - <span>鏁伴噺</span> - </el-col> - <el-col :span="6"> - <el-input - v-model="dataForm.customerOrder.buyQtyDue" - placeholder="" - ></el-input> - </el-col> - </el-row> - <el-row :gutter="20"> - <el-col :span="2"> - <span>鐢靛帇绛夌骇</span> - </el-col> - <el-col :span="6"> - <el-input - v-model="dataForm.customerOrder.voltAgeClass" - placeholder="" - ></el-input> - </el-col> - <el-col :span="2"> - <span>浜у搧鍚嶇О</span> - </el-col> - <el-col :span="6"> - <el-input - v-model="dataForm.customerOrder.productName" - placeholder="" - ></el-input> - </el-col> - <el-col :span="2"> - <span>鍒堕�犲睘鎬�</span> - </el-col> - <el-col :span="6"> - <el-select - v-model="dataForm.customerOrder.manufactureAttr" - placeholder="" - style="width: 100%" - disabled - > - <el-option - v-for="item in manufactureAttrs" - :key="item.value" - :label="item.label" - :value="item.value" - /> - </el-select> - </el-col> - </el-row> - <el-row :gutter="20"> - <el-col :span="2"> - <span>澶栨姢棰滆壊</span> - </el-col> - <el-col :span="6"> - <el-input - v-model="dataForm.customerOrder.outerColor" - placeholder="" - ></el-input> - </el-col> - <el-col :span="2"> - <span>闆朵欢瑙勬牸</span> - </el-col> - <el-col :span="6"> - <el-input - v-model="dataForm.customerOrder.customerPartSpec" - placeholder="" - ></el-input> - </el-col> - <el-col :span="2"> - <span>鍖呰瑕佹眰</span> - </el-col> - <el-col :span="6"> - <el-input - v-model="dataForm.customerOrder.packageRequire" - placeholder="" - ></el-input> - </el-col> - </el-row> - <el-row :gutter="20"> - <el-col :span="2"> - <span>璐ㄩ噺瑕佹眰</span> - </el-col> - <el-col :span="6"> - <el-input - v-model="dataForm.customerOrder.qualityRequire" - placeholder="" - ></el-input> - </el-col> - <el-col :span="2"> - <span>鐢熶骇闇�姹傝鏄�</span> - </el-col> - <el-col :span="6"> - <el-input - v-model="dataForm.customerOrder.otherProductRequire" - placeholder="" - ></el-input> - </el-col> - <el-col :span="2"> - <span>绯荤粺</span> - </el-col> - <el-col :span="6"> - <el-input - v-model="dataForm.customerOrder.divisionSystem" - placeholder="" - ></el-input> - </el-col> - </el-row> - <el-row :gutter="20"> - <el-col :span="2"> - <span>鏀惰揣鍦板潃</span> - </el-col> - <el-col :span="6"> - <el-input - v-model="dataForm.customerOrder.shippingAddress" - placeholder="" - ></el-input> - </el-col> - <el-col :span="2"> - <span>涓氬姟鍛�</span> - </el-col> - <el-col :span="6"> - <el-select v-model="dataForm.customerOrder.salesmanName" style="width:100%"> - <el-option v-for="(item,index) in staffOptions" :key="index" :value="item.staff_no" :label="item.staffName"/> - </el-select> - </el-col> - <el-col :span="2"> - <span>鐩橀暱瑕佹眰</span> - </el-col> - <el-col :span="6"> - <el-input - v-model="dataForm.customerOrder.lengthRequirement" - placeholder="" - ></el-input> - </el-col> - </el-row> - <el-row :gutter="20"> - <el-col :span="2"> - <span>澶囨敞</span> - </el-col> - <el-col :span="6"> - <el-input - v-model="dataForm.customerOrder.remark" - placeholder="" - ></el-input> - </el-col> - <el-col :span="2"> - <span>浜у搧绫诲瀷</span> - </el-col> - <el-col :span="6"> - <el-input - v-model="dataForm.customerOrder.productType" - placeholder="" - ></el-input> - </el-col> - </el-row> - </div> --> <span slot="footer" class="dialog-footer"> <el-button @click="visible = false">鍙栨秷</el-button> @@ -400,6 +203,30 @@ line-height: 28px; color: #c0c4cc; margin: -1px 0; +} +.l-mes .el-input-group__append, +.l-mes .el-input-group__prepend { + padding: 0; + border-top: none; + border-right: none; + border-left: none; + border-radius: 0; + background-color: transparent; +} + +.l-mes .el-input-group__append .el-button, +.l-mes .el-input-group__prepend .el-button { + padding: 0; + width: 25px; + border: none !important; + line-height: 28px; + color: #c0c4cc; + margin: -1px 0; +} + +.l-mes .el-input-group__append .el-button i, +.l-mes .el-input-group__prepend .el-button i { + vertical-align: middle; } </style> <script> @@ -538,23 +365,39 @@ }, // 琛ㄥ崟鎻愪氦 dataFormSubmit() { - this.buttonDisable = true - this.$refs.dataForm.validate((valid) => { - this.dataForm.customerOrderVOList = this.tableData + const _than = this + let isError = false + _than.buttonDisable = true + _than.tableData.forEach(ele=>{ + if(ele.buyQtyDue==null || ele.buyQtyDue=='' || ele.buyQtyDue==undefined){ + _than.$message.error("闆朵欢鏁伴噺涓嶈兘涓虹┖!") + isError = true + }else{ + var reg = /^\d+$/ + if(!reg.test(ele.buyQtyDue)){ + _than.$message.error("闆朵欢鏁伴噺绫诲瀷蹇呴』鏄暟瀛�!") + isError = true + } + } + }) + if(isError){ + _than.buttonDisable = false + return + } + _than.$refs.dataForm.validate((valid) => { if (valid) { - addObj(this.dataForm) - .then((data) => { - this.$message.success('娣诲姞鎴愬姛') - this.initDataForm(); - this.visible = false - this.buttonDisable = false - this.$emit('refreshDataList', 1) - }) - .catch((error) => { - this.buttonDisable = false + _than.dataForm.customerOrderVOList = _than.tableData + addObj(_than.dataForm).then((data) => { + _than.$message.success('娣诲姞鎴愬姛') + _than.initDataForm(); + _than.visible = false + _than.buttonDisable = false + _than.$emit('refreshDataList', 1) + }).catch((error) => { + _than.buttonDisable = false }) } else { - this.buttonDisable = false + _than.buttonDisable = false } }) }, @@ -564,7 +407,6 @@ this.showPart = true }, selectPart(part) { - console.log(part); const index = this.currentSelectRow if (part) { this.tableData[index].partNo = part.partNo -- Gitblit v1.9.3