|
@@ -89,16 +89,9 @@
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="6">
|
|
|
- <el-form-item
|
|
|
- label="核注清单"
|
|
|
- prop="checklists"
|
|
|
- >
|
|
|
- <el-input
|
|
|
- v-model="form.checklists"
|
|
|
- style="width: 80%"
|
|
|
- placeholder="请输入核注清单"
|
|
|
- :disabled="browseStatus || form.warehouseStatus > 3"
|
|
|
- />
|
|
|
+ <el-form-item label="核注清单" prop="checklists">
|
|
|
+ <el-input v-model="form.checklists" style="width: 80%" placeholder="请输入核注清单"
|
|
|
+ :disabled="browseStatus || form.warehouseStatus > 3" />
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
@@ -2306,7 +2299,7 @@ addprint('rkd');
|
|
|
<el-radio v-model="radio" :label="2">千克(KG)</el-radio>
|
|
|
<section ref="print">
|
|
|
<p><span class="no-print">打印日期:</span><span style="padding-left: 100px">{{ new
|
|
|
- Date().toLocaleDateString().replace(/\//g, '-')
|
|
|
+ Date().toLocaleDateString().replace(/\//g, '-')
|
|
|
}}</span></p>
|
|
|
<table class="table" valign="center">
|
|
|
<tr>
|
|
@@ -2906,9 +2899,9 @@ print_lwqr = false;
|
|
|
<td>{{ item.fTruckno }}</td>
|
|
|
<td>{{ item.fSealno }}</td>
|
|
|
<td>{{
|
|
|
- item.fWarehouseInformation ?
|
|
|
- item.fWarehouseInformation.substring((item.fWarehouseInformation.lastIndexOf('/')) + 1,
|
|
|
- item.fWarehouseInformation.length) : ''
|
|
|
+ item.fWarehouseInformation ?
|
|
|
+ item.fWarehouseInformation.substring((item.fWarehouseInformation.lastIndexOf('/')) + 1,
|
|
|
+ item.fWarehouseInformation.length) : ''
|
|
|
}}
|
|
|
</td>
|
|
|
<td>{{ item.fQty }}</td>
|
|
@@ -5829,7 +5822,7 @@ export default {
|
|
|
},
|
|
|
//条码导入查询
|
|
|
importBarcodeQuery() {
|
|
|
- importQueryBarcode({ originalBillNo: this.eRow.fOriginalbillno}).then(res => {
|
|
|
+ importQueryBarcode({ originalBillNo: this.eRow.fOriginalbillno }).then(res => {
|
|
|
this.elabelListTwo = res.data
|
|
|
this.showElabelDialogTwo = true
|
|
|
})
|
|
@@ -7635,19 +7628,20 @@ export default {
|
|
|
fidStatus: 'f_itemstatus'
|
|
|
}
|
|
|
listCharge(data).then(res => {
|
|
|
- if (res.data.length > 2) {
|
|
|
- res.data.forEach((item,index) => {
|
|
|
- console.log(item)
|
|
|
- if (index==1&&item.auditStatus == "A") {
|
|
|
+ let arr = []
|
|
|
+ arr = res.data.filter(e => e.auditStatus == "A")
|
|
|
+ arr.forEach((item, index) => {
|
|
|
+ if (arr.length == 2) {
|
|
|
+ if (index == 0 && item.auditStatus == "A") {
|
|
|
this.firstReviewer = item.userName
|
|
|
- } else if (index==2&&item.auditStatus == "A") {
|
|
|
+ } else if (index == 1 && item.auditStatus == "A") {
|
|
|
this.secondReviewer = item.userName
|
|
|
}
|
|
|
- })
|
|
|
- } else {
|
|
|
- this.firstReviewer = ''
|
|
|
- this.secondReviewer = ''
|
|
|
- }
|
|
|
+ } else {
|
|
|
+ this.firstReviewer = ''
|
|
|
+ this.secondReviewer = ''
|
|
|
+ }
|
|
|
+ })
|
|
|
})
|
|
|
} else {
|
|
|
let data = {
|