Browse Source

需求修改

master
shenzhouyu 1 day ago
parent
commit
aaa8f39e8a
  1. 9
      src/views/modules/orderIssure/soIssueNotify/newSoIssueNotify.vue
  2. 2
      src/views/modules/orderIssure/soIssueNotify/searchIssureNotifyForCK.vue
  3. 7
      src/views/modules/orderIssure/soIssueNotify/searchOvertimeMaterialList.vue

9
src/views/modules/orderIssure/soIssueNotify/newSoIssueNotify.vue

@ -320,7 +320,8 @@
<el-form-item :label="'要求发料时间'" > <el-form-item :label="'要求发料时间'" >
<el-date-picker <el-date-picker
style="width: 165px" style="width: 165px"
v-model="notifyOrderData.needDate"
v-model="notifyOrderData.needDate"
popper-class="no-atTheMoment"
type="datetime" type="datetime"
value-format="yyyy-MM-dd HH:mm" value-format="yyyy-MM-dd HH:mm"
placeholder="选择日期"> placeholder="选择日期">
@ -1733,7 +1734,8 @@
this.notifyOrderData.qtyrequired=row.qtyrequired this.notifyOrderData.qtyrequired=row.qtyrequired
this.notifyOrderData.sResourceid=row.sResourceid this.notifyOrderData.sResourceid=row.sResourceid
this.notifyOrderData.issureQty='' this.notifyOrderData.issureQty=''
this.notifyOrderData.needDate=this.dayjs().format("YYYY-MM-DD HH:mm")
//this.notifyOrderData.needDate=this.dayjs().format("YYYY-MM-DD HH:mm")
this.$set(this.notifyOrderData,'needDate','')
this.notifyOrderData.locationNo=row.sResourceid; this.notifyOrderData.locationNo=row.sResourceid;
this.saveSeqNoModalFlag=true this.saveSeqNoModalFlag=true
}, },
@ -2275,5 +2277,8 @@
.board666 .el-table .error-row { .board666 .el-table .error-row {
background: #f86868; background: #f86868;
} }
.el-picker-panel.no-atTheMoment .el-button--text.el-picker-panel__link-btn {
display: none;
}
</style> </style>

2
src/views/modules/orderIssure/soIssueNotify/searchIssureNotifyForCK.vue

@ -263,7 +263,7 @@
return { return {
height:200, height:200,
modelFlag:false, modelFlag:false,
activeName: 'detail',
activeName: 'sub',
dataList: [], dataList: [],
dataList2: [], dataList2: [],
dataList3: [], dataList3: [],

7
src/views/modules/orderIssure/soIssueNotify/searchOvertimeMaterialList.vue

@ -71,14 +71,14 @@
<el-table :data="dataList" :height="height" border v-loading="dataListLoading" style="width: 100%;" <el-table :data="dataList" :height="height" border v-loading="dataListLoading" style="width: 100%;"
highlight-current-row ref="mainTable"> highlight-current-row ref="mainTable">
<el-table-column header-align="center" align="center" width="170" label="操作">
<el-table-column header-align="center" align="center" width="110" label="操作">
<template slot-scope="scope"> <template slot-scope="scope">
<el-select <el-select
v-model="scope.row.timeoutReason" v-model="scope.row.timeoutReason"
placeholder="选择超时原因" placeholder="选择超时原因"
size="mini" size="mini"
class="selectReason" class="selectReason"
style="width: 150px"
style="width: 100px"
@change="(val) => onTimeoutReasonChange(val, scope.row)" @change="(val) => onTimeoutReasonChange(val, scope.row)"
> >
<el-option <el-option
@ -496,6 +496,9 @@ export default {
getEamWorkShop({}).then(({ data }) => { getEamWorkShop({}).then(({ data }) => {
if (data && data.code === 0) { if (data && data.code === 0) {
this.workShopList = data.rows this.workShopList = data.rows
this.workShopList = this.workShopList.filter((item) => {
return item.workShopId == 'WS005' || item.workShopId == 'WS006'
})
} }
}) })
this.searchTable() this.searchTable()

Loading…
Cancel
Save