From 41e0df8413624e6034c967f3afae30da59370879 Mon Sep 17 00:00:00 2001 From: zouyu <2723363702@qq.com> Date: 星期一, 11 十二月 2023 16:20:15 +0800 Subject: [PATCH] modified: src/components/verifition/Verify/VerifyPoints.vue modified: src/const/crud/admin/sys-public-param.js modified: src/page/full-screen/fullScreenPlus.vue modified: src/page/index/logo.vue modified: src/page/index/sidebar/sidebarItem.vue modified: src/page/login/index.vue modified: src/page/login/thirdpartylogin.vue modified: src/util/elAttr.js modified: src/views/accounting/unitworkfactor/unitworkfactor-form.vue modified: src/views/accounting/unitworkfactor/updateQuota-form.vue modified: src/views/basic/discmaintenance/discmaintenance-form.vue modified: src/views/basic/log/index.vue modified: src/views/basic/part/part-form.vue modified: src/views/basic/part/print-label-form.vue modified: src/views/basic/poc/index.vue modified: src/views/basic/tabletest/index.vue modified: src/views/basic/template/index.vue modified: src/views/basic/template/template-form.vue modified: src/views/basic/workstation/workstation-form.vue modified: src/views/common/custom-table.vue modified: src/views/common/documentDetail.vue modified: src/views/common/operationParamTemplate.vue modified: src/views/common/rawMaterial-part.vue modified: src/views/common/search-select.vue modified: src/views/common/ztt-table.vue modified: src/views/huawei/code19bind/list.vue modified: src/views/huawei/code19gen/form.vue modified: src/views/huawei/grossweightcode/list.vue modified: src/views/huawei/grossweightcode/task-secret-form.vue modified: src/views/oa/JiegouModal.vue modified: src/views/oa/PeizhiModal.vue modified: src/views/oa/technology-document-new.vue modified: src/views/oa/technology-document.vue modified: src/views/plan/customer/index.vue modified: src/views/plan/customerorder/confirm-pull-customerorder.vue modified: src/views/plan/customerorder/customerorder-config-history.vue modified: src/views/plan/customerorder/customerorder-form.vue modified: src/views/plan/customerorder/customerorder-return.vue modified: src/views/plan/customerorder/customerorder-ztt-table.vue modified: src/views/plan/customerorder/index.vue modified: src/views/plan/customerorder/other-customer-order-line.vue modified: src/views/plan/customerorder/sample-customerorder-form.vue modified: src/views/plan/customerorder/schedule-table.vue modified: src/views/plan/manufacturingorder/auto-operationtask.vue modified: src/views/plan/manufacturingorder/customerorder.vue modified: src/views/plan/manufacturingorder/customize-param-template.vue modified: src/views/plan/manufacturingorder/order-operation-form.vue modified: src/views/plan/manufacturingorder/productorder-form.vue modified: src/views/plan/manufacturingorderapply/index.vue modified: src/views/plan/masterproductionschedule/auto-manufacturingorder.vue modified: src/views/plan/operationtask/gantt.vue modified: src/views/plan/operationtask/operationtask-form.vue modified: src/views/plan/operationtask/task-material.vue modified: src/views/plan/productionschedul/index.vue modified: src/views/plan/productionschedul/template-form.vue modified: src/views/plan/schedule/gantt.vue modified: src/views/plan/schedulelookover/ganttview.vue modified: src/views/plan/segmentmerge/index.vue modified: src/views/plan/segmentmerge/operate-dialog.vue modified: src/views/plan/segmentmerge/operation-technology-form.vue modified: src/views/product/dutyrecord/index.vue modified: src/views/product/producttraceability/index.vue modified: src/views/product/producttraceability/traceability-diagram.vue modified: src/views/product/workbench/batchproductout-form-new.vue modified: src/views/product/workbench/batchproductout-form.vue modified: src/views/product/workbench/feed-form.vue modified: src/views/product/workbench/feed-pane.vue modified: src/views/product/workbench/feed-tab.vue modified: src/views/product/workbench/handymantype.vue modified: src/views/product/workbench/index.vue modified: src/views/product/workbench/mould-pane.vue modified: src/views/product/workbench/operation-task-pane.vue modified: src/views/product/workbench/product-record-form.vue modified: src/views/product/workbench/productout-form-by-batch.vue modified: src/views/product/workbench/productout-form.vue modified: src/views/product/workbench/productrecord-tab.vue modified: src/views/product/workbench/producttracking-tab.vue modified: src/views/product/workbench/shift-productout-form.vue modified: src/views/product/workbench/splitTaskForm.vue modified: src/views/product/workbench/taskinfo-pane.vue modified: src/views/quality/Packaging_ledger/pack-from.vue modified: src/views/quality/apply/index.vue modified: src/views/quality/exception/exception.vue modified: src/views/quality/exception/index.vue modified: src/views/quality/finishedProductInspection/finishedProduct-form.vue modified: src/views/quality/finishedProductInspection/finishedProduct-print.vue modified: src/views/quality/finishedProductInspection/finishedProducter-print.vue modified: src/views/quality/finishedProductInspection/index.vue modified: src/views/quality/newReport/ReportForm.vue modified: src/views/quality/processInspect/index.vue modified: src/views/quality/processInspect/processInspect-form.vue modified: src/views/quality/processconfiguration/index.vue modified: src/views/quality/processconfiguration/table-form.vue modified: src/views/quality/rawMaterial/QrcodeReader.vue modified: src/views/quality/rawMaterial/index.vue modified: src/views/quality/rawMaterial/rawMaterial-form.vue modified: src/views/quality/report/index.vue modified: src/views/quality/standardbind/standardbind-form.vue modified: src/views/quality/statistics/rateChart.vue modified: src/views/quality/testitemlayout/index.vue modified: src/views/quality/testplan/testplan-form.vue modified: src/views/quality/unqualifiedprocess/examineApproveform.vue modified: src/views/quality/unqualifiedprocess/index.vue modified: src/views/quality/unqualifiedprocess/loaction-form.vue modified: src/views/quality/unqualifiedprocess/unqualifiedprocessform.vue modified: src/views/technology/completeproductstructure/completeproductstructure-form.vue modified: src/views/technology/document/checkStandardTable.vue modified: src/views/technology/document/document-form.vue modified: src/views/technology/document/extendsOperation.vue modified: src/views/technology/document/extendsTestStandard.vue modified: src/views/technology/document/extendsTestStandardParam.vue modified: src/views/technology/document/teststandard.vue modified: src/views/technology/structure/single-structure-form.vue modified: src/views/warehouse/changestock/index.vue modified: src/views/warehouse/check/check-detail.vue modified: src/views/warehouse/pallettransports/ifslocation-form.vue modified: src/views/warehouse/pallettransports/ifsstock-form.vue modified: src/views/warehouse/pallettransports/index.vue modified: src/views/warehouse/returnstock/ifslocation-form.vue modified: src/views/warehouse/returnstock/index.vue modified: src/views/warehouse/returnstock/returnstock-form.vue modified: src/views/warehouse/returnstock/stock-part.vue modified: src/views/warehouse/stock/print-label-form.vue modified: src/views/warehouse/stock/small-print-label-form.vue modified: src/views/warehouse/stock/small-warehousing-label-form.vue modified: src/views/warehouse/stock/stock-table.vue modified: src/views/warehouse/stock/warehousing-label-form.vue modified: src/views/zte/pkgidbind/index.vue --- src/views/basic/part/part-form.vue | 163 ++++++++++++++++++++++++++--------------------------- 1 files changed, 80 insertions(+), 83 deletions(-) diff --git a/src/views/basic/part/part-form.vue b/src/views/basic/part/part-form.vue index 9a088f2..f15bf51 100644 --- a/src/views/basic/part/part-form.vue +++ b/src/views/basic/part/part-form.vue @@ -20,12 +20,12 @@ placeholder="闆朵欢鍙�" :disabled="(dataForm.id != null && dataForm.id > 0) || status" > - <el-button + <!-- <el-button slot="append" icon="el-icon-search" @click="openPartDialog()" v-show="!dataForm.id" - ></el-button> + ></el-button> --> </el-input> </el-form-item> </el-col> @@ -36,11 +36,11 @@ placeholder="闆朵欢鍚嶇О" :disabled="status" > - <el-button + <!-- <el-button slot="append" icon="el-icon-search" @click="openPartDialog()" - ></el-button> + ></el-button> --> </el-input> </el-form-item> </el-col> @@ -88,7 +88,7 @@ </el-row> <el-row> <el-col :span="12"> - <el-form-item label="鍗曚綅2" prop="sunit"> + <el-form-item label="閲嶉噺鍗曚綅" prop="sunit"> <el-select v-model="dataForm.sunit" filterable @@ -167,11 +167,45 @@ </el-row> <el-row> <el-col :span="12" - ><el-form-item label="瑙勬牸" prop="specs"> - <el-input v-model="dataForm.specs" placeholder="瑙勬牸"></el-input> + ><el-form-item label="瑙勬牸鍨嬪彿" prop="specs"> + <el-input v-model="dataForm.specs" placeholder="瑙勬牸鍨嬪彿"></el-input> </el-form-item> </el-col> <el-col :span="12"> + <el-form-item label="妫�楠屽憳" prop="examiner"> + <el-select + v-model="dataForm.examiner" + placeholder="璇烽�夋嫨" + style="width: 100%;" + > + <el-option + v-for="(item, index) in examinerOptions" + :key="index" + :label="item.label" + :value="item.value" + > + </el-option> + </el-select> + </el-form-item> + <!-- <el-form-item label="妫�楠岃鍒�" prop="testRuleId"> + <el-select + v-model="dataForm.testRuleId" + filterable + clearable + placeholder="璇烽�夋嫨" + style="width: 100%;" + > + <el-option + v-for="(item, index) in ruleOptions" + :key="index" + :label="item.ruleName" + :value="item.id" + > + </el-option> + </el-select> + </el-form-item> --> + </el-col> + <!-- <el-col :span="12"> <el-form-item label="鍥惧彿" prop="drawingNumber"> <el-input v-model="dataForm.drawingNumber" @@ -186,7 +220,7 @@ placeholder="鍨嬪彿" ></el-input> </el-form-item> - </el-col> + </el-col> --> <!-- <el-col :span="12">--> <!-- <el-form-item label="闆朵欢鏃�" prop="partFamilyId">--> @@ -208,12 +242,12 @@ <!-- </el-select>--> <!-- </el-form-item>--> <!-- </el-col>--> - <el-col :span="12"> + <!-- <el-col :span="12"> <el-form-item label="EAN缂栫爜" prop="ean"> <el-input v-model="dataForm.ean" placeholder="EAN缂栫爜"></el-input> </el-form-item> - </el-col> - <el-col :span="12"> + </el-col> --> + <!-- <el-col :span="12"> <el-form-item label="绯荤粺缂栧彿绠$悊" prop="useSystemNo"> <el-select v-model="dataForm.useSystemNo" @@ -231,35 +265,16 @@ </el-option> </el-select> </el-form-item> - </el-col> + </el-col> --> </el-row> <el-row> - <el-col :span="12"> - <el-form-item label="妫�楠岃鍒�" prop="testRuleId"> - <el-select - v-model="dataForm.testRuleId" - filterable - clearable - placeholder="璇烽�夋嫨" - style="width: 100%;" - > - <el-option - v-for="(item, index) in ruleOptions" - :key="index" - :label="item.ruleName" - :value="item.id" - > - </el-option> - </el-select> - </el-form-item> - </el-col> - <el-col :span="12"> + <!-- <el-col :span="12"> <el-form-item label="鐢靛帇绛夌骇" prop="voltageLevel"> <el-input v-model="dataForm.voltageLevel" placeholder="鐢靛帇绛夌骇" ></el-input> </el-form-item - ></el-col> + ></el-col> --> </el-row> <el-row> <el-col :span="12" @@ -268,21 +283,30 @@ </el-form-item> </el-col> <el-col :span="12"> - <!-- <el-form-item label="IFS鍚敤鎵规绠$悊" prop="lotTrackingIfs">--> - <!-- <el-select--> - <!-- v-model="dataForm.lotTrackingIfs"--> - <!-- placeholder="璇烽�夋嫨"--> - <!-- style="width: 100%;"--> - <!-- >--> - <!-- <el-option--> - <!-- v-for="(item, index) in lotTrackingIfsOptions"--> - <!-- :key="index"--> - <!-- :label="item.label"--> - <!-- :value="item.value"--> - <!-- >--> - <!-- </el-option>--> - <!-- </el-select>--> - <!-- </el-form-item>--> + <el-form-item label="鐗堟湰鍙�" prop="engChgLevel"> + <el-input + v-model="dataForm.engChgLevel" + placeholder="鐗堟湰鍙�" + :disabled="dataForm.id && dataForm.id != null ? true : false" + ></el-input> + </el-form-item> + </el-col> + <!-- <el-col :span="12"> + <el-form-item label="IFS鍚敤鎵规绠$悊" prop="lotTrackingIfs"> + <el-select + v-model="dataForm.lotTrackingIfs" + placeholder="璇烽�夋嫨" + style="width: 100%;" + > + <el-option + v-for="(item, index) in lotTrackingIfsOptions" + :key="index" + :label="item.label" + :value="item.value" + > + </el-option> + </el-select> + </el-form-item> <el-form-item label="鍘熸潗鏂欐" prop="testRuleType"> <el-select v-model="dataForm.testRuleType" @@ -293,18 +317,9 @@ <el-option label="鏄�" :value="1"> </el-option> </el-select> </el-form-item> - </el-col> + </el-col> --> </el-row> <el-row> - <el-col :span="12"> - <el-form-item label="鐗堟湰鍙�" prop="engChgLevel"> - <el-input - v-model="dataForm.engChgLevel" - placeholder="鐗堟湰鍙�" - :disabled="dataForm.id && dataForm.id != null ? true : false" - ></el-input> - </el-form-item> - </el-col> <el-col :span="12"> <el-form-item v-if="permissions.basic_has_ifs" @@ -330,7 +345,7 @@ <el-row> <el-col :span="12"> <el-form-item label="闆朵欢灞炴��" prop="materialAttribute"> - <el-select v-model="dataForm.materialAttribute"> + <el-select v-model="dataForm.materialAttribute" style="width: 100%"> <el-option v-for="(item, index) in materialAttributeOptions" :key="index" @@ -351,41 +366,24 @@ </el-col> </el-row> <el-row> - <el-col :span="12"> - <el-form-item label="妫�楠屽憳" prop="examiner"> - <el-select - v-model="dataForm.examiner" - placeholder="璇烽�夋嫨" - style="width: 100%;" - > - <el-option - v-for="(item, index) in examinerOptions" - :key="index" - :label="item.label" - :value="item.value" - > - </el-option> - </el-select> - </el-form-item> - </el-col> - <el-col :span="12"> + <!-- <el-col :span="12"> <el-form-item label="浜у搧鍚嶇О" prop="prodName"> <el-input v-model="dataForm.prodName" placeholder="浜у搧鍚嶇О" ></el-input> </el-form-item> - </el-col> + </el-col> --> </el-row> <el-row> - <el-col :span="12"> + <!-- <el-col :span="12"> <el-form-item label="鑺傝窛" prop="prodName"> <el-input v-model="dataForm.partPitch" placeholder="鑺傝窛" ></el-input> </el-form-item> - </el-col> + </el-col> --> </el-row> </el-form> <span slot="footer" class="dialog-footer"> @@ -536,7 +534,6 @@ // 鍘婚櫎闆朵欢缂栧彿涓よ竟鐨勭┖鏍� this.dataForm.partNo = this.dataForm.partNo.trim() if (this.dataForm.id) { - console.log(this.dataForm) putObj(this.dataForm) .then((data) => { this.$message.success('淇敼鎴愬姛') @@ -546,7 +543,7 @@ }) .catch((error) => { this.isSubmit = false - console.log(error) + console.error(error) }) } else { addObj(this.dataForm) @@ -558,7 +555,7 @@ }) .catch((error) => { this.isSubmit = false - console.log(error) + console.error(error) }) } } else { -- Gitblit v1.9.3