From 1cf81a64af5bac57f2af8c419db0b22b3d5ba7c8 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期五, 17 十一月 2023 16:37:50 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/zs-mes-before
---
src/views/plan/masterproductionschedule/index.vue | 248 +++++++++++++++++++------------------------------
1 files changed, 95 insertions(+), 153 deletions(-)
diff --git a/src/views/plan/masterproductionschedule/index.vue b/src/views/plan/masterproductionschedule/index.vue
index b88c6f4..46bb266 100644
--- a/src/views/plan/masterproductionschedule/index.vue
+++ b/src/views/plan/masterproductionschedule/index.vue
@@ -1,96 +1,55 @@
<template>
<div class="mod-config">
<basic-container>
- <ttable
- :table="table"
- @handleSelectionChange="handleSelectionChange"
- :uploadInfo="uploadInfo"
- :prelang="prelang"
- :options="options"
- :ajaxFun="ajaxFun"
- ref="masterProductionScheduleTable"
- >
+ <ttable :table="table" @handleSelectionChange="handleSelectionChange" :uploadInfo="uploadInfo" :prelang="prelang"
+ :options="options" :ajaxFun="ajaxFun" ref="masterProductionScheduleTable">
<template #toolbar>
- <el-dropdown
- v-if="permissions.masterproductionschedule_create_order"
- @command="orderTypeHandleCommand"
- >
+ <el-dropdown v-if="permissions.masterproductionschedule_create_order" @command="orderTypeHandleCommand">
<el-button>
杞﹂棿璁㈠崟<i class="el-icon-arrow-down el-icon--right"></i>
</el-button>
<el-dropdown-menu slot="dropdown">
- <el-dropdown-item
- :command="item.command"
- v-for="item in orderTypeArr"
- :disabled="item.disabled"
- >{{ item.label }}</el-dropdown-item
- >
+ <el-dropdown-item :key="index" :command="item.command" v-for="(item,index) in orderTypeArr" :disabled="item.disabled">{{
+ item.label }}</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
- <el-dropdown
- v-if="permissions.masterproductionschedule_state_change"
- @command="handleCommand"
- style="margin-left: 10px"
- >
+ <el-dropdown v-if="permissions.masterproductionschedule_state_change" @command="handleCommand"
+ style="margin-left: 10px">
<el-button>
鐘舵�佹敼鍙�<i class="el-icon-arrow-down el-icon--right"></i>
</el-button>
<el-dropdown-menu slot="dropdown">
- <el-dropdown-item
- :command="item.command"
- v-for="item in stateTagArr"
- :disabled="item.disabled"
- >{{ item.label }}</el-dropdown-item
- >
+ <el-dropdown-item :key="index" :command="item.command" v-for="(item,index) in stateTagArr" :disabled="item.disabled">{{
+ item.label }}</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
- <el-dropdown
- v-if="permissions.masterproductionschedule_doc_relate"
- @command="documentHandle"
- style="margin-left: 10px"
- >
+ <el-dropdown v-if="permissions.masterproductionschedule_doc_relate" @command="documentHandle"
+ style="margin-left: 10px">
<el-button>
宸ヨ壓鏂囦欢<i class="el-icon-arrow-down el-icon--right"></i>
</el-button>
<el-dropdown-menu slot="dropdown">
- <el-dropdown-item
- :command="item.command"
- v-for="item in documentTagArr"
- :disabled="item.disabled"
- >
+ <el-dropdown-item :key="index" :command="item.command" v-for="(item,index) in documentTagArr" :disabled="item.disabled">
{{ item.label }}
</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
<!--瀹℃牳鐘舵�佹敼鍙�-->
- <el-dropdown
- v-if="permissions.masterproductionschedule_audit_change"
- @command="handleCommitCommand"
- style="margin-left: 10px"
- >
+ <el-dropdown v-if="permissions.masterproductionschedule_audit_change" @command="handleCommitCommand"
+ style="margin-left: 10px">
<el-button>
瀹℃牳鐘舵�佹敼鍙�<i class="el-icon-arrow-down el-icon--right"></i>
</el-button>
<el-dropdown-menu slot="dropdown">
- <el-dropdown-item
- :command="item.command"
- v-for="item in commitStateTagArr"
- :disabled="item.disabled"
- >{{ item.label }}</el-dropdown-item
- >
+ <el-dropdown-item :key="index" :command="item.command" v-for="(item,index) in commitStateTagArr" :disabled="item.disabled">{{item.label }}</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
- <el-button
- v-if="permissions.masterproductionschedule_submit_oa"
- @click="commitOa()"
- type="primary"
- style="margin-left:10px;"
- :loading="loadingOa"
- >鎻愪氦OA
+ <el-button v-if="permissions.masterproductionschedule_submit_oa" @click="commitOa()" type="primary"
+ style="margin-left:10px;" :loading="loadingOa">鎻愪氦OA
</el-button>
- <el-button
+ <!-- <el-button
v-if="permissions.masterproductionschedule_sync_scm"
@click="syncScm()"
type="primary"
@@ -103,65 +62,39 @@
type="primary"
style="margin-left:10px;"
>SCM鐘舵�佸彉鏇�
+ </el-button> -->
+ <el-button
+ type="primary"
+ style="margin-left:10px;"
+ >鏂板閲囪喘璁″垝
</el-button>
</template>
</ttable>
<!-- 寮圭獥, 淇敼 -->
- <table-form
- v-if="addOrUpdateVisible"
- ref="addOrUpdate"
- @refreshDataList="getData"
- />
- <source-table
- v-if="masterPlanSourceDialogVisible"
- ref="source"
- @refreshDataList="getData"
- />
+ <table-form v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getData" />
+ <source-table v-if="masterPlanSourceDialogVisible" ref="source" @refreshDataList="getData" />
<order-table v-if="orderVisible" ref="order" />
- <manufacturing-order
- v-if="manufacturingOrderVisible"
- ref="manufacturingOrder"
- @refreshDataList="getData"
- />
- <outsourcing-order
- v-if="outsourcingOrderVisible"
- ref="outsourcingOrder"
- @refreshDataList="getData"
- />
+ <manufacturing-order v-if="manufacturingOrderVisible" ref="manufacturingOrder" @refreshDataList="getData" />
+ <outsourcing-order v-if="outsourcingOrderVisible" ref="outsourcingOrder" @refreshDataList="getData" />
<!--搴撳瓨-->
<stockDialog :currshowlist.sync="stockVisible" :partName="partName" />
<!--宸ヨ壓鏂囦欢-->
- <DocumentTable
- :currshowlist.sync="showDocument"
- :multiSelect="false"
- :relationOrderList="masterPlanSelection"
- @listenToDocumentEvent="selectDocument"
- >
+ <DocumentTable :currshowlist.sync="showDocument" :multiSelect="false" :relationOrderList="masterPlanSelection"
+ @listenToDocumentEvent="selectDocument">
</DocumentTable>
<!--鎵嬪姩鍒涘缓杞﹂棿璁㈠崟-->
- <ManualManufacturingOrder
- :currshowlist.sync="showManualManufacturingOrder"
- :manualMasterProduction="manualMasterProduction"
- @refreshOrderFromManual="refreshOrderFromManual"
- >
+ <ManualManufacturingOrder :currshowlist.sync="showManualManufacturingOrder"
+ :manualMasterProduction="manualMasterProduction" @refreshOrderFromManual="refreshOrderFromManual">
</ManualManufacturingOrder>
<!--鑷姩鍒涘缓杞﹂棿璁㈠崟-->
- <AutoManufacturingorder
- :currshowlist.sync="showAutoManufacturingOrder"
- :masterProduction="manualMasterProduction"
- :isReportOperation="isReportOperation"
- :outPutBatchList="selectedOutPutBatchList"
- :qtyPlaned="qtyPlaned"
- @refreshDataList="AutoManuFinished"
- >
+ <AutoManufacturingorder :currshowlist.sync="showAutoManufacturingOrder" :masterProduction="manualMasterProduction"
+ :isReportOperation="isReportOperation" :outPutBatchList="selectedOutPutBatchList" :qtyPlaned="qtyPlaned"
+ @refreshDataList="AutoManuFinished">
</AutoManufacturingorder>
<!--寮圭獥,鏂板-->
- <MasterproductionForm
- :currshowlist.sync="showMasterproductionForm"
- @refreshDataList="getData"
- >
+ <MasterproductionForm :currshowlist.sync="showMasterproductionForm" @refreshDataList="getData">
</MasterproductionForm>
<!--浜у嚭鎵规-->
<!--<OutPutBatch
@@ -553,33 +486,33 @@
isSearch: true,
searchInfoType: 'text'
},
- {
- minWidth: '140',
- prop: 'outerColor',
- label: '澶栨姢棰滆壊',
- sort: true,
- isTrue: true,
- isSearch: true,
- searchInfoType: 'text'
- },
- {
- minWidth: '140',
- prop: 'lengthRequirement',
- label: '鐩橀暱瑕佹眰',
- sort: true,
- isTrue: true,
- isSearch: true,
- searchInfoType: 'text'
- },
- {
- minWidth: '140',
- prop: 'printRequirement',
- label: '鍗板瓧瑕佹眰',
- sort: true,
- isTrue: true,
- isSearch: true,
- searchInfoType: 'text'
- },
+ // {
+ // minWidth: '140',
+ // prop: 'outerColor',
+ // label: '澶栨姢棰滆壊',
+ // sort: true,
+ // isTrue: true,
+ // isSearch: true,
+ // searchInfoType: 'text'
+ // },
+ // {
+ // minWidth: '140',
+ // prop: 'lengthRequirement',
+ // label: '鐩橀暱瑕佹眰',
+ // sort: true,
+ // isTrue: true,
+ // isSearch: true,
+ // searchInfoType: 'text'
+ // },
+ // {
+ // minWidth: '140',
+ // prop: 'printRequirement',
+ // label: '鍗板瓧瑕佹眰',
+ // sort: true,
+ // isTrue: true,
+ // isSearch: true,
+ // searchInfoType: 'text'
+ // },
{
minWidth: '140',
prop: 'orderRemark',
@@ -593,34 +526,40 @@
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
+ fun: this.deleteMainPlan
}
+ // {
+ // 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
}
},
@@ -708,6 +647,9 @@
this.getSysParam(sysParam.IS_REPORT_OPERATION)
},
methods: {
+ deleteMainPlan(row){
+ console.log(row);
+ },
getSysParam(paramKey) {
getSysParam(paramKey).then((response) => {
var paramVal = response.data.data
@@ -771,7 +713,7 @@
closeOnClickModal: false,
type: 'warning'
})
- .then(function() {
+ .then(function () {
return delObj(row.id)
})
.then((data) => {
@@ -1076,7 +1018,7 @@
handleSelectionChange(val) {
// 鏍规嵁鐘舵�侊紝绂佺敤琛ㄥご鎸夐挳
// 绛涢�夊嚭閫変腑璁板綍鐨勭姸鎬�
- var stateArr = val.map(function(value, index) {
+ var stateArr = val.map(function (value, index) {
return value.state
})
// 閫変腑鐘舵�佹暟缁勫厓绱犲幓閲�
@@ -1174,7 +1116,7 @@
localStorage.setItem('masterschedule_partno', row.partNo)
localStorage.setItem('masterschedule_qtyrequired', row.qtyRequired)
- this.$router.push('/warehouse/orderreserved/index').catch(() => {})
+ this.$router.push('/warehouse/orderreserved/index').catch(() => { })
} else {
this.$message.warning('璇ョ敓浜ц鍒掞紝涓嶅彲杩涜瀹㈡埛璁㈠崟棰勭暀锛�')
}
--
Gitblit v1.9.3