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

2024.1.16 派工单号模态框变更

java8
yuejiayang 2 years ago
parent
0a06159d19
commit
dc156fd8d9
3 changed files with 151 additions and 47 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. 53
      src/views/modules/qc/FAIResultEntry.vue
  2. 53
      src/views/modules/qc/FQCResultEntry.vue
  3. 60
      src/views/modules/qc/IPQCResultEntry.vue

53
src/views/modules/qc/FAIResultEntry.vue
View File

@ -161,7 +161,7 @@
<el-dialog title="新增检验记录" :close-on-click-modal="false" v-drag :visible.sync="modalFlag" width="495px">
<el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
<el-form-item label="BU" prop="bu" :rules="rules.bu">
<el-select v-model="modalData.bu" placeholder="请选择" @change="buChange" style="width: 456px">
<el-select v-model="modalData.bu" placeholder="请选择" @change="buChange" style="width: 221px">
<el-option
v-for = "i in userBuList"
:key = "i.buNo"
@ -174,8 +174,6 @@
</el-option>
</el-select>
</el-form-item>
</el-form>
<el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
<el-form-item label="标签号">
<!-- <el-autocomplete v-if="this.modalData.specialTaskFlag === 'Y'" disabled style="width: 456px" size="mini" v-model="modalData.rollNo" clearable-->
<!-- :fetch-suggestions="querySearchAsync" @select="handleSelect"-->
@ -185,8 +183,8 @@
<!-- :fetch-suggestions="querySearchAsync" @select="handleSelect"-->
<!-- placeholder="请输入标签号">-->
<!-- </el-autocomplete>-->
<el-input v-if="this.modalData.specialTaskFlag === 'Y'" disabled v-model="modalData.rollNo" style="width: 456px"></el-input>
<el-input v-if="this.modalData.specialTaskFlag !== 'Y'" v-model="modalData.rollNo" @keyup.native.enter="rollNoEnter" clearable style="width: 456px"></el-input>
<el-input v-if="this.modalData.specialTaskFlag === 'Y'" disabled v-model="modalData.rollNo" style="width: 221px"></el-input>
<el-input v-if="this.modalData.specialTaskFlag !== 'Y'" v-model="modalData.rollNo" @keyup.native.enter="rollNoEnter" clearable style="width: 221px"></el-input>
</el-form-item>
</el-form>
<el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
@ -488,7 +486,7 @@
</el-dialog>
<!-- 派工单号 -->
<el-dialog title="派工单号" @close="closeDialog" :close-on-click-modal="false" v-drag :visible.sync="seqDetailFlag" width="801px" height="273px">
<el-dialog title="派工单号" @close="closeDialog" :close-on-click-modal="false" v-drag :visible.sync="seqDetailFlag" width="952px" height="273px">
<el-form :inline="true" label-position="top" :model="seqDetailData" style="margin-left: 7px;margin-top: -5px;">
<el-form-item label="工单号">
<el-input v-model="seqDetailData.orderNo" clearable style="width: 137px"></el-input>
@ -505,6 +503,9 @@
<el-form-item label="物料名称">
<el-input v-model="seqDetailData.partDesc" clearable style="width: 137px"></el-input>
</el-form-item>
<el-form-item label="工序">
<el-input v-model="seqDetailData.operationDesc" clearable style="width: 137px"></el-input>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="searchSeqInfo()" style="margin-top: 24px">查询</el-button>
</el-form-item>
@ -546,6 +547,24 @@
align="center"
label="物料名称">
</el-table-column>
<el-table-column
prop="lotsize"
header-align="center"
align="center"
label="工单数量">
</el-table-column>
<el-table-column
prop="qtyrequired"
header-align="center"
align="center"
label="派工数量">
</el-table-column>
<el-table-column
prop="operationDesc"
header-align="center"
align="center"
label="工序">
</el-table-column>
</el-table>
<el-footer style="height:40px;margin-top: 10px;text-align:center">
<el-button type="primary" @click="seqDetailFlag = false">关闭</el-button>
@ -890,6 +909,9 @@
orderNo: '',
sku: '',
cinvSourceCode: '',
qtyrequired: '',
lotsize:'',
operationDesc:'',
specialRequirements: '',
templateId: '',
templateName: '',
@ -1685,7 +1707,10 @@
seqNo: '',
sku: '',
partNo: '',
partDesc:''
partDesc:'',
operationDesc:'',
qtyrequired:'',
lotsize:''
},
// 子明细数据对象
tableData: [],
@ -2185,6 +2210,9 @@
this.modalData.spec = data.rows[0].spec
this.modalData.sku = data.rows[0].sku
this.modalData.cinvSourceCode = data.rows[0].cinvSourceCode
this.modalData.operationDesc = data.rows[0].operationDesc
this.modalData.qtyrequired = data.rows[0].qtyrequired
this.modalData.lotsize = data.rows[0].lotsize
} else {
this.$alert(data.msg, '错误', {
confirmButtonText: '确定'
@ -2444,6 +2472,9 @@
this.modalData.partDesc = row.partDesc
this.modalData.orderNo = row.orderNo
this.modalData.seqNo = row.seqNo
this.modalData.lotsize = row.lotsize
this.modalData.operationDesc = row.operationDesc
this.modalData.qtyrequired = row.qtyrequired
this.getOperationList()
this.seqDetailFlag = false
},
@ -3129,9 +3160,10 @@
orderNo: this.seqDetailData.orderNo,
sku: this.seqDetailData.sku,
partDesc: this.seqDetailData.partDesc,
partNo: this.seqDetailData.partNo
partNo: this.seqDetailData.partNo,
operationDesc: this.seqDetailData.operationDesc
}
if (!this.seqDetailData.seqNo && !this.seqDetailData.orderNo && !this.seqDetailData.sku && !this.seqDetailData.partNo && !this.seqDetailData.partDesc){
if (!this.seqDetailData.seqNo && !this.seqDetailData.orderNo && !this.seqDetailData.sku && !this.seqDetailData.partNo && !this.seqDetailData.partDesc && !this.seqDetailData.operationDesc){
this.seqInfoList = []
} else {
searchSeqInfo(tempData).then(({data}) => {
@ -3151,7 +3183,8 @@
orderNo: '',
sku: '',
partNo: '',
partDesc: ''
partDesc: '',
operationDesc: ''
}
this.seqInfoList = []
}

53
src/views/modules/qc/FQCResultEntry.vue
View File

@ -161,7 +161,7 @@
<el-dialog title="新增检验记录" :close-on-click-modal="false" v-drag :visible.sync="modalFlag" width="495px">
<el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
<el-form-item label="BU" prop="bu" :rules="rules.bu">
<el-select v-model="modalData.bu" placeholder="请选择" @change="buChange" style="width: 456px">
<el-select v-model="modalData.bu" placeholder="请选择" @change="buChange" style="width: 221px">
<el-option
v-for = "i in userBuList"
:key = "i.buNo"
@ -174,8 +174,6 @@
</el-option>
</el-select>
</el-form-item>
</el-form>
<el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
<el-form-item label="标签号">
<!-- <el-autocomplete v-if="this.modalData.specialTaskFlag === 'Y'" disabled style="width: 456px" size="mini" v-model="modalData.rollNo" clearable-->
<!-- :fetch-suggestions="querySearchAsync" @select="handleSelect"-->
@ -185,8 +183,8 @@
<!-- :fetch-suggestions="querySearchAsync" @select="handleSelect"-->
<!-- placeholder="请输入标签号">-->
<!-- </el-autocomplete>-->
<el-input v-if="this.modalData.specialTaskFlag === 'Y'" disabled v-model="modalData.rollNo" style="width: 456px"></el-input>
<el-input v-if="this.modalData.specialTaskFlag !== 'Y'" v-model="modalData.rollNo" @keyup.native.enter="rollNoEnter" clearable style="width: 456px"></el-input>
<el-input v-if="this.modalData.specialTaskFlag === 'Y'" disabled v-model="modalData.rollNo" style="width: 221px"></el-input>
<el-input v-if="this.modalData.specialTaskFlag !== 'Y'" v-model="modalData.rollNo" @keyup.native.enter="rollNoEnter" clearable style="width: 221px"></el-input>
</el-form-item>
</el-form>
<el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
@ -687,7 +685,7 @@
</el-dialog>
<!-- 派工单号 -->
<el-dialog title="派工单号" @close="closeDialog" :close-on-click-modal="false" v-drag :visible.sync="seqDetailFlag" width="801px" height="273px">
<el-dialog title="派工单号" @close="closeDialog" :close-on-click-modal="false" v-drag :visible.sync="seqDetailFlag" width="952px" height="273px">
<el-form :inline="true" label-position="top" :model="seqDetailData" style="margin-left: 7px;margin-top: -5px;">
<el-form-item label="工单号">
<el-input v-model="seqDetailData.orderNo" clearable style="width: 137px"></el-input>
@ -704,6 +702,9 @@
<el-form-item label="物料名称">
<el-input v-model="seqDetailData.partDesc" clearable style="width: 137px"></el-input>
</el-form-item>
<el-form-item label="工序">
<el-input v-model="seqDetailData.operationDesc" clearable style="width: 137px"></el-input>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="searchSeqInfo()" style="margin-top: 24px">查询</el-button>
</el-form-item>
@ -745,6 +746,24 @@
align="center"
label="物料名称">
</el-table-column>
<el-table-column
prop="lotsize"
header-align="center"
align="center"
label="工单数量">
</el-table-column>
<el-table-column
prop="qtyrequired"
header-align="center"
align="center"
label="派工数量">
</el-table-column>
<el-table-column
prop="operationDesc"
header-align="center"
align="center"
label="工序">
</el-table-column>
</el-table>
<el-footer style="height:40px;margin-top: 10px;text-align:center">
<el-button type="primary" @click="seqDetailFlag = false">关闭</el-button>
@ -889,6 +908,9 @@
batchRollNo: '',
spec: '',
sku: '',
qtyrequired: '',
lotsize:'',
operationDesc:'',
specialRequirements: '',
templateId: '',
templateName: '',
@ -1684,7 +1706,10 @@
seqNo: '',
sku: '',
partNo: '',
partDesc:''
partDesc:'',
operationDesc:'',
qtyrequired:'',
lotsize:''
},
// 子明细数据对象
tableData: [],
@ -2184,6 +2209,9 @@
this.modalData.spec = data.rows[0].spec
this.modalData.sku = data.rows[0].sku
this.modalData.cinvSourceCode = data.rows[0].cinvSourceCode
this.modalData.operationDesc = data.rows[0].operationDesc
this.modalData.qtyrequired = data.rows[0].qtyrequired
this.modalData.lotsize = data.rows[0].lotsize
} else {
this.$alert(data.msg, '错误', {
confirmButtonText: '确定'
@ -2442,6 +2470,9 @@
this.modalData.cinvSourceCode = row.cinvSourceCode
this.modalData.orderNo = row.orderNo
this.modalData.seqNo = row.seqNo
this.modalData.lotsize = row.lotsize
this.modalData.operationDesc = row.operationDesc
this.modalData.qtyrequired = row.qtyrequired
this.getOperationList()
this.seqDetailFlag = false
},
@ -3137,9 +3168,10 @@
orderNo: this.seqDetailData.orderNo,
sku: this.seqDetailData.sku,
partDesc: this.seqDetailData.partDesc,
partNo: this.seqDetailData.partNo
partNo: this.seqDetailData.partNo,
operationDesc: this.seqDetailData.operationDesc
}
if (!this.seqDetailData.seqNo && !this.seqDetailData.orderNo && !this.seqDetailData.sku && !this.seqDetailData.partNo && !this.seqDetailData.partDesc){
if (!this.seqDetailData.seqNo && !this.seqDetailData.orderNo && !this.seqDetailData.sku && !this.seqDetailData.partNo && !this.seqDetailData.partDesc && !this.seqDetailData.operationDesc){
this.seqInfoList = []
} else {
searchSeqInfo(tempData).then(({data}) => {
@ -3159,7 +3191,8 @@
orderNo: '',
sku: '',
partNo: '',
partDesc:''
partDesc:'',
operationDesc: ''
}
this.seqInfoList = []
}

60
src/views/modules/qc/IPQCResultEntry.vue
View File

@ -166,7 +166,7 @@
<el-dialog title="新增巡检记录" :close-on-click-modal="false" v-drag :visible.sync="modalFlag" width="495px">
<el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
<el-form-item label="BU" prop="bu" :rules="rules.bu">
<el-select v-model="modalData.bu" placeholder="请选择" @change="buChange" style="width: 456px">
<el-select v-model="modalData.bu" placeholder="请选择" @change="buChange" style="width: 221px">
<el-option
v-for = "i in userBuList"
:key = "i.buNo"
@ -179,9 +179,13 @@
</el-option>
</el-select>
</el-form-item>
</el-form>
<el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
<el-form-item label="标签号">
<el-input v-if="this.modalData.specialTaskFlag === 'Y'" disabled v-model="modalData.rollNo" style="width: 221px"></el-input>
<el-input v-if="this.modalData.specialTaskFlag !== 'Y'" v-model="modalData.rollNo" @keyup.native.enter="rollNoEnter" clearable style="width: 221px"></el-input>
</el-form-item>
</el-form>
<!-- <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">-->
<!-- <el-form-item label="标签号">-->
<!-- <el-autocomplete v-if="this.modalData.specialTaskFlag === 'Y'" disabled style="width: 456px" size="mini" v-model="modalData.rollNo" clearable-->
<!-- :fetch-suggestions="querySearchAsync" @select="handleSelect"-->
<!-- placeholder="请输入标签号">-->
@ -190,10 +194,10 @@
<!-- :fetch-suggestions="querySearchAsync" @select="handleSelect"-->
<!-- placeholder="请输入标签号">-->
<!-- </el-autocomplete>-->
<el-input v-if="this.modalData.specialTaskFlag === 'Y'" disabled v-model="modalData.rollNo" style="width: 456px"></el-input>
<el-input v-if="this.modalData.specialTaskFlag !== 'Y'" v-model="modalData.rollNo" @keyup.native.enter="rollNoEnter" clearable style="width: 456px"></el-input>
</el-form-item>
</el-form>
<!-- <el-input v-if="this.modalData.specialTaskFlag === 'Y'" disabled v-model="modalData.rollNo" style="width: 456px"></el-input>-->
<!-- <el-input v-if="this.modalData.specialTaskFlag !== 'Y'" v-model="modalData.rollNo" @keyup.native.enter="rollNoEnter" clearable style="width: 456px"></el-input>-->
<!-- </el-form-item>-->
<!-- </el-form>-->
<el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
<el-form-item v-if="this.modalData.specialTaskFlag !== 'Y' && (this.modalData.rollNo == '' || this.modalData.rollNo == null)" prop="orderNo" :rules="rules.seqNoType">
<span slot="label" @click="getBaseList(1052)"><a herf="#">派工单号</a></span>
@ -545,7 +549,7 @@
</el-dialog>
<!-- 派工单号 -->
<el-dialog title="派工单号" @close="closeDialog" :close-on-click-modal="false" v-drag :visible.sync="seqDetailFlag" width="801px" height="273px">
<el-dialog title="派工单号" @close="closeDialog" :close-on-click-modal="false" v-drag :visible.sync="seqDetailFlag" width="952px" height="273px">
<el-form :inline="true" label-position="top" :model="seqDetailData" style="margin-left: 7px;margin-top: -5px;">
<el-form-item label="工单号">
<el-input v-model="seqDetailData.orderNo" clearable style="width: 137px"></el-input>
@ -562,6 +566,9 @@
<el-form-item label="物料名称">
<el-input v-model="seqDetailData.partDesc" clearable style="width: 137px"></el-input>
</el-form-item>
<el-form-item label="工序">
<el-input v-model="seqDetailData.operationDesc" clearable style="width: 137px"></el-input>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="searchSeqInfo()" style="margin-top: 24px">查询</el-button>
</el-form-item>
@ -603,6 +610,24 @@
align="center"
label="物料名称">
</el-table-column>
<el-table-column
prop="lotsize"
header-align="center"
align="center"
label="工单数量">
</el-table-column>
<el-table-column
prop="qtyrequired"
header-align="center"
align="center"
label="派工数量">
</el-table-column>
<el-table-column
prop="operationDesc"
header-align="center"
align="center"
label="工序">
</el-table-column>
</el-table>
<el-footer style="height:40px;margin-top: 10px;text-align:center">
<el-button type="primary" @click="seqDetailFlag = false">关闭</el-button>
@ -911,6 +936,8 @@
spec: '',
sku: '',
cinvSourceCode: '',
qtyrequired: '',
lotsize:'',
specialRequirements: '',
templateId: '',
templateName: '',
@ -1725,7 +1752,10 @@
sku: '',
cinvSourceCode:'',
partNo: '',
partDesc: ''
partDesc: '',
operationDesc:'',
qtyrequired:'',
lotsize:''
},
// 子明细数据对象
tableData: [],
@ -2338,6 +2368,9 @@
this.modalData.spec = data.rows[0].spec
this.modalData.sku = data.rows[0].sku
this.modalData.cinvSourceCode = data.rows[0].cinvSourceCode
this.modalData.operationDesc = data.rows[0].operationDesc
this.modalData.qtyrequired = data.rows[0].qtyrequired
this.modalData.lotsize = data.rows[0].lotsize
} else {
this.$alert(data.msg, '错误', {
confirmButtonText: '确定'
@ -2494,6 +2527,9 @@
this.modalData.partDesc = row.partDesc
this.modalData.orderNo = row.orderNo
this.modalData.seqNo = row.seqNo
this.modalData.lotsize = row.lotsize
this.modalData.operationDesc = row.operationDesc
this.modalData.qtyrequired = row.qtyrequired
this.getOperationList()
this.seqDetailFlag = false
},
@ -3194,9 +3230,10 @@
orderNo: this.seqDetailData.orderNo,
sku: this.seqDetailData.sku,
partDesc: this.seqDetailData.partDesc,
partNo: this.seqDetailData.partNo
partNo: this.seqDetailData.partNo,
operationDesc: this.seqDetailData.operationDesc
}
if (!this.seqDetailData.seqNo && !this.seqDetailData.orderNo && !this.seqDetailData.sku && !this.seqDetailData.partNo && !this.seqDetailData.partDesc){
if (!this.seqDetailData.seqNo && !this.seqDetailData.orderNo && !this.seqDetailData.sku && !this.seqDetailData.partNo && !this.seqDetailData.partDesc && !this.seqDetailData.operationDesc){
this.seqInfoList = []
} else {
searchSeqInfo(tempData).then(({data}) => {
@ -3217,6 +3254,7 @@
sku: '',
partNo: '',
partDesc: '',
operationDesc: ''
}
this.seqInfoList = []
}

Write Preview
Loading…
Cancel
Save