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/equipment/metering/metering-form.vue | 126 +++++++++++++++++++++++++++++++++--------
1 files changed, 101 insertions(+), 25 deletions(-)
diff --git a/src/views/equipment/metering/metering-form.vue b/src/views/equipment/metering/metering-form.vue
index 1d290dd..ca38b67 100644
--- a/src/views/equipment/metering/metering-form.vue
+++ b/src/views/equipment/metering/metering-form.vue
@@ -23,23 +23,33 @@
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="绫诲瀷" prop="type">
- <el-select
- v-model="dataForm.type"
- filterable
- placeholder="璇烽�夋嫨"
- style="width:100%"
- >
- <el-option
- v-for="item in workshopList"
- :key="item.id"
- :label="item.label"
- :value="item.value"
- >
- </el-option>
- </el-select>
+ <el-form-item label="鏍″噯鏃堕棿" prop="createTime">
+ <el-date-picker
+ v-model="dataForm.createTime"
+ type="datetime"
+ placeholder="鏍″噯鏃堕棿">
+ </el-date-picker>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="鍒版湡鏃堕棿" prop="updateTime">
+ <el-date-picker
+ v-model="dataForm.updateTime"
+ type="datetime"
+ placeholder="鏍″噯鍒版湡鏃堕棿">
+ </el-date-picker>
+ </el-form-item>
+ </el-col>
+
+ <el-col :span="12">
+ <el-form-item label="璐ｄ换浜�" prop="createUser">
+ <el-input
+ v-model="dataForm.createUser"
+ placeholder="璐ｄ换浜�"
+ ></el-input>
</el-form-item>
</el-col>
+
<el-col :span="12">
<el-form-item label="鍘傚" prop="supplier">
<el-input
@@ -48,11 +58,63 @@
></el-input>
</el-form-item>
</el-col>
+
<el-col :span="12">
- <el-form-item label="鐘舵��" prop="state">
- <el-select
+ <el-form-item label="璐ｄ换閮ㄩ棬" prop="responsibleDepartment">
+ <el-input
+ v-model="dataForm.responsibleDepartment"
+ placeholder="璐ｄ换閮ㄩ棬"
+ ></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="鐘舵��" prop="status">
+ <el-input
v-model="dataForm.status"
placeholder="鐘舵��"
+ ></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="瑙勬牸" prop="specifications">
+ <el-input
+ v-model="dataForm.specifications"
+ placeholder="瑙勬牸"
+ ></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="妫�瀹�/鏍″噯" prop="verification">
+ <el-input
+ v-model="dataForm.verification"
+ placeholder="妫�瀹�/鏍″噯"
+ ></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="鍒嗙被" prop="classification">
+ <el-input
+ v-model="dataForm.classification"
+ placeholder="鍒嗙被"
+ ></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="瀹氱偣浣嶇疆" prop="fixedPointPosition">
+ <el-input
+ v-model="dataForm.fixedPointPosition"
+ placeholder="瀹氱偣浣嶇疆"
+ ></el-input>
+ </el-form-item>
+ </el-col>
+
+
+
+ <!-- <el-col :span="12">
+ <el-form-item label="璁惧鐘舵��" prop="status">
+ <el-select
+ v-model="dataForm.status"
+ placeholder="璁惧鐘舵��"
filterable
style="width: 100%"
>
@@ -64,7 +126,7 @@
/>
</el-select>
</el-form-item>
- </el-col>
+ </el-col> -->
</el-row>
</el-form>
<span slot="footer" class="dialog-footer">
@@ -85,6 +147,10 @@
export default {
data() {
return {
+ pickerOptions: {
+ disabledDate(time) {
+ return time.getTime() > Date.now();
+ },},
// options: regionData,
visible: false,
dataForm: {
@@ -100,12 +166,23 @@
typeSpecification: '',
manufactureDate: '',
installDate: '',
- state: '',
+ // state: '',
+ verification:'',
+ inspectionUnit:'',
+ specifications:'',
+ responsibleDepartment:'',
+ classification:'',
+ createUser:'',
+ status:'',
+ updateTime:'',
+ createTime:'',
description: '',
value1: '',
+ certificate:'',
+ fixedPointPosition:'',
code: null,
- type: null,
- status: null,
+ // type: null,
+ status: null,
supplier: null
},
dataRule: {
@@ -173,7 +250,7 @@
}
})
},
-
+
initFactorySelect() {
loadFactoryList().then((res) => {
this.factoryOptions = res.data
@@ -183,11 +260,11 @@
})
}
},
-
+
created() {
this.initFactorySelect()
this.getEquipmentState()
-
+
// remote('work_shop').then((response) => {
// if (response.data.code === 0) {
// this.workshopList = response.data.data
@@ -198,4 +275,3 @@
}
}
</script>
-
\ No newline at end of file
--
Gitblit v1.9.3