Browse Source

修改

master
常熟吴彦祖 4 weeks ago
parent
commit
d59a963db5
  1. 4
      src/views/modules/production/scanForm.vue
  2. 6
      src/views/modules/production/shippingScan.vue

4
src/views/modules/production/scanForm.vue

@ -487,9 +487,9 @@ export default {
<el-dialog :visible.sync="fifoDialogVisible" v-drag :close-on-click-modal="false" :modal="false" append-to-body destroy-on-close title="查询先进先出" width="1300px"> <el-dialog :visible.sync="fifoDialogVisible" v-drag :close-on-click-modal="false" :modal="false" append-to-body destroy-on-close title="查询先进先出" width="1300px">
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="17"> <el-col :span="17">
<el-form :inline="true" label-position="top">
<el-form :inline="true" label-position="top" @submit.native.prevent>
<el-form-item label="扫描袋贴"> <el-form-item label="扫描袋贴">
<el-input ref="fifoScanInput" v-model="fifoQuery.label" clearable @keyup.enter.native="queryFifoListByLabel"></el-input>
<el-input ref="fifoScanInput" v-model="fifoQuery.label" clearable @keydown.enter.native.prevent @keyup.enter.native="queryFifoListByLabel"></el-input>
</el-form-item> </el-form-item>
<el-form-item label=" "> <el-form-item label=" ">
<el-button type="primary" :loading="fifoLoading" @click="queryFifoListByLabel">查询</el-button> <el-button type="primary" :loading="fifoLoading" @click="queryFifoListByLabel">查询</el-button>

6
src/views/modules/production/shippingScan.vue

@ -638,7 +638,7 @@ export default {
<el-link style="cursor: pointer" v-if="row.approveFlag === 'N'" @click="checkoutDelNotifyDetailBtn(row)">检验</el-link> <el-link style="cursor: pointer" v-if="row.approveFlag === 'N'" @click="checkoutDelNotifyDetailBtn(row)">检验</el-link>
<!-- <el-link style="cursor: pointer" v-if="row.shipQty < row.notifyQty && row.allNum < row.notifyQty && delNotifyHeader.shipResult !== '全部发货'" @click="clickScan(row)">标签扫描</el-link>--> <!-- <el-link style="cursor: pointer" v-if="row.shipQty < row.notifyQty && row.allNum < row.notifyQty && delNotifyHeader.shipResult !== '全部发货'" @click="clickScan(row)">标签扫描</el-link>-->
<el-link style="cursor: pointer" v-if="delNotifyHeader.shipResult !== '全部发货'" @click="clickScan(row)">标签扫描</el-link> <el-link style="cursor: pointer" v-if="delNotifyHeader.shipResult !== '全部发货'" @click="clickScan(row)">标签扫描</el-link>
<el-link style="cursor: pointer" @click="boxLabelVisibleHandler(row)" v-if="false">外箱标签</el-link>
<el-link style="cursor: pointer" @click="boxLabelVisibleHandler(row)" >外箱标签</el-link>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@ -968,9 +968,9 @@ export default {
<el-dialog :visible.sync="fifoDialogVisible" v-drag :close-on-click-modal="false" append-to-body destroy-on-close title="查询先进先出" width="1300px"> <el-dialog :visible.sync="fifoDialogVisible" v-drag :close-on-click-modal="false" append-to-body destroy-on-close title="查询先进先出" width="1300px">
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="17"> <el-col :span="17">
<el-form :inline="true" label-position="top">
<el-form :inline="true" label-position="top" @submit.native.prevent>
<el-form-item label="扫描袋贴"> <el-form-item label="扫描袋贴">
<el-input ref="fifoScanInput" v-model="fifoQuery.label" clearable @submit.native.prevent @keyup.enter.native="queryFifoListByLabel"></el-input>
<el-input ref="fifoScanInput" v-model="fifoQuery.label" clearable @keydown.enter.native.prevent @keyup.enter.native="queryFifoListByLabel"></el-input>
</el-form-item> </el-form-item>
<el-form-item label=" "> <el-form-item label=" ">
<el-button type="primary" :loading="fifoLoading" @click="queryFifoListByLabel">查询</el-button> <el-button type="primary" :loading="fifoLoading" @click="queryFifoListByLabel">查询</el-button>

Loading…
Cancel
Save