From 1789ce3650a2665b5abca7a3028611190d1983df Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 14 十二月 2023 09:45:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/basic/location/index.vue | 1
src/views/quality/finishedProductInspection/index.vue | 30 --
src/const/crud/customerOrder/customerOrderForm.js | 1
src/views/basic/factory/index.vue | 1
src/views/common/ztt-table.vue | 4
src/views/basic/param/index.vue | 1
src/views/plan/productionschedul/index.vue | 35 ++-
src/views/basic/part/index.vue | 2
src/views/basic/warehouse/index.vue | 1
src/views/common/documentDetail.vue | 2
src/views/basic/crew/crew-form.vue | 4
src/views/basic/template/index.vue | 1
src/views/plan/manufacturingorder/customerorder.vue | 14 -
src/views/equipment/metering/index.vue | 2
src/views/technology/document/teststandard.vue | 5
src/views/plan/operationtask/operationtask-form.vue | 1
src/views/basic/division/index.vue | 1
/dev/null | 172 -------------------
src/views/basic/workstation/workstation-form.vue | 4
src/views/common/document.vue | 2
src/views/basic/company/index.vue | 5
src/api/plan/operationtask.js | 6
src/views/plan/manfacturingorderstatement/index.vue | 197 ++++++++++-----------
src/views/product/workbench/steprecord-tab.vue | 1
src/views/plan/manufacturingorder/routing.vue | 18 +-
25 files changed, 174 insertions(+), 337 deletions(-)
diff --git a/src/api/plan/operationtask.js b/src/api/plan/operationtask.js
index 0dff00b..fc48e23 100644
--- a/src/api/plan/operationtask.js
+++ b/src/api/plan/operationtask.js
@@ -294,3 +294,9 @@
params: query
})
}
+export function getTechnologyRouting(id) {
+ return request({
+ url: '/mes/operationTask/getTechnologyRouting/'+id,
+ method: 'get',
+ })
+}
diff --git a/src/const/crud/customerOrder/customerOrderForm.js b/src/const/crud/customerOrder/customerOrderForm.js
index 89b9d30..f23b3cf 100644
--- a/src/const/crud/customerOrder/customerOrderForm.js
+++ b/src/const/crud/customerOrder/customerOrderForm.js
@@ -17,6 +17,7 @@
export const tableOption = {
border: true,
index: true,
+ indexFixed: false,
height: '292px',
indexLabel: '搴忓彿',
menuAlign: 'center',
diff --git a/src/views/basic/company/index.vue b/src/views/basic/company/index.vue
index 2e49f73..8ab14b4 100644
--- a/src/views/basic/company/index.vue
+++ b/src/views/basic/company/index.vue
@@ -49,6 +49,7 @@
isShowHide:true,//鏄惁鏄剧ず鏄惧奖鎸夐挳
isSearch:false,//楂樼骇鏌ヨ鎸夐挳
isCopy: true,
+ isRefresh: true, // 鏄惁鏄剧ず鍒锋柊鎸夐挳
defaultOrderBy:{column:'createTime',direction:'desc'}
},
table: {
@@ -108,6 +109,10 @@
},
methods: {
hello(){
+ if(this.multipleSelection.length < 1){
+ this.$message.error("璇峰厛閫夋嫨瑕佸鍒剁殑鏁版嵁!")
+ return
+ }
copy(this.multipleSelection).then(response =>{
this.getData()
})
diff --git a/src/views/basic/crew/crew-form.vue b/src/views/basic/crew/crew-form.vue
index a388a1a..de33d0b 100644
--- a/src/views/basic/crew/crew-form.vue
+++ b/src/views/basic/crew/crew-form.vue
@@ -24,11 +24,11 @@
>纭畾</el-button
>
</span>
- <staffDialog
+ <!-- <staffDialog
:currshowlist.sync="showStaff"
:multiSelect="true"
@handleSelectionChange="selectStaff"
- />
+ /> -->
</el-dialog>
</template>
diff --git a/src/views/basic/division/index.vue b/src/views/basic/division/index.vue
index bfea656..2a86d74 100644
--- a/src/views/basic/division/index.vue
+++ b/src/views/basic/division/index.vue
@@ -52,6 +52,7 @@
seqNo: true,
isShowHide: true, // 鏄惁鏄剧ず鏄惧奖鎸夐挳
isSearch: false, // 楂樼骇鏌ヨ鎸夐挳
+ isRefresh: true, // 鏄惁鏄剧ず鍒锋柊鎸夐挳
defaultOrderBy: { column: 'createTime', direction: 'desc' }
},
table: {
diff --git a/src/views/basic/factory/index.vue b/src/views/basic/factory/index.vue
index f9c85c9..d5d4b83 100644
--- a/src/views/basic/factory/index.vue
+++ b/src/views/basic/factory/index.vue
@@ -53,6 +53,7 @@
seqNo: true,
isShowHide: true, // 鏄惁鏄剧ず鏄惧奖鎸夐挳
isSearch: false, // 楂樼骇鏌ヨ鎸夐挳
+ isRefresh: true, // 鏄惁鏄剧ず鍒锋柊鎸夐挳
defaultOrderBy: { column: 'createTime', direction: 'desc' }
},
table: {
diff --git a/src/views/basic/location/index.vue b/src/views/basic/location/index.vue
index 7015cc8..dfb4f75 100644
--- a/src/views/basic/location/index.vue
+++ b/src/views/basic/location/index.vue
@@ -59,6 +59,7 @@
seqNo: true,
isShowHide: true, // 鏄惁鏄剧ず鏄惧奖鎸夐挳
isSearch: true, // 楂樼骇鏌ヨ鎸夐挳
+ isRefresh: true, // 鏄惁鏄剧ず鍒锋柊鎸夐挳
defaultOrderBy: { column: 'createTime', direction: 'desc' }
},
table: {
diff --git a/src/views/basic/param/index.vue b/src/views/basic/param/index.vue
index e7dc72f..071af0d 100644
--- a/src/views/basic/param/index.vue
+++ b/src/views/basic/param/index.vue
@@ -51,6 +51,7 @@
seqNo: true,
isShowHide: true, // 鏄惁鏄剧ず鏄惧奖鎸夐挳
isSearch: true, // 楂樼骇鏌ヨ鎸夐挳
+ isRefresh: true, // 鏄惁鏄剧ず鍒锋柊鎸夐挳
defaultOrderBy: { column: 'createTime', direction: 'desc' }
},
table: {
diff --git a/src/views/basic/part/index.vue b/src/views/basic/part/index.vue
index 3266ab8..7da5a07 100644
--- a/src/views/basic/part/index.vue
+++ b/src/views/basic/part/index.vue
@@ -504,9 +504,7 @@
})
},
getMaterialType(type) {
- console.log(type);
remote(type).then((response) => {
- console.log("绫诲瀷",response);
const code = response.data.code
if (code === 0) {
const _data = response.data.data
diff --git a/src/views/basic/template/index.vue b/src/views/basic/template/index.vue
index 0c21557..22996f0 100644
--- a/src/views/basic/template/index.vue
+++ b/src/views/basic/template/index.vue
@@ -204,6 +204,7 @@
seqNo: true,
isShowHide: true, // 鏄惁鏄剧ず鏄惧奖鎸夐挳
isSearch: true, // 楂樼骇鏌ヨ鎸夐挳
+ isRefresh: true, // 鏄惁鏄剧ず鍒锋柊鎸夐挳
defaultOrderBy: { column: 'id', direction: 'desc' }
},
table: {
diff --git a/src/views/basic/warehouse/index.vue b/src/views/basic/warehouse/index.vue
index 7846c8b..c2d706c 100644
--- a/src/views/basic/warehouse/index.vue
+++ b/src/views/basic/warehouse/index.vue
@@ -54,6 +54,7 @@
seqNo: true,
isShowHide: true, // 鏄惁鏄剧ず鏄惧奖鎸夐挳
isSearch: true, // 楂樼骇鏌ヨ鎸夐挳
+ isRefresh: true, // 鏄惁鏄剧ず鍒锋柊鎸夐挳
defaultOrderBy: { column: 'createTime', direction: 'desc' }
},
table: {
diff --git a/src/views/basic/workstation/workstation-form.vue b/src/views/basic/workstation/workstation-form.vue
index 7366bbb..f9f8c9e 100644
--- a/src/views/basic/workstation/workstation-form.vue
+++ b/src/views/basic/workstation/workstation-form.vue
@@ -1,10 +1,10 @@
<template>
<el-dialog
- v-diadrag
:title="!dataForm.id ? '鏂板' : '淇敼'"
:close-on-click-modal="false"
:visible.sync="visible"
- style="min-width: 2000px"
+ width="60%"
+ top="5vh"
>
<el-row>
<el-form
diff --git a/src/views/common/document.vue b/src/views/common/document.vue
index c844f82..fe74309 100644
--- a/src/views/common/document.vue
+++ b/src/views/common/document.vue
@@ -61,7 +61,7 @@
<el-button @click="innerVisible = false">鍙� 娑�</el-button>
<el-button type="primary" @click="saveSelectRow">纭� 瀹�</el-button>
</div>
- <DocumentDetail :currshowlist.sync="showDocument" :docId="documentId">
+ <DocumentDetail :currshowlist.sync="showDocument" :docId="Number(documentId)">
</DocumentDetail>
</el-dialog>
</template>
diff --git a/src/views/common/documentDetail.vue b/src/views/common/documentDetail.vue
index b93f8e9..f2d5861 100644
--- a/src/views/common/documentDetail.vue
+++ b/src/views/common/documentDetail.vue
@@ -166,7 +166,7 @@
>
<TeststandardDialog
:editable="editable"
- :documentId="Number(dataForm.id)"
+ :documentId="Number(docId)"
>
</TeststandardDialog>
</el-tab-pane>
diff --git a/src/views/common/ztt-table.vue b/src/views/common/ztt-table.vue
index 41c2e5b..64d8045 100644
--- a/src/views/common/ztt-table.vue
+++ b/src/views/common/ztt-table.vue
@@ -397,6 +397,7 @@
@size-change="sizeChangeHandle"
:page-sizes="[10, 20, 50, 100]"
:page-size="pagination.pageSize"
+ :page-count="pagination.size"
:layout="
size
? 'total, prev, pager, next'
@@ -718,6 +719,7 @@
currentPage:
this.table.currentPage == null ? 1 : this.table.currentPage,
pageSize: this.table.pageSize == null ? 20 : this.table.pageSize,
+ size: this.table.size == null ? 7 : this.table.size,
total: this.table.total == null ? 0 : this.table.total
}, // 鍒嗛〉淇℃伅
inMemoryColWidth: {}, // 璁板繂涓垪瀹斤紝榛樿鍒楀
@@ -1576,7 +1578,7 @@
if (response.code != '0') {
this.$message.warning(response.msg)
} else {
- if(response.data!=""&&response.data!=[]){
+ if(response.data!=""&&response.data!=[]&&response.data!=null){
this.$message({
message: response.data,
type: 'success'
diff --git a/src/views/equipment/metering/index.vue b/src/views/equipment/metering/index.vue
index 022b8cd..3f858da 100644
--- a/src/views/equipment/metering/index.vue
+++ b/src/views/equipment/metering/index.vue
@@ -85,7 +85,7 @@
isRefresh: true, // 鏄惁鏄剧ず鍒锋柊鎸夐挳
isShowHide: true, // 鏄惁鏄剧ず鏄惧奖鎸夐挳
isSearch: false, // 楂樼骇鏌ヨ鎸夐挳
- defaultOrderBy: { column: 'manufactureDate', direction: 'desc' }
+ defaultOrderBy: { column: 'id', direction: 'desc' }
},
table: {
total: 0,
diff --git a/src/views/plan/manfacturingorderstatement/index.vue b/src/views/plan/manfacturingorderstatement/index.vue
index 8a8d39f..776a906 100644
--- a/src/views/plan/manfacturingorderstatement/index.vue
+++ b/src/views/plan/manfacturingorderstatement/index.vue
@@ -1,107 +1,66 @@
<template>
<div class="mod-config">
<basic-container>
- <div class="avue-crud">
- <el-row>
- <el-col :span="1">
- <div>
- <el-divider direction="vertical"></el-divider>
- <div
- style="float: left;height: 18px;font-size: 13px;line-height: 18px;font-weight: bold"
- >
- <span>閿�鍞鍗�</span>
- </div>
- </div>
- </el-col>
- <el-col :span="3">
- <div>
- <el-input
- clearable
- @keyup.enter.native="getDataList"
- v-model="paramObject.customerOrderNo"
- placeholder="閿�鍞鍗�"
- @clear="getDataList"
- style="width: 100%"
- >
- </el-input>
- </div>
- </el-col>
- <el-col :span="1" offset="1">
- <div>
- <el-divider direction="vertical"></el-divider>
- <div
- style="float: left;height: 18px;font-size: 13px;line-height: 18px;font-weight: bold"
- >
- <span>涓昏鍒掑彿</span>
- </div>
- </div>
- </el-col>
- <el-col :span="3">
- <div>
- <el-input
- clearable
- @keyup.enter.native="getDataList"
- v-model="paramObject.mpsNo"
- placeholder="涓昏鍒掑彿"
- @clear="getDataList"
- style="width: 100%"
- >
- </el-input>
- </div>
- </el-col>
- <el-col :span="1" offset="1">
- <div>
- <el-divider direction="vertical"></el-divider>
- <div
- style="float: left;height: 18px;font-size: 13px;line-height: 18px;font-weight: bold"
- >
- <span>杞﹂棿璁㈠崟</span>
- </div>
- </div>
- </el-col>
- <el-col :span="3">
- <div>
- <el-input
- clearable
- @keyup.enter.native="getDataList"
- v-model="paramObject.moNo"
- placeholder="杞﹂棿璁㈠崟"
- @clear="getDataList"
- style="width: 100%"
- >
- </el-input>
- </div>
- </el-col>
- <el-col :span="1" offset="1">
- <div>
- <el-divider direction="vertical"></el-divider>
- <div
- style="float: left;height: 18px;font-size: 13px;line-height: 18px;font-weight: bold"
- >
- <span>闇�姹傛棩鏈�</span>
- </div>
- </div>
- </el-col>
- <el-col :span="3">
- <div>
- <el-date-picker
- clearable
- v-model="paramObject.requiredDate"
- type="datetimerange"
- start-placeholder="寮�濮�"
- end-placeholder="缁撴潫"
- value-format="yyyy-MM-dd HH:mm:ss"
- @change="feedDateChange($event)"
- size="mini"
- style="width:100px"
- >
- </el-date-picker>
- </div>
- </el-col>
- <el-col :span="2" offset="1">
- <el-button type="primary" @click="getDataList()">鎼滅储</el-button>
- </el-col>
- </el-row>
+ <div class="avue-crud" style="margin: 0px 10px">
+ <el-form :model="paramObject" label-width="100px" label-position="right">
+ <el-row>
+ <el-col :span="5">
+ <el-form-item label="閿�鍞鍗�">
+ <el-input
+ clearable
+ @keyup.enter.native="getDataList"
+ v-model="paramObject.customerOrderNo"
+ placeholder="閿�鍞鍗�"
+ @clear="getDataList"
+ style="width: 100%"
+ > </el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="5">
+ <el-form-item label="涓昏鍒掑彿">
+ <el-input
+ clearable
+ @keyup.enter.native="getDataList"
+ v-model="paramObject.mpsNo"
+ placeholder="涓昏鍒掑彿"
+ @clear="getDataList"
+ style="width: 100%"
+ > </el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="5">
+ <el-form-item label="杞﹂棿璁㈠崟">
+ <el-input
+ clearable
+ @keyup.enter.native="getDataList"
+ v-model="paramObject.moNo"
+ placeholder="杞﹂棿璁㈠崟"
+ @clear="getDataList"
+ style="width: 100%"
+ > </el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="5">
+ <el-form-item label="闇�姹傛棩鏈�">
+ <el-date-picker
+ style="width:100%"
+ clearable
+ v-model="paramObject.requiredDate"
+ type="datetimerange"
+ start-placeholder="寮�濮�"
+ end-placeholder="缁撴潫"
+ value-format="yyyy-MM-dd HH:mm:ss"
+ @change="feedDateChange($event)"
+ size="mini"
+ > </el-date-picker>
+ </el-form-item>
+ </el-col>
+ <el-col :span="3" :offset="1">
+ <el-button type="primary" @click="getDataList()">鎼滅储</el-button>
+ </el-col>
+ </el-row>
+ </el-form>
+
<el-table
:data="dataList"
border
@@ -110,12 +69,14 @@
class="l-mes-table"
:height="screenHeight"
>
- <el-table-column type="index" label="搴忓彿" width="50">
+ <el-table-column type="index" label="搴忓彿" align="center" width="50">
</el-table-column>
<el-table-column
prop="customerName"
header-align="center"
align="center"
+ min-width="120"
+ show-overflow-tooltip
label="瀹㈡埛鍚嶇О"
>
</el-table-column>
@@ -123,6 +84,8 @@
prop="customerOrderNo"
header-align="center"
align="center"
+ min-width="120"
+ show-overflow-tooltip
label="閿�鍞鍗曞彿"
>
</el-table-column>
@@ -130,6 +93,8 @@
prop="mpsNo"
header-align="center"
align="center"
+ min-width="120"
+ show-overflow-tooltip
label="涓昏鍒掑彿"
>
</el-table-column>
@@ -137,6 +102,8 @@
prop="partNo"
header-align="center"
align="center"
+ min-width="120"
+ show-overflow-tooltip
label="闆朵欢鍙�"
>
</el-table-column>
@@ -144,6 +111,8 @@
prop="partName"
header-align="center"
align="center"
+ min-width="120"
+ show-overflow-tooltip
label="闆朵欢鍚嶇О"
>
</el-table-column>
@@ -151,6 +120,8 @@
prop="qtyRequired"
header-align="center"
align="center"
+ min-width="120"
+ show-overflow-tooltip
label="杞﹂棿璁㈠崟闇�姹傛暟閲�"
>
</el-table-column>
@@ -158,6 +129,8 @@
prop="unit"
header-align="center"
align="center"
+ min-width="120"
+ show-overflow-tooltip
label="鍗曚綅"
>
</el-table-column>
@@ -165,6 +138,8 @@
prop="requiredDate"
header-align="center"
align="center"
+ min-width="120"
+ show-overflow-tooltip
label="闇�姹傛棩鏈�"
>
</el-table-column>
@@ -172,6 +147,8 @@
prop="moNo"
header-align="center"
align="center"
+ min-width="120"
+ show-overflow-tooltip
label="杞﹂棿璁㈠崟鍙�"
>
</el-table-column>
@@ -180,6 +157,8 @@
prop="name"
header-align="center"
align="center"
+ min-width="100"
+ show-overflow-tooltip
label="宸ュ簭鍚嶇О"
>
</el-table-column>
@@ -187,6 +166,8 @@
prop="operationPartNo"
header-align="center"
align="center"
+ min-width="100"
+ show-overflow-tooltip
label="宸ュ簭闆朵欢鍙�"
>
</el-table-column>
@@ -194,6 +175,8 @@
prop="operationPartName"
header-align="center"
align="center"
+ min-width="100"
+ show-overflow-tooltip
label="宸ュ簭闆朵欢鍚嶇О"
>
</el-table-column>
@@ -201,6 +184,8 @@
prop="pda"
header-align="center"
align="center"
+ min-width="100"
+ show-overflow-tooltip
label="宸ュ簭闇�姹傛暟閲�"
>
</el-table-column>
@@ -208,6 +193,8 @@
prop="plannedQuantity"
header-align="center"
align="center"
+ min-width="100"
+ show-overflow-tooltip
label="宸ュ崟鐨勮鍒掓暟閲�"
>
</el-table-column>
@@ -215,6 +202,8 @@
prop="completedQuantity"
header-align="center"
align="center"
+ min-width="100"
+ show-overflow-tooltip
label="宸ュ崟鐨勫畬鎴愭暟閲�"
>
</el-table-column>
@@ -222,6 +211,8 @@
prop="units"
header-align="center"
align="center"
+ min-width="100"
+ show-overflow-tooltip
label="鍗曚綅"
>
</el-table-column>
@@ -230,6 +221,8 @@
prop="count"
header-align="center"
align="center"
+ min-width="100"
+ show-overflow-tooltip
label="宸ュ簭瀹屾垚杩涘害"
>
</el-table-column>
diff --git a/src/views/plan/manufacturingorder/customerorder.vue b/src/views/plan/manufacturingorder/customerorder.vue
index 81fa5d7..b6bf324 100644
--- a/src/views/plan/manufacturingorder/customerorder.vue
+++ b/src/views/plan/manufacturingorder/customerorder.vue
@@ -207,7 +207,7 @@
></el-input
></el-form-item>
</el-row>
- </el-card>
+ <!-- </el-card> -->
</el-tab-pane>
<el-tab-pane label="闄勪欢" type="card" name="闄勪欢">
<div style="display: flex;justify-content:flex-end;">
@@ -321,16 +321,6 @@
</el-tab-pane>
</el-tabs>
</el-form>
- <span slot="footer" class="dialog-footer">
- <el-button @click="visible = false">鍙栨秷</el-button>
- <el-button
- type="primary"
- :disabled="buttonDisable"
- v-thinclick="`dataFormSubmit`"
- v-if="editable"
- >纭畾</el-button
- >
- </span>
</el-tab-pane>
</el-tabs>
</template>
@@ -369,6 +359,8 @@
fileList: [],
title: '',
orderParamList: [],
+ progrecessFileLoading: false,
+ editable: true,
isFullScreen: false,
visible: false,
buttonDisable: false,
diff --git a/src/views/plan/manufacturingorder/routing.vue b/src/views/plan/manufacturingorder/routing.vue
index ded6d3f..4726c8e 100644
--- a/src/views/plan/manufacturingorder/routing.vue
+++ b/src/views/plan/manufacturingorder/routing.vue
@@ -96,15 +96,15 @@
isSearch: true,
searchInfoType: 'text'
},
- {
- minWidth: '100',
- prop: 'name',
- label: '宸ヨ壓鍚嶇О',
- sort: true,
- isTrue: true,
- isSearch: true,
- searchInfoType: 'text'
- },
+ // {
+ // minWidth: '100',
+ // prop: 'name',
+ // label: '宸ヨ壓鍚嶇О',
+ // sort: true,
+ // isTrue: true,
+ // isSearch: true,
+ // searchInfoType: 'text'
+ // },
// 宸ヨ壓绫诲瀷
{
minWidth: '120',
diff --git a/src/views/plan/operationtask/operationtask-form.vue b/src/views/plan/operationtask/operationtask-form.vue
index 02fb8dc..2c1d48e 100644
--- a/src/views/plan/operationtask/operationtask-form.vue
+++ b/src/views/plan/operationtask/operationtask-form.vue
@@ -778,6 +778,7 @@
// this.dataForm.partName = this.routingList.partName
// this.dataForm.partId = this.routingList.partId
// 鍒堕�犺鍗昮orm鍒涘缓鐨勶紝鑷姩甯﹀嚭宸ュ簭
+ console.log(this.routingOptions);
if (param.selectedRoutingOperationId && this.routingOptions) {
const option = this.routingOptions.find(
(e) => e.id === param.selectedRoutingOperationId
diff --git a/src/views/plan/productionschedul/index.vue b/src/views/plan/productionschedul/index.vue
index b76fe0c..d47995b 100644
--- a/src/views/plan/productionschedul/index.vue
+++ b/src/views/plan/productionschedul/index.vue
@@ -4,8 +4,14 @@
<el-row>
<el-col :span="12">
<div style="height:80vh;padding: 0px 10px;">
- <avue-crud :data="tableData" ref="crud" :option="option" :span-method="spanMethod"
+ <avue-crud
+ :data="tableData"
+ ref="crud"
+ :option="option"
+ :span-method="spanMethod"
@refresh-change="getData"
+ @current-change="handleCurrentChange"
+ @size-change="handleSizeChange"
:page="page"
@selection-change="selectionRow"
:table-loading="loading">
@@ -134,7 +140,6 @@
deleteSchedul,
updateSchedul
} from '@/api//plan/productionschedul'
-import TableForm from './template-form'
import ttable from '@/views/common/ztt-table.vue'
import { mapGetters } from 'vuex'
export default {
@@ -156,7 +161,8 @@
page: {
total: 10,
currentPage: 1,
- pageSize: 10
+ pageSize: 10,
+ pagerCount: 5
},
option: {
height: 400,
@@ -291,7 +297,6 @@
},
components: {
ttable,
- TableForm,
},
computed: {
...mapGetters(['permissions']),
@@ -455,12 +460,24 @@
}
return ''
},
+ handleSizeChange(val){
+ if(val){
+ this.page.pageSize=val
+ this.getData()
+ }
+ },
+ handleCurrentChange(val){
+ if(val){
+ this.page.currentPage=val
+ this.getData()
+ }
+ },
// 鑾峰彇鏁版嵁鍒楄〃
getData() {
this.loading = true
let param = {
- size: 20,
- current: 1,
+ size: this.page.pageSize,
+ current: this.page.currentPage,
}
fetchScheduleList(param).then((res) => {
this.tableData = res.data.data.records
@@ -469,9 +486,6 @@
this.scheduleList = []
})
this.loading = false
- },
- handleCurrentChange(val) {
- this.multipleSelection = val
},
// 鍒犻櫎
deleteHandle(row,index) {
@@ -559,6 +573,9 @@
}
</script>
<style>
+.el-tag--small{
+ display: none;
+}
.basic-template-table .el-table__body .el-table__row td:first-child .cell {
padding-left: 0px;
padding-right: 0px;
diff --git a/src/views/plan/productionschedul/template-form.vue b/src/views/plan/productionschedul/template-form.vue
deleted file mode 100644
index d4a6707..0000000
--- a/src/views/plan/productionschedul/template-form.vue
+++ /dev/null
@@ -1,172 +0,0 @@
-<template>
- <el-dialog
- v-diadrag
- :title="!dataForm.id ? '鏂板' : '淇敼'"
- :close-on-click-modal="false"
- :visible.sync="visible"
- >
- <el-form
- :model="dataForm"
- :rules="dataRule"
- ref="dataForm"
- label-width="100px"
- class="l-mes"
- >
- <el-form-item label="妯℃澘缂栧彿" prop="templateNo">
- <el-input
- v-model="dataForm.templateNo"
- placeholder="妯℃澘缂栧彿"
- ></el-input>
- </el-form-item>
- <el-form-item label="妯℃澘鍚嶇О" prop="templateName">
- <el-input
- v-model="dataForm.templateName"
- placeholder="妯℃澘鍚嶇О"
- ></el-input>
- </el-form-item>
- <el-form-item label="妯℃澘绫诲瀷" prop="templateType">
- <el-select
- v-model="dataForm.templateType"
- placeholder="妯℃澘绫诲瀷"
- filterable
- style="width: 100%"
- clearable
- @change="templateTypeChange"
- >
- <el-option
- v-for="item in templateTypeList"
- :key="item.id"
- :label="item.templateTypeName"
- :value="item.templateTypeName"
- />
- </el-select>
- </el-form-item>
- <el-form-item label="澶囨敞" prop="remark">
- <el-input v-model="dataForm.remark" placeholder="澶囨敞"></el-input>
- </el-form-item>
- </el-form>
- <span slot="footer" class="dialog-footer">
- <el-button @click="visible = false">鍙栨秷</el-button>
- <el-button
- type="primary"
- :disabled="isSubmit"
- v-thinclick="`dataFormSubmit`"
- >纭畾</el-button
- >
- </span>
- </el-dialog>
-</template>
-
-<script>
-import { getObj, addObj, putObj, getTemplateTypes } from '@/api/basic/template'
-
-export default {
- data() {
- return {
- templateTypeList: [],
- visible: false,
- dataForm: {
- id: 0,
- templateName: '',
- templateNo: '',
- templateType: '',
- dataType: '',
- remark: ''
- },
- dataRule: {
- templateName: [
- { required: true, message: '妯℃澘鍚嶇О涓嶈兘涓虹┖', trigger: 'blur' }
- ],
- templateType: [
- { required: true, message: '妯℃澘绫诲瀷涓嶈兘涓虹┖', trigger: 'blur' }
- ]
- },
- isSubmit: false
- }
- },
- methods: {
- init(id) {
- this.dataForm.id = id || 0
- this.visible = true
- this.$nextTick(() => {
- this.$refs.dataForm.resetFields()
- Promise.all([this.getDict(), this.getDataForm(this.dataForm.id)]).then(
- (res) => {}
- )
- })
- },
- getDataForm(id) {
- return new Promise((resolve, reject) => {
- if (id) {
- getObj(id)
- .then((response) => {
- if (response.data.code === 0) {
- this.dataForm = response.data.data
- resolve()
- } else {
- this.dataForm = {}
- reject()
- }
- })
- .catch((error) => {
- reject(error)
- })
- }
- })
- },
- getDict() {
- return new Promise((resolve, reject) => {
- getTemplateTypes()
- .then((response) => {
- if (response.data.code === 0) {
- this.templateTypeList = response.data.data
- resolve()
- } else {
- this.templateTypeList = []
- reject()
- }
- })
- .catch((error) => {
- reject(error)
- })
- })
- },
- templateTypeChange() {
- const currOperationTemplateType = this.dataForm.templateType
- const templateType = this.templateTypeList.find(
- (item) => item.templateTypeName === currOperationTemplateType
- )
- if (templateType != undefined) {
- this.dataForm.dataType = templateType.dataType
- } else {
- this.dataForm.dataType = ''
- }
- },
- // 琛ㄥ崟鎻愪氦
- dataFormSubmit() {
- this.isSubmit = true
- this.$refs.dataForm.validate((valid) => {
- if (valid) {
- if (this.dataForm.id) {
- putObj(this.dataForm).then((data) => {
- this.$message.success('淇敼鎴愬姛')
- this.visible = false
- this.isSubmit = false
- this.$emit('refreshDataList')
- })
- } else {
- addObj(this.dataForm).then((data) => {
- this.$message.success('娣诲姞鎴愬姛')
- this.visible = false
- this.isSubmit = false
- this.$emit('refreshDataList')
- })
- }
- } else {
- this.isSubmit = false
- }
- })
- }
- }
-}
-</script>
diff --git a/src/views/product/workbench/steprecord-tab.vue b/src/views/product/workbench/steprecord-tab.vue
index fe4225e..83657bc 100644
--- a/src/views/product/workbench/steprecord-tab.vue
+++ b/src/views/product/workbench/steprecord-tab.vue
@@ -740,7 +740,6 @@
},
personBoardList: {
handler(newValue, oldValue) {
- console.log('personBoardList鐨剋atch')
this.staffList = []
var userInfoFlag = true
var staff
diff --git a/src/views/quality/finishedProductInspection/index.vue b/src/views/quality/finishedProductInspection/index.vue
index 802e21e..a009e25 100644
--- a/src/views/quality/finishedProductInspection/index.vue
+++ b/src/views/quality/finishedProductInspection/index.vue
@@ -188,30 +188,13 @@
},
],
toolbar: [
- /* {
- text: '鏂板',
- type: 'primary',
- fun: this.addOrUpdateHandle
- },
- {
- text: '瀵煎嚭',
- type: 'primary',
- fun: this.exportExcel
- }*/
+ {
+ text: '涓嬭浇妫�楠屾姤鍛�',
+ type: 'primary',
+ fun: this.downloadProReport
+ }
],
operator: [{
- text: '鎵撳嵃',
- type: 'text',
- size: 'small',
- fun: this.showPrint,
- show: {
- val: [
- '1',
- '0'
- ],
- key: 'result'
- }
- },{
text: '浣滃簾',
type: 'text',
size: 'small',
@@ -235,6 +218,9 @@
}
},
methods: {
+ downloadProReport(){
+ this.$message.info("寮�鍙戜腑...")
+ },
//鎵撳嵃鎸夐挳
printFun() {
const style = '@page {margin: 10mm 5mm; margin-bottom: 0;margin-top:0;} ' +'@media print {.title{font-size:30pt;font-weight: 400;font-family: 榛戜綋;!important;}' ;
diff --git a/src/views/technology/document/teststandard.vue b/src/views/technology/document/teststandard.vue
index f8aa95a..8a21d7e 100644
--- a/src/views/technology/document/teststandard.vue
+++ b/src/views/technology/document/teststandard.vue
@@ -59,7 +59,7 @@
deleteTestStandard,
getTestStand,
saveTestStandard
-} from '../../../api/technology/document'
+} from '@/api/technology/document'
import qualityStandardDialog from '@/views/common/teststandardradio.vue'
export default {
@@ -187,6 +187,9 @@
created() {
getTestStand(this.paramObj)
},
+ mounted(){
+ getTestStand(this.paramObj)
+ },
methods: {
// 鑾峰彇鏁版嵁鍒楄〃
getData() {
--
Gitblit v1.9.3