angelo
/
web-base-admin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'lx-test' of gitee.com:cabbage_qd/web-base-admin into lx-online

This commit is contained in:
woody 2025-06-23 16:17:40 +08:00
parent e6a354874f 0ed383a561
commit c3211f1a0c
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/components/Delivery/nowdelivery.vue
View File

@ -99,8 +99,6 @@
/> />
<el-table-column align="center" prop="unitName" :label="'产品单位'" /> <el-table-column align="center" prop="unitName" :label="'产品单位'" />
<el-table-column align="center" prop="quantity" :label="'产品数量'" /> <el-table-column align="center" prop="quantity" :label="'产品数量'" />
<el-table-column align="center" prop="isBarCodeVal" label="是否追溯" />
<el-table-column align="center" prop="barCode" :label="'追溯编号'" />
<el-table-column align="center" prop="recName" :label="'收货人'" /> <el-table-column align="center" prop="recName" :label="'收货人'" />
<el-table-column <el-table-column
min-width="120px" min-width="120px"
@ -251,7 +249,6 @@
:label="'产品数量'" :label="'产品数量'"
/> />
<el-table-column align="center" prop="barCode" :label="'追溯编号'" />
<el-table-column <el-table-column
align="center" align="center"
prop="orderCode" prop="orderCode"

6
src/components/Delivery/yihandeled.vue
View File

@ -10,7 +10,7 @@
:disabled="multiple" :disabled="multiple"
@click="getPrintCheck" @click="getPrintCheck"
>{{ '生成打印' }}</el-button> >{{ '生成打印' }}</el-button>
<el-button <!-- <el-button
v-hasButtons="['DeliveryHandledBind']" v-hasButtons="['DeliveryHandledBind']"
size="small" size="small"
class="thebtn3" class="thebtn3"
@ -23,7 +23,7 @@
class="thebtn3" class="thebtn3"
:disabled="multiple" :disabled="multiple"
@click="codeBind(false)" @click="codeBind(false)"
>{{ '解绑追溯' }}</el-button> >{{ '解绑追溯' }}</el-button> -->
<el-button <el-button
v-hasButtons="['DeliveryHandledDelete']" v-hasButtons="['DeliveryHandledDelete']"
size="small" size="small"
@ -141,8 +141,6 @@
<el-table-column align="center" prop="unitName" :label="'产品单位'" /> <el-table-column align="center" prop="unitName" :label="'产品单位'" />
<el-table-column align="center" prop="quantity" :label="'产品数量'" /> <el-table-column align="center" prop="quantity" :label="'产品数量'" />
<el-table-column align="center" prop="isBarCodeVal" label="是否追溯" />
<el-table-column align="center" prop="barCode" :label="'追溯编号'" />
<el-table-column align="center" prop="scanTime" :label="'扫码日期'" /> <el-table-column align="center" prop="scanTime" :label="'扫码日期'" />
<el-table-column align="center" prop="recName" :label="'收货人'" /> <el-table-column align="center" prop="recName" :label="'收货人'" />