wilson
/
xujiecloud-vue
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

2025-04-27 

点检工单和计划增加取消人，取消时间
java8
fengyuan_yang 9 months ago
parent
c2ab3228a6
commit
fe1a1af502
3 changed files with 19 additions and 16 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/views/modules/eam/com_eam_object_add_update.vue
  2. 7
      src/views/modules/eam/eamWorkOrderForCheck.vue
  3. 26
      src/views/modules/part/copy_bom_modal.vue

2
src/views/modules/eam/com_eam_object_add_update.vue
View File

@ -134,7 +134,7 @@ import {
} from '@/api/eam/com_eam_object_add_update.js'
import {getSiteAndBuByUserName} from "@/api/eam/eam.js"
/* 引入组件 */
import Chooselist from '@/views/modules/common/Chooselist_eam';/* 列表组件 */
import Chooselist from '@/views/modules/common/Chooselist_eam';
var functionId = 'C10000001';
export default {

7
src/views/modules/eam/eamWorkOrderForCheck.vue
View File

@ -993,7 +993,8 @@
functionType: '',
cancelAll: '',
planID: '',
status: ''
status: '',
userId: ''
},
descImages: [],
imageModalFlag: false,
@ -1491,7 +1492,8 @@
functionType: row.functionType,
planID: row.planID,
status: row.status,
cancelAll: ''
cancelAll: '',
userId: this.$store.state.user.name
}
this.cancelModelFlag = true
},
@ -1513,7 +1515,6 @@
type: 'warning'
}).then(() => {
this.cancelOrder3()
}).catch(() => {
})
} else {
this.cancelOrder3()

26
src/views/modules/part/copy_bom_modal.vue
View File

@ -443,15 +443,16 @@
<!-- BOM切换版本 -->
<el-dialog v-if="this.activeTable === 'temp_bom'" title="BOM版本切换" :visible.sync="versionVisible1" append-to-body :close-on-click-modal="false" v-drag width="900px">
<el-table :data="versionList1" ref="versionTable" :row-style="levelRowStyle" @row-click="levelRowClick" style="width: 100%" border :height="240">
<el-table-column label="物料编码" prop="partNo" header-align="center" align="center" show-overflow-tooltip min-width="140"/>
<el-table-column label="物料描述" prop="partDesc" header-align="center" align="center" show-overflow-tooltip min-width="200"/>
<el-table-column label="版本" prop="engChgLevel" header-align="center" align="center" show-overflow-tooltip min-width="60"/>
<el-table-column label="物料编码" prop="partNo" header-align="center" align="left" show-overflow-tooltip min-width="140"/>
<el-table-column label="物料描述" prop="partDesc" header-align="center" align="left" show-overflow-tooltip min-width="200"/>
<el-table-column label="版本" prop="engChgLevel" header-align="center" align="right" show-overflow-tooltip min-width="60"/>
<el-table-column label="类型" prop="bomType" header-align="center" align="center" show-overflow-tooltip min-width="100"/>
<el-table-column label="备注" prop="noteText" header-align="center" align="left" show-overflow-tooltip min-width="100"/>
</el-table>
<el-table :data="alternativeList1" :row-style="alternativeRowStyle1" ref="versionTable" style="width: 100%;margin-top: 20px" border :height="240">
<el-table-column label="物料编码" prop="partNo" header-align="center" align="center" show-overflow-tooltip min-width="140"/>
<el-table-column label="物料描述" prop="partDesc" header-align="center" align="center" show-overflow-tooltip min-width="200"/>
<el-table-column label="版本" prop="engChgLevel" header-align="center" align="center" show-overflow-tooltip min-width="60"/>
<el-table-column label="物料编码" prop="partNo" header-align="center" align="left" show-overflow-tooltip min-width="140"/>
<el-table-column label="物料描述" prop="partDesc" header-align="center" align="left" show-overflow-tooltip min-width="200"/>
<el-table-column label="版本" prop="engChgLevel" header-align="center" align="right" show-overflow-tooltip min-width="60"/>
<el-table-column label="替代编码" prop="alternativeNo" header-align="center" align="center" show-overflow-tooltip min-width="60"/>
<el-table-column label="类型" prop="bomType" header-align="center" align="center" show-overflow-tooltip min-width="100"/>
<el-table-column label="操作" header-align="center" align="center" min-width="100">
@ -465,15 +466,16 @@
<!-- Routing切换版本 -->
<el-dialog v-else-if="this.activeTable === 'temp_routing'" title="Routing版本切换" :visible.sync="versionVisible2" append-to-body :close-on-click-modal="false" v-drag width="900px">
<el-table :data="versionList2" ref="routingVersionTable" :row-style="versionRowStyle" @row-click="versionRowClick" style="width: 100%" border :height="240">
<el-table-column label="物料编码" prop="partNo" header-align="center" align="center" show-overflow-tooltip min-width="140"/>
<el-table-column label="物料描述" prop="partDesc" header-align="center" align="center" show-overflow-tooltip min-width="200"/>
<el-table-column label="版本" prop="routingRevision" header-align="center" align="center" show-overflow-tooltip min-width="60"/>
<el-table-column label="物料编码" prop="partNo" header-align="center" align="left" show-overflow-tooltip min-width="140"/>
<el-table-column label="物料描述" prop="partDesc" header-align="center" align="left" show-overflow-tooltip min-width="200"/>
<el-table-column label="版本" prop="routingRevision" header-align="center" align="right" show-overflow-tooltip min-width="60"/>
<el-table-column label="类型" prop="routingType" header-align="center" align="center" show-overflow-tooltip min-width="100"/>
<el-table-column label="备注" prop="noteText" header-align="center" align="left" show-overflow-tooltip min-width="100"/>
</el-table>
<el-table :data="alternativeList2" :row-style="alternativeRowStyle2" ref="routingAlternativeTable" style="width: 100%;margin-top: 20px" border :height="240">
<el-table-column label="物料编码" prop="partNo" header-align="center" align="center" show-overflow-tooltip min-width="140"/>
<el-table-column label="物料描述" prop="partDesc" header-align="center" align="center" show-overflow-tooltip min-width="200"/>
<el-table-column label="版本" prop="routingRevision" header-align="center" align="center" show-overflow-tooltip min-width="60"/>
<el-table-column label="物料编码" prop="partNo" header-align="center" align="left" show-overflow-tooltip min-width="140"/>
<el-table-column label="物料描述" prop="partDesc" header-align="center" align="left" show-overflow-tooltip min-width="200"/>
<el-table-column label="版本" prop="routingRevision" header-align="center" align="right" show-overflow-tooltip min-width="60"/>
<el-table-column label="替代编码" prop="alternativeNo" header-align="center" align="center" show-overflow-tooltip min-width="60"/>
<el-table-column label="类型" prop="routingType" header-align="center" align="center" show-overflow-tooltip min-width="100"/>
<el-table-column label="操作" min-width="80" header-align="center" align="center">

Write Preview
Loading…
Cancel
Save