From 3bda22fd0c61d053f0f817a95230d39c0c6baddb Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 17 一月 2024 16:56:47 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before
---
src/views/equipment/equipment/index.vue | 44 +++---
vue.config.js | 2
src/page/ScheduleData/index.vue | 4
src/views/equipment/mouldrecord/index.vue | 141 ++++++++++++++++++++
src/views/quality/exception/exceptionform.vue | 33 ++++
src/views/plan/manufacturingorder/productorder-form.vue | 16 -
src/views/quality/exception/exception-form.vue | 9
src/views/equipment/metering/index.vue | 6
src/views/equipment/mould/index.vue | 140 ++++++++++++++++++++
9 files changed, 353 insertions(+), 42 deletions(-)
diff --git a/src/page/ScheduleData/index.vue b/src/page/ScheduleData/index.vue
index cdb20fd..612e2c3 100644
--- a/src/page/ScheduleData/index.vue
+++ b/src/page/ScheduleData/index.vue
@@ -13,7 +13,7 @@
@click="getCurrent(i)"
ref="listItem"
>
- 璁㈠崟鍙凤細{{ x.customerOrderNo }}/{{ x.otcLineNo }}
+ 璁㈠崟鍙凤細{{ x.contractNo }}
</div>
</div>
<!-- <el-pagination
@@ -176,6 +176,7 @@
},
1
).then((res) => {
+ console.log(res,"1");
const d = res.data.data
this.pagination.total = d.total
d.records.forEach((e) => (e.active = false))
@@ -212,6 +213,7 @@
color: '#14a9d7'
})
)
+ console.log(this.tasks,"----===");
let endDate = e.actualFinishDate
if (!e.actualFinishDate) {
const s = Date.parse(e.actualStartDate)
diff --git a/src/views/equipment/equipment/index.vue b/src/views/equipment/equipment/index.vue
index 9fd2e4d..418e866 100644
--- a/src/views/equipment/equipment/index.vue
+++ b/src/views/equipment/equipment/index.vue
@@ -97,6 +97,7 @@
// 璁惧缂栧彿
{
minWidth: '30',
+ width: '200',
prop: 'number',
label: '璁惧缂栧彿',
sort: true,
@@ -110,8 +111,19 @@
// 璁惧鍚嶇О
{
minWidth: '30',
+ width: '100',
prop: 'name',
label: '璁惧鍚嶇О',
+ sort: true,
+ isTrue: true,
+ isSearch: true,
+ searchInfoType: 'text'
+ },
+ // 鐘舵��
+ {
+ minWidth: '30',
+ prop: 'state',
+ label: '鐘舵��',
sort: true,
isTrue: true,
isSearch: true,
@@ -151,15 +163,15 @@
searchInfoType: 'text'
},
// 閭
- {
- minWidth: '30',
- prop: 'email',
- label: '閭',
- sort: true,
- isTrue: true,
- isSearch: false,
- searchInfoType: 'text'
- },
+ // {
+ // minWidth: '30',
+ // prop: 'email',
+ // label: '閭',
+ // sort: true,
+ // isTrue: true,
+ // isSearch: false,
+ // searchInfoType: 'text'
+ // },
// 渚涘簲鍟�
{
minWidth: '30',
@@ -193,7 +205,7 @@
// 鍒堕�犳棩鏈�
{
minWidth: '150',
- width: '250',
+ width: '100',
prop: 'manufactureDate',
label: '鍒堕�犳棩鏈�',
sort: true,
@@ -205,7 +217,7 @@
// 瀹夎鏃ユ湡
{
minWidth: '150',
- width: '250',
+ width: '100',
prop: 'installDate',
label: '瀹夎鏃ユ湡',
sort: true,
@@ -213,16 +225,6 @@
isSearch: true,
formatter: this.formatReceiveTime,
searchInfoType: 'datetimerange'
- },
- // 鐘舵��
- {
- minWidth: '30',
- prop: 'state',
- label: '鐘舵��',
- sort: true,
- isTrue: true,
- isSearch: true,
- searchInfoType: 'text'
}
],
toolbar: [],
diff --git a/src/views/equipment/metering/index.vue b/src/views/equipment/metering/index.vue
index 05b49e8..ecdc081 100644
--- a/src/views/equipment/metering/index.vue
+++ b/src/views/equipment/metering/index.vue
@@ -97,6 +97,7 @@
// 璁惧缂栧彿
{
minWidth: '30',
+ width: '100',
prop: 'code',
label: '璁惧缂栧彿',
sort: true,
@@ -110,6 +111,7 @@
// 璁惧鍚嶇О
{
minWidth: '30',
+ width: '100',
prop: 'name',
label: '璁惧鍚嶇О',
sort: true,
@@ -145,7 +147,7 @@
// 鍒堕�犳棩鏈�
{
minWidth: '150',
- width: '250',
+ width: '150',
prop: 'createTime',
label: '鏍″噯鏃堕棿',
sort: true,
@@ -157,7 +159,7 @@
{
minWidth: '150',
- width: '250',
+ width: '150',
prop: 'updateTime',
label: '鏍″噯鍒版湡鏃堕棿',
sort: true,
diff --git a/src/views/equipment/mould/index.vue b/src/views/equipment/mould/index.vue
new file mode 100644
index 0000000..9ed8bab
--- /dev/null
+++ b/src/views/equipment/mould/index.vue
@@ -0,0 +1,140 @@
+<template>
+ <div class="mod-config">
+ <basic-container>
+ <!-- <ttable
+ :table="table"
+ :isShowHide="true"
+ :ajaxFun="ajaxFun"
+ :prelang="prelang"
+ :options="options"
+ ref="processconfiguration"
+ > -->
+ <!-- <template #toolbar></template>
+ </ttable> -->
+ <div>寮�鍙戜腑銆傘�傘��</div>
+ </basic-container>
+ </div>
+</template>
+
+<script>
+import ttable from '@/views/common/ztt-table.vue'
+import { fetchList, } from '@/api/quality/finishedDelivery'
+
+export default {
+ data(){
+ return {
+ ajaxFun: fetchList,
+ prelang: 'operation',
+ dataListLoading: false,
+ options: {
+ height: 300, // 榛樿楂樺害-涓轰簡琛ㄥご鍥哄畾
+ stripe: true, // 鏄惁涓烘枒椹汗 table
+ highlightCurrentRow: false, // 鏄惁瑕侀珮浜綋鍓嶈
+ border: true, // 鏄惁鏈夌旱鍚戣竟妗�
+ lazy: false, // 鏄惁闇�瑕佹噿鍔犺浇
+ fit: true, // 鍒楃殑瀹藉害鏄惁鑷拺寮�
+ multiSelect: true, //
+ seqNo: true,
+ isShowHide: true, // 鏄惁鏄剧ず鏄惧奖鎸夐挳
+ isRefresh: true, // 鏄惁鏄剧ず鍒锋柊鎸夐挳
+ isSearch: true, // 楂樼骇鏌ヨ鎸夐挳
+ defaultOrderBy: { column: 'createTime', direction: 'desc' }
+ },
+ table: {
+ total: 0,
+ currentPage: 1,
+ pageSize: 20,
+ data: [],
+ // 鏍囬
+ column: [
+ {
+ minWidth: '140',
+ prop: 'packageNo',
+ label: '鍖呰缂栧彿',
+ isTrue: true,
+ isSearch: true,
+ searchInfoType: 'text',
+ },{
+ minWidth: '140',
+ prop: 'outBatchNo',
+ label: '鎵规鍙�',
+ isTrue: true,
+ isSearch: true,
+ searchInfoType: 'text',
+ },
+ {
+ minWidth: '140',
+ prop: 'partNo',
+ label: '浜у搧缂栧彿',
+ isTrue: true,
+ isSearch: true,
+ searchInfoType: 'text',
+ },
+ {
+ minWidth: '140',
+ prop: 'partName',
+ label: '浜у搧鍚嶇О',
+ isTrue: true,
+ isSearch: true,
+ searchInfoType: 'text',
+ },
+ {
+ minWidth: '140',
+ prop: 'specs',
+ label: '瑙勬牸鍨嬪彿',
+ isTrue: true,
+ isSearch: true,
+ searchInfoType: 'text',
+ },
+ {
+ minWidth: '140',
+ prop: 'unit',
+ label: '鍗曚綅',
+ isTrue: true,
+ isSearch: true,
+ searchInfoType: 'text',
+ },
+ {
+ minWidth: '140',
+ prop: 'number',
+ label: '鏁伴噺',
+ isTrue: true,
+ isSearch: true,
+ searchInfoType: 'text',
+ },
+ {
+ minWidth: '130',
+ prop: 'createTime',
+ label: '鍏ュ簱鏃堕棿',
+ sort: true,
+ isTrue: true,
+ isSearch: true,
+ searchInfoType: 'datetimerange',
+ formatter: this.formatDateTime,
+ },
+ {
+ minWidth: '130',
+ prop: 'createUser',
+ label: '鍒涘缓浜�',
+ sort: true,
+ isTrue: true,
+ isSearch: true,
+ searchInfoType: 'text',
+ },
+ ],
+ toolbar: [],
+ // operator: [],
+ // operatorConfig: {}
+ },
+ }
+ },
+ components: {
+ ttable
+ },
+ medthods: {
+ formatDateTime(row, column, cellValue) {
+ return cellValue ? fecha.format(new Date(cellValue), 'yyyy-MM-dd') : ''
+ },
+ },
+}
+</script>
\ No newline at end of file
diff --git a/src/views/equipment/mouldrecord/index.vue b/src/views/equipment/mouldrecord/index.vue
new file mode 100644
index 0000000..0884c56
--- /dev/null
+++ b/src/views/equipment/mouldrecord/index.vue
@@ -0,0 +1,141 @@
+<template>
+ <div class="mod-config">
+ <basic-container>
+ <!-- <ttable
+ :table="table"
+ :isShowHide="true"
+ :ajaxFun="ajaxFun"
+ :prelang="prelang"
+ :options="options"
+ ref="processconfiguration"
+ >
+ <template #toolbar></template>
+ </ttable> -->
+ <div>寮�鍙戜腑銆傘�傘��</div>
+ </basic-container>
+ </div>
+</template>
+
+<script>
+import ttable from '@/views/common/ztt-table.vue'
+import { fetchList, } from '@/api/quality/finishedDelivery'
+
+export default {
+ data(){
+ return {
+ ajaxFun: fetchList,
+ prelang: 'operation',
+ dataListLoading: false,
+ options: {
+ height: 300, // 榛樿楂樺害-涓轰簡琛ㄥご鍥哄畾
+ stripe: true, // 鏄惁涓烘枒椹汗 table
+ highlightCurrentRow: false, // 鏄惁瑕侀珮浜綋鍓嶈
+ border: true, // 鏄惁鏈夌旱鍚戣竟妗�
+ lazy: false, // 鏄惁闇�瑕佹噿鍔犺浇
+ fit: true, // 鍒楃殑瀹藉害鏄惁鑷拺寮�
+ multiSelect: true, //
+ seqNo: true,
+ isShowHide: true, // 鏄惁鏄剧ず鏄惧奖鎸夐挳
+ isRefresh: true, // 鏄惁鏄剧ず鍒锋柊鎸夐挳
+ isSearch: true, // 楂樼骇鏌ヨ鎸夐挳
+ defaultOrderBy: { column: 'createTime', direction: 'desc' }
+ },
+ table: {
+ total: 0,
+ currentPage: 1,
+ pageSize: 20,
+ data: [],
+ // 鏍囬
+ column: [
+ {
+ minWidth: '140',
+ prop: 'packageNo',
+ label: '鍖呰缂栧彿',
+ isTrue: true,
+ isSearch: true,
+ searchInfoType: 'text',
+ },{
+ minWidth: '140',
+ prop: 'outBatchNo',
+ label: '鎵规鍙�',
+ isTrue: true,
+ isSearch: true,
+ searchInfoType: 'text',
+ },
+ {
+ minWidth: '140',
+ prop: 'partNo',
+ label: '浜у搧缂栧彿',
+ isTrue: true,
+ isSearch: true,
+ searchInfoType: 'text',
+ },
+ {
+ minWidth: '140',
+ prop: 'partName',
+ label: '浜у搧鍚嶇О',
+ isTrue: true,
+ isSearch: true,
+ searchInfoType: 'text',
+ },
+ {
+ minWidth: '140',
+ prop: 'specs',
+ label: '瑙勬牸鍨嬪彿',
+ isTrue: true,
+ isSearch: true,
+ searchInfoType: 'text',
+ },
+ {
+ minWidth: '140',
+ prop: 'unit',
+ label: '鍗曚綅',
+ isTrue: true,
+ isSearch: true,
+ searchInfoType: 'text',
+ },
+ {
+ minWidth: '140',
+ prop: 'number',
+ label: '鏁伴噺',
+ isTrue: true,
+ isSearch: true,
+ searchInfoType: 'text',
+ },
+ {
+ minWidth: '130',
+ prop: 'createTime',
+ label: '鍏ュ簱鏃堕棿',
+ sort: true,
+ isTrue: true,
+ isSearch: true,
+ searchInfoType: 'datetimerange',
+ formatter: this.formatDateTime,
+ },
+ {
+ minWidth: '130',
+ prop: 'createUser',
+ label: '鍒涘缓浜�',
+ sort: true,
+ isTrue: true,
+ isSearch: true,
+ searchInfoType: 'text',
+ },
+ ],
+ toolbar: [],
+ // operator: [],
+ // operatorConfig: {}
+ },
+ }
+ },
+
+ components: {
+ ttable
+ },
+ medthods: {
+ formatDateTime(row, column, cellValue) {
+ return cellValue ? fecha.format(new Date(cellValue), 'yyyy-MM-dd') : ''
+ },
+ },
+}
+</script>
diff --git a/src/views/plan/manufacturingorder/productorder-form.vue b/src/views/plan/manufacturingorder/productorder-form.vue
index 0fb9e74..50a0c0c 100644
--- a/src/views/plan/manufacturingorder/productorder-form.vue
+++ b/src/views/plan/manufacturingorder/productorder-form.vue
@@ -336,17 +336,14 @@
fallbackClass="fallbackStyle"
ghostClass="item_ghost"
@end="dragEnd"
+ :default-sort="{ prop: 'operationOrder' }"
+ @choose="operationRowClick"
>
<div
:class="{ dragItem: true, active: x.active }"
v-for="(x, i) in operations"
:key="i"
>
- <!-- <div class="dragBody">
- <div class="info">{{ x.operationNo }}</div>
- <div class="info">{{ x.operationName }}</div>
- <div class="info">{{ x.partName }}</div>
- </div> -->
<el-row>
<el-col :span="2" class="frame">{{ i+1 }}
</el-col>
@@ -370,10 +367,6 @@
</el-card>
</el-col>
</el-row>
-
-
-
-
@@ -1427,9 +1420,7 @@
operationOrder:el.operationOrder,
}
})
- console.log(data,"id");
changeOrder(data).then((res) =>{
- console.log(res,"鍥炶皟");
}).catch(error => {
console.error(error)
});
@@ -1771,7 +1762,8 @@
this.dataForm.bomId = null
},
// 鐐瑰嚮宸ヨ壓宸ュ簭琛岃Е鍙戞牎楠屽伐鑹烘槸鍚︿慨鏀癸紝鑻ヤ慨鏀瑰垯涓嶅彲鎿嶄綔锛岄渶鍏堜繚瀛橈紝鑻ユ湭淇敼锛屽垯鍙煡璇㈠嚭瀵瑰簲鐨勫弬鏁伴泦
- operationRowClick(row) {
+ operationRowClick(event) {
+ const row = this.operations[event.oldIndex]
if (this.dataForm.id != null && this.dataForm.id !== 0) {
this.routingOperationId = row.technologyRoutingOperationId
this.moRoutingOperationId = row.id
diff --git a/src/views/quality/exception/exception-form.vue b/src/views/quality/exception/exception-form.vue
index 070dbed..71959a0 100644
--- a/src/views/quality/exception/exception-form.vue
+++ b/src/views/quality/exception/exception-form.vue
@@ -78,7 +78,7 @@
></el-button>
</el-input>
</el-form-item>
- <el-form-item label="寰俊閫氱煡缁�" prop="notifierGroupId">
+ <!-- <el-form-item label="寰俊閫氱煡缁�" prop="notifierGroupId">
<el-select
v-model="dataForm.notifierGroupId"
style="width:100%;"
@@ -92,7 +92,7 @@
>
</el-option>
</el-select>
- </el-form-item>
+ </el-form-item> -->
<el-form-item label="澶囨敞" prop="remark">
<el-input
type="textarea"
@@ -163,7 +163,7 @@
<script>
import { getObj, putObj } from '@/api/quality/exception'
-import { fetchList } from '@/api/quality/wxnotice'
+// import { fetchList } from '@/api/quality/wxnotice'
import workstationDialog from '@/views/common/workstation.vue'
import productoutDialog from '@/views/common/productout.vue'
import { getStore } from '../../../util/store'
@@ -229,6 +229,7 @@
this.$refs.dataForm.resetFields()
if (this.dataForm.id) {
getObj(this.dataForm.id).then((response) => {
+ console.log(response,"----");
this.dataForm = response.data.data
this.fileList = response.data.data.urlList
})
@@ -304,6 +305,7 @@
},
getExceptionHandleType() {
remote('exception_handle_type').then((response) => {
+ console.log(response,"111111");
if (response.data.code === 0) {
this.exceptionHandleTypeOptions = response.data.data
} else {
@@ -324,6 +326,7 @@
})
},
selectUser(param) {
+ console.log(param,"----===-=");
if (param) {
this.dataForm.processUser = param.userId
this.dataForm.processUserName = param.username
diff --git a/src/views/quality/exception/exceptionform.vue b/src/views/quality/exception/exceptionform.vue
index 0a47a43..f5a0726 100644
--- a/src/views/quality/exception/exceptionform.vue
+++ b/src/views/quality/exception/exceptionform.vue
@@ -40,10 +40,23 @@
</el-input>
</el-form-item>
<el-form-item label="寮傚父绫诲瀷" prop="exceptionType">
- <el-input
+ <!-- <el-input
v-model="dataForm.exceptionType"
placeholder="寮傚父绫诲瀷"
- ></el-input>
+ ></el-input> -->
+ <el-select
+ v-model="dataForm.exceptionType"
+ style="width:100%;"
+ placeholder="寮傚父绫诲瀷"
+ >
+ <el-option
+ v-for="item in exceptionHandleTypeOptions"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ >
+ </el-option>
+ </el-select>
</el-form-item>
<el-form-item label="寮傚父鎻忚堪" prop="exceptionDescription">
<el-input
@@ -88,6 +101,7 @@
import productoutDialog from '@/views/common/productout.vue'
import { loadWarehouse } from '../../../api/warehouse/location'
import { loadWorkstation } from '../../../api/basic/workstation'
+import { remote } from '@/api/admin/dict'
import { loadProductMain } from '../../../api/product/personboard'
export default {
@@ -98,6 +112,7 @@
productoutVisible: false,
workstationVisible: false,
visible: false,
+ exceptionHandleTypeOptions:[],
dataForm: {
id: 0,
code: '',
@@ -124,7 +139,21 @@
clickSaveArr: []
}
},
+ created() {
+ console.log("22222222");
+ this.getExceptionHandleType()
+ },
methods: {
+ getExceptionHandleType() {
+ remote('exception_handle_type').then((response) => {
+ console.log(response,"-----");
+ if (response.data.code === 0) {
+ this.exceptionHandleTypeOptions = response.data.data
+ } else {
+ this.exceptionHandleTypeOptions = []
+ }
+ })
+ },
init(id, id1, id2) {
this.dataForm.workstationId = id1
if (this.dataForm.workstationId) {
diff --git a/vue.config.js b/vue.config.js
index f155495..2280c3d 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -7,7 +7,7 @@
// const url = 'http://192.168.2.7:9999'
// const url = 'https://ztms-mes.chinaztt.cn/'
- const url = 'http://localhost:9999'
+const url = 'http://localhost:9999'
const localUrl = 'http://localhost:8089'
--
Gitblit v1.9.3