From 4bf8bbebde0131fb5804a9aab00f9e7cf0718b52 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期一, 13 十一月 2023 17:11:25 +0800
Subject: [PATCH] modified: src/views/plan/customerorder/index.vue modified: src/views/plan/manufacturingorder/index.vue modified: src/views/plan/manufacturingorder/productorder-form.vue modified: src/views/plan/masterproductionschedule/index.vue modified: src/views/plan/operationtask/index.vue
---
src/views/plan/masterproductionschedule/index.vue | 52 +++++++-----
src/views/plan/manufacturingorder/index.vue | 52 ++++++------
src/views/plan/customerorder/index.vue | 14 +--
src/views/plan/manufacturingorder/productorder-form.vue | 51 ++++++------
src/views/plan/operationtask/index.vue | 51 +++++++-----
5 files changed, 116 insertions(+), 104 deletions(-)
diff --git a/src/views/plan/customerorder/index.vue b/src/views/plan/customerorder/index.vue
index 1810399..63f8c5a 100644
--- a/src/views/plan/customerorder/index.vue
+++ b/src/views/plan/customerorder/index.vue
@@ -69,9 +69,9 @@
style="margin-left:10px;"
type="primary"
@click="pushOtc"
- >鎺ㄩ�丒RP</el-button
+ >鎺ㄩ�丱TC</el-button
>
- <el-button
+ <!-- <el-button
style="margin-left:10px;"
type="primary"
@click="importOutPutBatch"
@@ -82,7 +82,7 @@
type="primary"
@click="exportStandBook"
>瀵煎嚭鍙拌处</el-button
- >
+ > -->
<el-button
v-if="permissions.plan_customerorder_return"
style="margin-left:10px;"
@@ -1019,12 +1019,6 @@
fun: this.stockHandle
},
{
- text: '绠辩爜淇℃伅瀵煎嚭',
- type: 'text',
- size: 'small',
- fun: this.packageExportHandle
- },
- {
text: '浣滃簾',
type: 'text',
size: 'small',
@@ -1224,7 +1218,7 @@
}
if (this.permissions.customerorder_ifs_line) {
this.table.toolbar.push({
- text: '鑾峰彇ERP琛屽彿',
+ text: '鑾峰彇OTC琛屽彿',
type: 'primary',
fun: this.pullIfsLineNo,
disabled: false,
diff --git a/src/views/plan/manufacturingorder/index.vue b/src/views/plan/manufacturingorder/index.vue
index 7ba7935..8242121 100644
--- a/src/views/plan/manufacturingorder/index.vue
+++ b/src/views/plan/manufacturingorder/index.vue
@@ -53,19 +53,19 @@
@command="issueMaterialHandleCommand"
style="margin-left:10px;"
>
- <el-button>
+ <!-- <el-button>
鍙戞枡<i class="el-icon-arrow-down el-icon--right"></i>
- </el-button>
- <el-dropdown-menu slot="dropdown">
+ </el-button> -->
+ <!-- <el-dropdown-menu slot="dropdown">
<el-dropdown-item
:command="item.command"
v-for="item in issueMaterialArr"
:disabled="item.disabled"
>{{ item.label }}</el-dropdown-item
>
- </el-dropdown-menu>
+ </el-dropdown-menu> -->
</el-dropdown>
- <el-button
+ <!-- <el-button
v-if="permissions.manufacturingorder_orderto_ifs"
@click="commitOrderIfs()"
type="primary"
@@ -88,7 +88,7 @@
style="margin-left:10px;"
:loading="loadingStructIfs"
>鐗╂枡鍚屾ERP
- </el-button>
+ </el-button> -->
<el-button
v-if="permissions.manufacturingorder_refresh_ifsorder"
@click="refreshIfsorder()"
@@ -230,7 +230,7 @@
taskTypeArr: [],
stateTagArr: [
{
- label: '宸茶鍒�',
+ label: '寰呬笅杈�',
command: 'PLAN',
disabled: false,
permitArr: ['03completed', '04canceled']
@@ -269,7 +269,7 @@
}
],
states: [
- { value: '01planned', label: '宸茶鍒�' },
+ { value: '01planned', label: '寰呬笅杈�' },
{ value: '02issued', label: '宸蹭笅杈�' },
{
value: '03completed',
@@ -408,24 +408,24 @@
isSearch: true,
searchInfoType: 'text'
},
- {
- minWidth: '120',
- prop: 'printRequirement',
- label: '鍗板瓧瑕佹眰',
- sort: true,
- isTrue: true,
- isSearch: true,
- searchInfoType: 'text'
- },
- {
- minWidth: '120',
- prop: 'lengthRequirement',
- label: '鐩橀暱瑕佹眰',
- sort: true,
- isTrue: true,
- isSearch: true,
- searchInfoType: 'text'
- },
+ // {
+ // minWidth: '120',
+ // prop: 'printRequirement',
+ // label: '鍗板瓧瑕佹眰',
+ // sort: true,
+ // isTrue: true,
+ // isSearch: true,
+ // searchInfoType: 'text'
+ // },
+ // {
+ // minWidth: '120',
+ // prop: 'lengthRequirement',
+ // label: '鐩橀暱瑕佹眰',
+ // sort: true,
+ // isTrue: true,
+ // isSearch: true,
+ // searchInfoType: 'text'
+ // },
{
minWidth: '120',
prop: 'orderRemark',
diff --git a/src/views/plan/manufacturingorder/productorder-form.vue b/src/views/plan/manufacturingorder/productorder-form.vue
index 212ad12..4b5e6b1 100644
--- a/src/views/plan/manufacturingorder/productorder-form.vue
+++ b/src/views/plan/manufacturingorder/productorder-form.vue
@@ -108,27 +108,6 @@
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="澶栨姢棰滆壊" prop="outerColor">
- <el-input
- readonly
- v-model="dataForm.outerColor"
- placeholder=""
- ></el-input>
- </el-form-item>
- </el-col>
-
- <el-col :span="6">
- <el-form-item label="缁濈紭棰滆壊" prop="insulationColor">
- <el-input
- v-model="dataForm.insulationColor"
- placeholder=""
- ></el-input>
- </el-form-item>
- </el-col>
- </el-row>
-
- <el-row :gutter="10">
- <el-col :span="6">
<el-form-item label="澶囨敞" prop="remark">
<el-input v-model="dataForm.remark" placeholder=""></el-input>
</el-form-item>
@@ -151,6 +130,26 @@
</el-select>
</el-form-item>
</el-col>
+ <!-- <el-col :span="6">
+ <el-form-item label="澶栨姢棰滆壊" prop="outerColor">
+ <el-input
+ readonly
+ v-model="dataForm.outerColor"
+ placeholder=""
+ ></el-input>
+ </el-form-item>
+ </el-col>
+
+ <el-col :span="6">
+ <el-form-item label="缁濈紭棰滆壊" prop="insulationColor">
+ <el-input
+ v-model="dataForm.insulationColor"
+ placeholder=""
+ ></el-input>
+ </el-form-item>
+ </el-col> -->
+ </el-row>
+ <!-- <el-row :gutter="10">
<el-col :span="8">
<el-col
:span="8"
@@ -189,7 +188,7 @@
</el-switch>
</el-form-item>
</el-col>
- <!-- <el-col :span="2">
+ <el-col :span="2">
<el-form-item label="BOM纭">
<el-switch >
</el-switch>
@@ -206,8 +205,8 @@
<el-switch >
</el-switch>
</el-form-item>
- </el-col> -->
- </el-row>
+ </el-col>
+ </el-row> -->
</div>
<div class="productorder-detail">
<el-card class="productorder-list">
@@ -244,13 +243,13 @@
</el-select>
</el-form-item>
</el-col>
- <el-col :span="8">
+ <!-- <el-col :span="8">
<el-form-item label-width="0px">
<el-checkbox v-model="currentRouting.master" disabled
>榛樿宸ヨ壓璺嚎
</el-checkbox>
</el-form-item>
- </el-col>
+ </el-col> -->
</el-row>
<el-row>
<el-col :span="24">
diff --git a/src/views/plan/masterproductionschedule/index.vue b/src/views/plan/masterproductionschedule/index.vue
index b88c6f4..a35f496 100644
--- a/src/views/plan/masterproductionschedule/index.vue
+++ b/src/views/plan/masterproductionschedule/index.vue
@@ -104,6 +104,11 @@
style="margin-left:10px;"
>SCM鐘舵�佸彉鏇�
</el-button>
+ <el-button
+ type="primary"
+ style="margin-left:10px;"
+ >鏂板閲囪喘璁″垝
+ </el-button>
</template>
</ttable>
@@ -593,34 +598,39 @@
toolbar: [],
operator: [
{
- text: '璁㈠崟棰勭暀',
+ text: '浣滃簾',
type: 'text',
size: 'small',
- fun: this.customReserved
- },
- {
- text: '鏌ョ湅搴撳瓨',
- type: 'text',
- size: 'small',
- fun: this.stockHandle
- },
- {
- text: '鏉ユ簮',
- type: 'text',
- size: 'small',
- fun: this.searchMasterPlanSourceHandle
- },
- {
- text: '璁㈠崟',
- type: 'text',
- size: 'small',
- fun: this.searchOrderHandle
}
+ // {
+ // text: '璁㈠崟棰勭暀',
+ // type: 'text',
+ // size: 'small',
+ // fun: this.customReserved
+ // },
+ // {
+ // text: '鏌ョ湅搴撳瓨',
+ // type: 'text',
+ // size: 'small',
+ // fun: this.stockHandle
+ // },
+ // {
+ // text: '鏉ユ簮',
+ // type: 'text',
+ // size: 'small',
+ // fun: this.searchMasterPlanSourceHandle
+ // },
+ // {
+ // text: '璁㈠崟',
+ // type: 'text',
+ // size: 'small',
+ // fun: this.searchOrderHandle
+ // }
],
operatorConfig: {
fixed: 'right',
label: '鎿嶄綔',
- width: 240,
+ width: 100,
minWidth: 100
}
},
diff --git a/src/views/plan/operationtask/index.vue b/src/views/plan/operationtask/index.vue
index c4c89b8..9f48251 100644
--- a/src/views/plan/operationtask/index.vue
+++ b/src/views/plan/operationtask/index.vue
@@ -36,15 +36,24 @@
>
鍚堝苟宸ュ崟
</el-button>
+ <el-button style="margin-left:10px" @click="openTaskOrder">
+ 浼樺厛绾�
+ </el-button>
<el-button
+ type="primary"
v-if="permissions.operationtask_pallet_transport"
style="margin-left:10px"
@click="openTaskMaterial"
>
- 璐х洏杩愯緭
+ 鎵撳嵃妯″叿棰嗙敤娓呭崟
</el-button>
- <el-button style="margin-left:10px" @click="openTaskOrder">
- 浼樺厛绾�
+ <el-button
+ type="primary"
+ v-if="permissions.operationtask_pallet_transport"
+ style="margin-left:10px"
+ @click="openTaskMaterial"
+ >
+ 鎵撳嵃鐗╂枡棰嗙敤娓呭崟
</el-button>
</template>
</ttable>
@@ -379,24 +388,24 @@
isSearch: true,
searchInfoType: 'text'
},
- {
- minWidth: '120',
- prop: 'discNum',
- label: '鐩樻暟',
- sort: true,
- isTrue: true,
- isSearch: true,
- searchInfoType: 'text'
- },
- {
- minWidth: '120',
- prop: 'reelSpec',
- label: '杞藉叿瑙勬牸',
- sort: true,
- isTrue: true,
- isSearch: true,
- searchInfoType: 'text'
- },
+ // {
+ // minWidth: '120',
+ // prop: 'discNum',
+ // label: '鐩樻暟',
+ // sort: true,
+ // isTrue: true,
+ // isSearch: true,
+ // searchInfoType: 'text'
+ // },
+ // {
+ // minWidth: '120',
+ // prop: 'reelSpec',
+ // label: '杞藉叿瑙勬牸',
+ // sort: true,
+ // isTrue: true,
+ // isSearch: true,
+ // searchInfoType: 'text'
+ // },
{
width: '130',
prop: 'ratio',
--
Gitblit v1.9.3