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

单据提交问题修改

Browse Source
dev
anthonywj 2 years ago
parent a22b6520d7
commit ebdd11e4e4
3 changed files with 83 additions and 59 deletions
Show Stats Download Patch File Download Diff File

4
.env.production
Unescape Escape View File

@ -18,14 +18,14 @@ ENV = 'production'
# 文明东1
# VUE_APP_BASE_API = 'http://192.168.0.62:9150/UDI_WMS_MC/'
# 文明东2
# VUE_APP_BASE_API = 'http://192.168.0.61:9150/UDI_WMS_MC/'
VUE_APP_BASE_API = 'http://192.168.0.61:9150/UDI_WMS_MC/'
# VUE_APP_SYNC_API ="http://192.168.0.62:9150/SP_SYNC_SERVER"
刘恩典
# VUE_APP_BASE_API = 'http://192.168.0.54:9150/UDI_WMS_MC/'
# 平潭正式
VUE_APP_BASE_API = 'http://55.55.0.62:9150/UDI_WMS_MC/'
# VUE_APP_BASE_API = 'http://55.55.0.62:9150/UDI_WMS_MC/'
# 吴总测试服务器
# VUE_APP_BASE_API = 'http://116.204.106.103:9150/UDI_WMS_MC/'

102
src/views/inout/DialogCreateOrder.vue
Unescape Escape View File

@ -8,52 +8,56 @@
label-width="110px"
style="margin-bottom: -15px"
>
<el-button-group
style="display: flex; margin: 0px 0 15px 75%; height: 35px"
>
<el-button
size="mini"
type="primary"
v-if="documentShow"
@click.native="OptionalDocument()"
>选入预验收库单
</el-button>
<el-button size="mini" type="primary" @click.native="saveOrder()"
>草稿保存
</el-button>
<el-button size="mini" type="primary" @click.native="submit()"
v-if="viewType != 7"
>立即提交
</el-button>
<el-button type="primary" @click="submit(1)"
v-if="viewType == 7">校验结果提交
</el-button>
<el-button type="primary" @click="submit(2)"
v-if="viewType == 7">扫码结果提交
</el-button>
<el-button size="mini" type="primary" @click.native="revokeBill()"
v-if="viewType == 7">撤回单据
</el-button>
<!-- v-if="(viewType != 5 && viewType != 6)&&(curAction.checkWebNew != 2 || viewType !=1)"-->
<!-- <el-button size="mini" type="primary" @click.native="submit(1)"-->
<!-- v-if="curAction.checkWebNew > 1 && viewType == 1"-->
<!-- >待配货提交-->
<!-- </el-button>-->
<!-- <el-button size="mini" type="primary" @click.native="submit(1)"-->
<!-- v-if="viewType == 5"-->
<!-- >完成验收-->
<!-- </el-button>-->
<!-- <el-button size="mini" type="primary" @click.native="submit(1)"-->
<!-- v-if=" viewType == 6"-->
<!-- >完成验收-->
<!-- </el-button>-->
</el-button-group>
<el-row>
<el-button-group
style="display: flex; margin: 0px 0 15px 0; height: 35px;float: right"
>
<el-button
size="mini"
type="primary"
v-if="documentShow"
@click.native="OptionalDocument()"
>选入预验收库单
</el-button>
<el-button size="mini" type="primary" @click.native="saveOrder()"
>草稿保存
</el-button>
<el-button size="mini" type="primary" @click.native="submit()"
v-if="viewType != 7"
>立即提交
</el-button>
<el-button type="primary" @click="submit(1)"
v-if="viewType == 7">校验结果提交
</el-button>
<el-button type="primary" @click="submit(2)"
v-if="viewType == 7">扫码结果提交
</el-button>
<el-button size="mini" type="primary" @click.native="revokeBill()"
v-if="viewType == 7">撤回单据
</el-button>
<!-- v-if="(viewType != 5 && viewType != 6)&&(curAction.checkWebNew != 2 || viewType !=1)"-->
<!-- <el-button size="mini" type="primary" @click.native="submit(1)"-->
<!-- v-if="curAction.checkWebNew > 1 && viewType == 1"-->
<!-- >待配货提交-->
<!-- </el-button>-->
<!-- <el-button size="mini" type="primary" @click.native="submit(1)"-->
<!-- v-if="viewType == 5"-->
<!-- >完成验收-->
<!-- </el-button>-->
<!-- <el-button size="mini" type="primary" @click.native="submit(1)"-->
<!-- v-if=" viewType == 6"-->
<!-- >完成验收-->
<!-- </el-button>-->
</el-button-group>
</el-row>
<el-row>
<el-col :span="11">
<el-form-item prop="corpOrderId" label="单据号:">
@ -1254,6 +1258,7 @@ export default {
.then((response) => {
if (response.code == 20000) {
this.$message.success("撤回成功！");
this.closeDialog();
} else {
this.$message.error(response.message);
}
@ -1353,9 +1358,8 @@ export default {
this.$message.error(response.message);
}
});
}
if (this.viewType = 7) { //待校验提交
if (val = 1) {
} else if (this.viewType == 7) { //待校验提交
if (val == 1) {
this.$confirm("此操作将以校验的正确结果重新生成业务单并提交，是否继续？", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",

36
src/views/inout/PanelCreateOrderCodes.vue
Unescape Escape View File

@ -15,6 +15,18 @@
width="280"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="物资名称"
prop="productName"
width="160"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="规格型号"
prop="ggxh"
width="160"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="批次号"
prop="batchNo"
@ -94,16 +106,24 @@
</template>
</el-table-column>
</el-table>
<el-row>
<el-col span="2">
<span><div style="background-color: #FC4A45;width: 10px;height: 10px"></div>红色:多余条码</span>
</el-col>
<el-col span="2">
<div style="background-color: #F4BD25;width: 10px;height: 10px"></div>
<span>黄色:包含多余条码</span>
<el-row v-if="viewType==7">
<el-col span="10">
<div style="float: left">
<td>
<div style="background-color: #FC4A45;width: 10px;height: 10px"></div>
</td>
<td><span>红色:多余条码</span></td>
<td>
<div style="background-color: #F4BD25;width: 10px;height: 10px;margin-left: 15px"></div>
</td>
<td>
<span>黄色:包含多余条码</span>
</td>
</div>
</el-col>
</el-row>
<div class="block">
<pagination

Write Preview
Loading…
Cancel
Save