UDI
/
udiwms-vue-frame
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

预验收出库按单出库问题

Browse Source
prod
anthonywj 2 years ago
parent d29510234d
commit 9ec6fdfa4d
4 changed files with 136 additions and 39 deletions
Show Stats Download Patch File Download Diff File

9
.env.production
Unescape Escape View File

@ -1,5 +1,8 @@
# 页面标题
VUE_APP_TITLE = UDI管理系统VUE_APP_BASE_API = 'http://r.jiyuudims.cloud:5004/UDI_WMS_MC/'
VUE_APP_TITLE = UDI管理系统
# 生产环境配置
@ -10,8 +13,8 @@ ENV = 'production'
#林纪裕cd
# VUE_APP_BASE_API = 'http://101.43.77.55:9150/UDI_WMS_MC/'
# VUE_APP_BASE_API = 'http://116.204.106.103:9150/UDI_WMS_MC/'
VUE_APP_BASE_API = 'http://r.jiyuudims.cloud:5004/UDI_WMS_MC/'
# VUE_APP_BASE_API = 'http://127.0.0.1:9150/UDI_WMS_MC/'
# 测试服务器
# VUE_APP_BASE_API = 'http://192.168.0.66:9150/UDI_WMS_MC/'

16
src/views/basic/busType/bussinessTypeModify.vue
Unescape Escape View File

@ -554,7 +554,7 @@
<el-option label="无业务单扫码拣货" :value="0"></el-option>
<el-option label="有业务单有三期拣货" :value="1"></el-option>
<el-option label="有业务单无三期拣货" :value="2"></el-option>
<el-option label="有业务单操货(有无三期)" :value="3"></el-option>
<el-option label="有业务单拣货(有无三期)" :value="3"></el-option>
</el-select>
</el-col>
<el-divider direction="vertical"></el-divider>
@ -576,7 +576,7 @@
<el-option label="无业务单扫码拣货" :value="0"></el-option>
<el-option label="有业务单有三期拣货" :value="1"></el-option>
<el-option label="有业务单无三期拣货" :value="2"></el-option>
<el-option label="有业务单操货(有无三期)" :value="3"></el-option>
<el-option label="有业务单拣货(有无三期)" :value="3"></el-option>
</el-select>
</el-col>
<el-divider direction="vertical"></el-divider>
@ -598,7 +598,7 @@
<el-option label="无业务单扫码拣货" :value="0"></el-option>
<el-option label="有业务单有三期拣货" :value="1"></el-option>
<el-option label="有业务单无三期拣货" :value="2"></el-option>
<el-option label="有业务单操货(有无三期)" :value="3"></el-option>
<el-option label="有业务单拣货(有无三期)" :value="3"></el-option>
</el-select>
</el-col>
<el-divider direction="vertical"></el-divider>
@ -620,7 +620,7 @@
<el-option label="无业务单扫码拣货" :value="0"></el-option>
<el-option label="有业务单有三期拣货" :value="1"></el-option>
<el-option label="有业务单无三期拣货" :value="2"></el-option>
<el-option label="有业务单操货(有无三期)" :value="3"></el-option>
<el-option label="有业务单拣货(有无三期)" :value="3"></el-option>
</el-select>
</el-col>
<el-divider direction="vertical"></el-divider>
@ -642,7 +642,7 @@
<el-option label="无业务单扫码拣货" :value="0"></el-option>
<el-option label="有业务单有三期拣货" :value="1"></el-option>
<el-option label="有业务单无三期拣货" :value="2"></el-option>
<el-option label="有业务单操货(有无三期)" :value="3"></el-option>
<el-option label="有业务单拣货(有无三期)" :value="3"></el-option>
</el-select>
</el-col>
<el-divider direction="vertical"></el-divider>
@ -663,7 +663,7 @@
<el-option label="无业务单扫码拣货" :value="0"></el-option>
<el-option label="有业务单有三期拣货" :value="1"></el-option>
<el-option label="有业务单无三期拣货" :value="2"></el-option>
<el-option label="有业务单操货(有无三期)" :value="3"></el-option>
<el-option label="有业务单拣货(有无三期)" :value="3"></el-option>
</el-select>
</el-col>
<el-divider direction="vertical"></el-divider>
@ -685,7 +685,7 @@
<el-option label="无业务单扫码拣货" :value="0"></el-option>
<el-option label="有业务单有三期拣货" :value="1"></el-option>
<el-option label="有业务单无三期拣货" :value="2"></el-option>
<el-option label="有业务单操货(有无三期)" :value="3"></el-option>
<el-option label="有业务单拣货(有无三期)" :value="3"></el-option>
</el-select>
</el-col>
<el-divider direction="vertical"></el-divider>
@ -706,7 +706,7 @@
<el-option label="无业务单扫码拣货" :value="0"></el-option>
<el-option label="有业务单有三期拣货" :value="1"></el-option>
<el-option label="有业务单无三期拣货" :value="2"></el-option>
<el-option label="有业务单操货(有无三期)" :value="3"></el-option>
<el-option label="有业务单拣货(有无三期)" :value="3"></el-option>
</el-select>
</el-col>
<el-divider direction="vertical"></el-divider>

148
src/views/inout/DialogCreateOrderSelect.vue
Unescape Escape View File

@ -67,6 +67,7 @@
@select-all="handleAll"
:header-cell-class-name="leftheaderStyle"
@selection-change="handleSelectionChange"
@current-change="getOrderDetails"
v-loading="loading"
:data="list"
style="width: 100%"
@ -129,30 +130,30 @@
<!-- </el-tag>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="操作" width="150" fixed="right">-->
<!-- <template slot-scope="scope">-->
<!-- <el-button-->
<!-- type="text"-->
<!-- size="small"-->
<!-- @click.native.stop="printOrder(scope.row)"-->
<!-- >打印-->
<!-- </el-button>-->
<!-- <el-table-column label="操作" width="150" fixed="right">-->
<!-- <template slot-scope="scope">-->
<!-- <el-button-->
<!-- type="text"-->
<!-- size="small"-->
<!-- @click.native.stop="printOrder(scope.row)"-->
<!-- >打印-->
<!-- </el-button>-->
<!-- <el-button-->
<!-- type="text"-->
<!-- size="small"-->
<!-- @click.native.stop="rollback(scope.row)"-->
<!-- >撤回-->
<!-- </el-button>-->
<!-- <el-button-->
<!-- type="text"-->
<!-- size="small"-->
<!-- @click.native.stop="rollback(scope.row)"-->
<!-- >撤回-->
<!-- </el-button>-->
<!-- <el-button-->
<!-- type="text"-->
<!-- size="small"-->
<!-- @click.native.stop="deleteDialog(scope.row)"-->
<!-- >删除-->
<!-- </el-button>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-button-->
<!-- type="text"-->
<!-- size="small"-->
<!-- @click.native.stop="deleteDialog(scope.row)"-->
<!-- >删除-->
<!-- </el-button>-->
<!-- </template>-->
<!-- </el-table-column>-->
</el-table>
<pagination
v-show="total > 0"
@ -162,6 +163,95 @@
@pagination="getList"
></pagination>
</el-card>
<el-tabs type="border-card" style="margin: 15px">
<!--单据业务详情-->
<el-tab-pane>
<span slot="label">单据 {{ currentRow.billNo }}-单据详情</span>
<el-form :inline="true" :model="bizQuery" class="query-form" size="mini">
<el-form-item class="query-form-item" label="物资名称:">
<el-input
v-model="bizQuery.productName"
placeholder="请输入物资名称"
clearable
>
</el-input>
</el-form-item>
<el-form-item>
<el-button-group>
<el-button
type="primary"
icon="el-icon-refresh"
@click="onBizReset"
>重置
</el-button>
<el-button type="primary" @click="onBizSubmit"
icon="el-icon-search"
>查询
</el-button>
</el-button-group>
</el-form-item>
</el-form>
<el-table v-loading="bizDetailLoading" :data="bizDetailList" style="width: 100%" border
row-key="id"
>
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column
label="物资名称"
prop="coName" width="160"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="规格型号" width="160"
prop="spec"
></el-table-column>
<el-table-column
label="批次号" width="120"
prop="batchNo"
></el-table-column>
<el-table-column
label="生产日期" width="120"
prop="productDate"
></el-table-column>
<el-table-column
label="失效日期"
prop="expireDate" width="120"
></el-table-column>
<el-table-column
label="单据数量" width="100"
prop="count"
></el-table-column>
<el-table-column
label="扫码数量"
prop="reCount" width="100"
></el-table-column>
<el-table-column
label="价格" width="100"
prop="price"
></el-table-column>
<el-table-column
label="生产企业" width="180"
prop="manufacturer"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="注册/备案号"
prop="certCode" width="180"
show-overflow-tooltip
></el-table-column>
</el-table>
<pagination
v-show="bizTotal>0"
:total="bizTotal"
:page.sync="bizQuery.page"
:limit.sync="bizQuery.limit"
@pagination="getBizDetailList"
/>
</el-tab-pane>
</el-tabs>
</div>
</template>
@ -393,6 +483,7 @@ export default {
},
//多行勾选
handleSelectionChange(val) {
let checkboxs = JSON.parse(JSON.stringify(val));
this.multipleSelection = checkboxs.map((item) => {
return item.billNo;
@ -400,22 +491,25 @@ export default {
let hebin = [...this.checkPreInOrders, ...this.multipleSelection];
let boxarry = Array.from(new Set(hebin));
this.selectbox = boxarry;
},
//全选
handleAll(selection) {
if(selection.length==0){
this.$refs.multipleTable.clearSelection()
if (selection.length == 0) {
this.$refs.multipleTable.clearSelection()
}
},
// 获取单据 业务详情、扫码详情、扫码明细
getOrderDetails() {
getOrderDetails(val) {
this.currentRow = val;
this.bizQuery.page = 1;
this.codeQuery.page = 1;
this.resultQuery.page = 1;
this.getBizDetailList();
this.getCodeDetailList();
this.getResultDetailList();
// this.getCodeDetailList();
// this.getResultDetailList();
},
//获取订单列表
getList() {

2
vue.config.js
Unescape Escape View File

@ -35,7 +35,7 @@ module.exports = {
proxy: {
// detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: {
target: `http://192.168.0.66:9160/UDI_SPMS_SERVER/`,
target: `http://127.0.0.1:9991`,
changeOrigin: true,
pathRewrite: {
["^" + process.env.VUE_APP_BASE_API]: "",

Write Preview
Loading…
Cancel
Save