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

Merge remote-tracking branch 'origin/dev_ksck_z' into dev_ksck_z

Browse Source
20240912_adapter_z
wangwei 8 months ago
parent b27d09891f 47c2c2b4c7
commit 60c7fd5ad1
7 changed files with 49 additions and 30 deletions
Show Stats Download Patch File Download Diff File

8
src/views/collect/CollectOrderAllotBlank.vue
Unescape Escape View File

@ -8,9 +8,11 @@
style="margin: 10px;color: #2d8cf0;font-size: 14px;" style="margin: 10px;color: #2d8cf0;font-size: 14px;"
>部门&nbsp:&nbsp{{ this.userInfo.deptName }}</span> >部门&nbsp:&nbsp{{ this.userInfo.deptName }}</span>
<span style="font-weight: 500;color:rgb(51 48 48); font-size: 14px;">用户&nbsp:&nbsp{{ <span style="font-weight: 500;color:rgb(51 48 48); font-size: 14px;">用户&nbsp:&nbsp
this.userInfo.companyName <!-- {{-->
}}</span> <!-- this.userInfo.companyName-->
<!-- }}-->
</span>
<span <span
style="font-weight: 500;color:rgb(51 48 48); font-size: 14px; margin-right: 20px" style="font-weight: 500;color:rgb(51 48 48); font-size: 14px; margin-right: 20px"
>({{ >({{

18
src/views/collect/CollectOrderEndBlank.vue
Unescape Escape View File

@ -8,9 +8,11 @@
style="margin: 10px;color: #2d8cf0;font-size: 14px;" style="margin: 10px;color: #2d8cf0;font-size: 14px;"
>部门&nbsp:&nbsp{{ this.userInfo.deptName }}</span> >部门&nbsp:&nbsp{{ this.userInfo.deptName }}</span>
<span style="font-weight: 500;color:rgb(51 48 48); font-size: 14px;">用户&nbsp:&nbsp{{ <span style="font-weight: 500;color:rgb(51 48 48); font-size: 14px;">用户&nbsp:&nbsp
this.userInfo.companyName <!-- {{-->
}}</span> <!-- this.userInfo.companyName-->
<!-- }}-->
</span>
<span <span
style="font-weight: 500;color:rgb(51 48 48); font-size: 14px; margin-right: 20px" style="font-weight: 500;color:rgb(51 48 48); font-size: 14px; margin-right: 20px"
>({{ >({{
@ -24,16 +26,16 @@
<el-tabs type="border-card" style="margin: 15px"> <el-tabs type="border-card" style="margin: 15px">
<el-tab-pane label="已完成赋码单据"> <el-tab-pane label="已完成单据">
<prescribePanel <prescribePanel
style="margin: -15px" style="margin: -15px"
></prescribePanel> ></prescribePanel>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="扫码查询"> <!-- <el-tab-pane label="扫码查询">-->
<codePanel style="margin: -15px" <!-- <codePanel style="margin: -15px"-->
></codePanel> <!-- ></codePanel>-->
</el-tab-pane> <!-- </el-tab-pane>-->
</el-tabs> </el-tabs>

3
src/views/collect/DealOrderBlank.vue
Unescape Escape View File

@ -9,9 +9,6 @@
<span <span
style="margin: 10px;color: #2d8cf0;font-size: 14px;" style="margin: 10px;color: #2d8cf0;font-size: 14px;"
>部门&nbsp:&nbsp{{ this.userInfo.deptName }}</span> >部门&nbsp:&nbsp{{ this.userInfo.deptName }}</span>
<!-- <span style="font-weight: 500;color:rgb(51 48 48); font-size: 14px;">{{-->
<!-- this.userInfo.companyName-->
<!-- }}</span>-->
<span <span
style="font-weight: 500;color:rgb(51 48 48); font-size: 14px; margin-right: 20px" style="font-weight: 500;color:rgb(51 48 48); font-size: 14px; margin-right: 20px"
>&nbsp&nbsp&nbsp&nbsp(用户&nbsp:&nbsp{{ >&nbsp&nbsp&nbsp&nbsp(用户&nbsp:&nbsp{{

8
src/views/collect/IoCreateOrder.vue
Unescape Escape View File

@ -15,9 +15,11 @@
style="margin: 10px;color: #2d8cf0;font-size: 14px;" style="margin: 10px;color: #2d8cf0;font-size: 14px;"
>部门&nbsp:&nbsp{{ this.userInfo.deptName }}</span> >部门&nbsp:&nbsp{{ this.userInfo.deptName }}</span>
<span style="font-weight: 500;color:rgb(51 48 48); font-size: 14px;">用户&nbsp:&nbsp{{ <span style="font-weight: 500;color:rgb(51 48 48); font-size: 14px;">用户&nbsp:&nbsp
this.userInfo.companyName <!-- {{-->
}}</span> <!-- this.userInfo.companyName-->
<!-- }}-->
</span>
<span <span
style="font-weight: 500;color:rgb(51 48 48); font-size: 14px; margin-right: 20px" style="font-weight: 500;color:rgb(51 48 48); font-size: 14px; margin-right: 20px"
>({{ >({{

24
src/views/collect/IoCreateOrderBlank.vue
Unescape Escape View File

@ -15,9 +15,11 @@
style="margin: 10px;color: #2d8cf0;font-size: 14px;" style="margin: 10px;color: #2d8cf0;font-size: 14px;"
>部门&nbsp:&nbsp{{ this.userInfo.deptName }}</span> >部门&nbsp:&nbsp{{ this.userInfo.deptName }}</span>
<span style="font-weight: 500;color:rgb(51 48 48); font-size: 14px;">用户&nbsp:&nbsp{{ <span style="font-weight: 500;color:rgb(51 48 48); font-size: 14px;">用户&nbsp:&nbsp
this.userInfo.companyName <!-- {{-->
}}</span> <!-- this.userInfo.companyName-->
<!-- }}-->
</span>
<span <span
style="font-weight: 500;color:rgb(51 48 48); font-size: 14px; margin-right: 20px" style="font-weight: 500;color:rgb(51 48 48); font-size: 14px; margin-right: 20px"
>({{ >({{
@ -28,7 +30,7 @@
</el-row> </el-row>
<el-alert <el-alert
style="margin-top: 15px;margin-bottom: 10px;font-size: 20px;" style="margin-top: 1px;margin-bottom: 10px;font-size: 20px;"
:title="msgTip" :title="msgTip"
:closable="false" :closable="false"
type="warning"> type="warning">
@ -54,6 +56,10 @@
v-if="splitType=='out'" style="margin-right: 8px;border-radius: 5%;" v-if="splitType=='out'" style="margin-right: 8px;border-radius: 5%;"
>上货完成 >上货完成
</el-button> </el-button>
<el-button size="mini" type="primary" @click.native="" :loading="submitLoading"
v-if="splitType=='return'" style="margin-right: 8px;border-radius: 5%;"
>草稿保存
</el-button>
<el-button size="mini" type="primary" @click.native="submit()" :loading="submitLoading" <el-button size="mini" type="primary" @click.native="submit()" :loading="submitLoading"
v-if="splitType=='return'" style="margin-right: 8px;border-radius: 5%;" v-if="splitType=='return'" style="margin-right: 8px;border-radius: 5%;"
>退货完成 >退货完成
@ -155,7 +161,7 @@
</el-col> </el-col>
<el-col :span="8" v-if="splitType=='out'"> <el-col :span="8" v-if="splitType=='out'">
<el-form-item prop="fifoSplit" class="query-form-item" label="上货方式:"> <el-form-item prop="fifoSplit" class="query-form-item" label="上货方式:">
<el-radio-group v-model="orderFormData.fifoSplit" :disabled="fifoSplitEnable"> <el-radio-group v-model="orderFormData.fifoSplit" :disabled="fifoSplitEnable" @change="splitChange">
<el-radio :label="1">拆零上货</el-radio> <el-radio :label="1">拆零上货</el-radio>
<el-radio :label="2">整取上货</el-radio> <el-radio :label="2">整取上货</el-radio>
</el-radio-group> </el-radio-group>
@ -269,7 +275,6 @@
v-if="chooseDraftOrderVisible" v-if="chooseDraftOrderVisible"
> >
<chooseDraftOrderDialog <chooseDraftOrderDialog
:viewType="1"
:rowData="rowData" :rowData="rowData"
:closeChooseDialog="closeChooseDialog" :closeChooseDialog="closeChooseDialog"
:handleChoose="handleChoose" :handleChoose="handleChoose"
@ -539,9 +544,15 @@ export default {
findInvRemind(post).then((response) => { findInvRemind(post).then((response) => {
if (response.code === 20000) { if (response.code === 20000) {
this.msgTip = response.data this.msgTip = response.data
this.$refs.inputRef.focus();
} }
}).catch(() => { }).catch(() => {
}); });
},
splitChange() {
this.$refs.inputRef.focus();
}, },
successCloseData() { successCloseData() {
let workPlaceCode = this.orderFormData.workPlaceCode let workPlaceCode = this.orderFormData.workPlaceCode
@ -1549,6 +1560,7 @@ export default {
this.originCode = this.codeFormData.code; this.originCode = this.codeFormData.code;
} else if (response.code == 501) { } else if (response.code == 501) {
this.checkSuccess = false; this.checkSuccess = false;
this.scanCode = ""
this.$message.error(response.message); this.$message.error(response.message);
} else if (response.code == 503) { } else if (response.code == 503) {
this.checkSuccess = false; this.checkSuccess = false;

8
src/views/collect/ioSplitFifoCode.vue
Unescape Escape View File

@ -9,9 +9,11 @@
style="margin: 10px;color: #2d8cf0;font-size: 14px;" style="margin: 10px;color: #2d8cf0;font-size: 14px;"
>部门&nbsp:&nbsp{{ this.userInfo.deptName }}</span> >部门&nbsp:&nbsp{{ this.userInfo.deptName }}</span>
<span style="font-weight: 500;color:rgb(51 48 48); font-size: 14px;">用户&nbsp:&nbsp{{ <span style="font-weight: 500;color:rgb(51 48 48); font-size: 14px;">用户&nbsp:&nbsp
this.userInfo.companyName <!-- {{-->
}}</span> <!-- this.userInfo.companyName-->
<!-- }}-->
</span>
<span <span
style="font-weight: 500;color:rgb(51 48 48); font-size: 14px; margin-right: 20px" style="font-weight: 500;color:rgb(51 48 48); font-size: 14px; margin-right: 20px"
>&nbsp&nbsp&nbsp&nbsp(用户&nbsp:&nbsp{{ >&nbsp&nbsp&nbsp&nbsp(用户&nbsp:&nbsp{{

10
src/views/collect/ioSplitFifoCodeBlank.vue
Unescape Escape View File

@ -9,12 +9,14 @@
style="margin: 10px;color: #2d8cf0;font-size: 14px;" style="margin: 10px;color: #2d8cf0;font-size: 14px;"
>部门&nbsp:&nbsp{{ this.userInfo.deptName }}</span> >部门&nbsp:&nbsp{{ this.userInfo.deptName }}</span>
<span style="font-weight: 500;color:rgb(51 48 48); font-size: 14px;">用户&nbsp:&nbsp{{ <!-- <span style="font-weight: 500;color:rgb(51 48 48); font-size: 14px;">用户&nbsp:&nbsp-->
this.userInfo.companyName <!-- {{-->
}}</span> <!-- this.userInfo.companyName-->
<!-- }}-->
<!-- </span>-->
<span <span
style="font-weight: 500;color:rgb(51 48 48); font-size: 14px; margin-right: 20px" style="font-weight: 500;color:rgb(51 48 48); font-size: 14px; margin-right: 20px"
>({{ >&nbsp&nbsp&nbsp&nbsp(用户&nbsp:&nbsp{{
this.userInfo.userName this.userInfo.userName
}})</span> }})</span>
</div> </div>

Write Preview
Loading…
Cancel
Save