|
|
@@ -743,8 +743,8 @@
|
|
|
:disabled="contrOl || browseStatus"
|
|
|
>
|
|
|
<el-option
|
|
|
- v-for="dict in businessTypeOption"
|
|
|
- :key="dict.dictValue"
|
|
|
+ v-for="(dict,index) in businessTypeOption"
|
|
|
+ :key="index.dictValue"
|
|
|
:label="dict.dictLabel"
|
|
|
:value="dict.dictValue"
|
|
|
></el-option>
|
|
|
@@ -1233,14 +1233,9 @@
|
|
|
<el-dropdown-item command="a">收货单</el-dropdown-item>
|
|
|
<el-dropdown-item command="b">入库单</el-dropdown-item>
|
|
|
<el-dropdown-item command="c">理货单</el-dropdown-item>
|
|
|
- <el-dropdown-item>吊牌</el-dropdown-item>
|
|
|
- <el-dropdown-item>吊牌</el-dropdown-item>
|
|
|
- <el-dropdown-item>吊牌</el-dropdown-item>
|
|
|
- <el-dropdown-item>吊牌</el-dropdown-item>
|
|
|
- <el-dropdown-item>吊牌</el-dropdown-item>
|
|
|
- <el-dropdown-item>吊牌</el-dropdown-item>
|
|
|
- <el-dropdown-item>吊牌</el-dropdown-item>
|
|
|
- <el-dropdown-item>吊牌</el-dropdown-item>
|
|
|
+ <el-dropdown-item command="d">货物确认</el-dropdown-item>
|
|
|
+ <el-dropdown-item command="e">劳务确认</el-dropdown-item>
|
|
|
+ <el-dropdown-item command="f">吊牌信息</el-dropdown-item>
|
|
|
</el-dropdown-menu>
|
|
|
</el-dropdown>
|
|
|
<!-- <el-button
|
|
|
@@ -2007,8 +2002,8 @@
|
|
|
disabled
|
|
|
>
|
|
|
<el-option
|
|
|
- v-for="dict in businessTypeOption"
|
|
|
- :key="dict.dictValue"
|
|
|
+ v-for="(dict,index) in businessTypeOption"
|
|
|
+ :key="index.dictValue"
|
|
|
:label="dict.dictLabel"
|
|
|
:value="dict.dictValue"
|
|
|
></el-option>
|
|
|
@@ -2106,8 +2101,8 @@
|
|
|
:disabled="browseStatus"
|
|
|
>
|
|
|
<el-option
|
|
|
- v-for="dict in fStltypeOptions"
|
|
|
- :key="dict.dictValue"
|
|
|
+ v-for="(dict,index) in fStltypeOptions"
|
|
|
+ :key="index.dictValue"
|
|
|
:label="dict.dictLabel"
|
|
|
:value="parseInt(dict.dictValue)"
|
|
|
></el-option>
|
|
|
@@ -2375,8 +2370,8 @@
|
|
|
disabled
|
|
|
>
|
|
|
<el-option
|
|
|
- v-for="dict in businessTypeOption"
|
|
|
- :key="dict.dictValue"
|
|
|
+ v-for="(dic,index) in businessTypeOption"
|
|
|
+ :key="index.dictValue"
|
|
|
:label="dict.dictLabel"
|
|
|
:value="dict.dictValue"
|
|
|
></el-option>
|
|
|
@@ -2477,8 +2472,8 @@
|
|
|
:disabled="browseStatus"
|
|
|
>
|
|
|
<el-option
|
|
|
- v-for="dict in fStltypeOptions"
|
|
|
- :key="dict.dictValue"
|
|
|
+ v-for="(dic,index) in fStltypeOptions"
|
|
|
+ :key="index.dictValue"
|
|
|
:label="dict.dictLabel"
|
|
|
:value="parseInt(dict.dictValue)"
|
|
|
></el-option>
|
|
|
@@ -2842,8 +2837,8 @@
|
|
|
clearable
|
|
|
>
|
|
|
<el-option
|
|
|
- v-for="dict in jFeetunitOptions"
|
|
|
- :key="dict.dictValue"
|
|
|
+ v-for="(dic,index) in jFeetunitOptions"
|
|
|
+ :key="index.dictValue"
|
|
|
:label="dict.dictLabel"
|
|
|
:value="dict.dictValue"
|
|
|
/>
|
|
|
@@ -3255,21 +3250,74 @@
|
|
|
</div>
|
|
|
</el-dialog>
|
|
|
<el-dialog
|
|
|
- title="提示"
|
|
|
:visible.sync="print_lhd"
|
|
|
width="70%"
|
|
|
:close-on-click-modal="false"
|
|
|
:modal="false"
|
|
|
>
|
|
|
<div id="print_area1" class="print-div">
|
|
|
- <div class="print-title" style="display:flex;justify-content: center;font-size:24px">
|
|
|
+ <div
|
|
|
+ class="print-title"
|
|
|
+ style="display: flex; justify-content: center; font-size: 24px;margin-bottom:5px"
|
|
|
+ >
|
|
|
{{ company }}有限公司作业单
|
|
|
</div>
|
|
|
- <div class="print-title2" style="display:flex;justify-content: center;font-size:18px">
|
|
|
+ <div
|
|
|
+ class="print-title2"
|
|
|
+ style="display: flex; justify-content: center; font-size: 18px;margin-bottom:5px"
|
|
|
+ >
|
|
|
+ <div>入 库 计 划 单</div>
|
|
|
+ </div>
|
|
|
+ <div style="display: flex; justify-content: space-around;margin-bottom:5px">
|
|
|
<div>
|
|
|
- 入库计划单
|
|
|
+ <div>提单号：{{form.fMblno}}</div>
|
|
|
+ <div>客户名称：{{form.fCorpid}}</div>
|
|
|
+ <div>货物名称：{{form.fGoodsid}}</div>
|
|
|
+ <div>预计净重：{{form.fPlannetweight}}</div>
|
|
|
+ </div>
|
|
|
+ <div>
|
|
|
+ <div>入库计划单号：</div>
|
|
|
+ <div>计划入库日期：{{form.fBsdate}}</div>
|
|
|
+ <div>制单日期：</div>
|
|
|
+ <div>实际毛重：</div>
|
|
|
+ </div>
|
|
|
+ <div>
|
|
|
+ <div>清单号：</div>
|
|
|
+ <div>存放仓库：{{form.fWarehouseid}}</div>
|
|
|
+ <div>预计毛重：{{form.fPlangrossweight}}</div>
|
|
|
+ <div>实际净重：</div>
|
|
|
</div>
|
|
|
-
|
|
|
+ </div>
|
|
|
+ <div style="display:flex">
|
|
|
+ <table class="print_table" border="1" cellspacing="0" cellpadding="0" style="width:100%">
|
|
|
+ <tr>
|
|
|
+ <th>箱号</th>
|
|
|
+ <th>铅封号</th>
|
|
|
+ <th>预计件数</th>
|
|
|
+ <th>实际件数</th>
|
|
|
+ <th>垛位</th>
|
|
|
+ <th>实际入库日期</th>
|
|
|
+ <th>送货车号</th>
|
|
|
+ <th>送货司机</th>
|
|
|
+ <th>备注</th>
|
|
|
+ </tr>
|
|
|
+ <tr>
|
|
|
+ <th>箱号</th>
|
|
|
+ <th>铅封号</th>
|
|
|
+ <th>预计件数</th>
|
|
|
+ <th>实际件数</th>
|
|
|
+ <th>垛位</th>
|
|
|
+ <th>实际入库日期</th>
|
|
|
+ <th>送货车号</th>
|
|
|
+ <th>送货司机</th>
|
|
|
+ <th>备注</th>
|
|
|
+ </tr>
|
|
|
+ </table>
|
|
|
+ </div>
|
|
|
+ <div style="display: flex; justify-content: space-around;">
|
|
|
+ <div>操作：</div>
|
|
|
+ <div>库管：</div>
|
|
|
+ <div>叉车：</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
<span slot="footer" class="dialog-footer">
|
|
|
@@ -3279,6 +3327,189 @@
|
|
|
<el-button @click="print_lhd = false">取消 </el-button>
|
|
|
</span>
|
|
|
</el-dialog>
|
|
|
+ <el-dialog
|
|
|
+ :visible.sync="print_hwqr"
|
|
|
+ width="70%"
|
|
|
+ :close-on-click-modal="false"
|
|
|
+ :modal="false"
|
|
|
+ >
|
|
|
+ <div id="print_area1" class="print-div">
|
|
|
+ <div
|
|
|
+ class="print-title"
|
|
|
+ style="display: flex; justify-content: center; font-size: 24px;margin-bottom:5px"
|
|
|
+ >
|
|
|
+ {{ company }}有限公司
|
|
|
+ </div>
|
|
|
+ <div
|
|
|
+ class="print-title2"
|
|
|
+ style="display: flex; justify-content: center; font-size: 18px;margin-bottom:5px"
|
|
|
+ >
|
|
|
+ <div>入 库 单</div>
|
|
|
+ </div>
|
|
|
+ <div style="margin-bottom:5px">
|
|
|
+ <div>客户名称：{{form.fCorpid}}</div>
|
|
|
+ </div>
|
|
|
+ <div style="display:flex">
|
|
|
+ <table class="print_table" border="1" cellspacing="0" cellpadding="0" style="width:100%">
|
|
|
+ <tr>
|
|
|
+ <th>序号</th>
|
|
|
+ <th>实际入库日期</th>
|
|
|
+ <th>商品名称</th>
|
|
|
+ <th>提单号</th>
|
|
|
+ <th>箱号</th>
|
|
|
+ <th>件数</th>
|
|
|
+ <th>毛重</th>
|
|
|
+ <th>净重</th>
|
|
|
+ <th>备注</th>
|
|
|
+ </tr>
|
|
|
+ <tr>
|
|
|
+ <th>序号</th>
|
|
|
+ <th>实际入库日期</th>
|
|
|
+ <th>商品名称</th>
|
|
|
+ <th>提单号</th>
|
|
|
+ <th>箱号</th>
|
|
|
+ <th>件数</th>
|
|
|
+ <th>毛重</th>
|
|
|
+ <th>净重</th>
|
|
|
+ <th>备注</th>
|
|
|
+ </tr>
|
|
|
+ </table>
|
|
|
+ </div>
|
|
|
+ <div style="display: flex; justify-content: space-around;">
|
|
|
+ <div>制单人：</div>
|
|
|
+ <div>审核人：</div>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ <span slot="footer" class="dialog-footer">
|
|
|
+ <el-button type="primary" :disabled="browseStatus" @click="addprint"
|
|
|
+ >打印
|
|
|
+ </el-button>
|
|
|
+ <el-button @click="print_hwqr = false">取消 </el-button>
|
|
|
+ </span>
|
|
|
+ </el-dialog>
|
|
|
+ <el-dialog
|
|
|
+ :visible.sync="print_lwqr"
|
|
|
+ width="70%"
|
|
|
+ :close-on-click-modal="false"
|
|
|
+ :modal="false"
|
|
|
+ >
|
|
|
+ <div id="print_area1" class="print-div">
|
|
|
+ <div
|
|
|
+ class="print-title"
|
|
|
+ style="display: flex; justify-content: center; font-size: 24px;margin-bottom:5px"
|
|
|
+ >
|
|
|
+ {{ company }}有限公司
|
|
|
+ </div>
|
|
|
+ <div
|
|
|
+ class="print-title2"
|
|
|
+ style="display: flex; justify-content: center; font-size: 18px;margin-bottom:5px"
|
|
|
+ >
|
|
|
+ <div>入 库 单</div>
|
|
|
+ </div>
|
|
|
+ <div style="display: flex; justify-content: flex-end;margin-bottom:5px">
|
|
|
+ <div>存货地点：{{form.fMblno}}</div>
|
|
|
+ </div>
|
|
|
+ <div style="display:flex">
|
|
|
+ <table class="print_table" border="1" cellspacing="0" cellpadding="0" style="width:100%">
|
|
|
+ <tr>
|
|
|
+ <th>品名</th>
|
|
|
+ <th>XXXXXXXXXXXX</th>
|
|
|
+ <th>清单号</th>
|
|
|
+ <th>XXXXXXXXXX</th>
|
|
|
+ </tr>
|
|
|
+ <tr>
|
|
|
+ <th>箱号</th>
|
|
|
+ <th>铅封号</th>
|
|
|
+ <th>预计件数</th>
|
|
|
+ <th>实际件数</th>
|
|
|
+ </tr>
|
|
|
+ </table>
|
|
|
+ </div>
|
|
|
+ <div style="display: flex; justify-content: space-around;">
|
|
|
+ <div>库管：</div>
|
|
|
+ <div>叉车：</div>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ <span slot="footer" class="dialog-footer">
|
|
|
+ <el-button type="primary" :disabled="browseStatus" @click="addprint"
|
|
|
+ >打印
|
|
|
+ </el-button>
|
|
|
+ <el-button @click="print_lwqr = false">取消 </el-button>
|
|
|
+ </span>
|
|
|
+ </el-dialog>
|
|
|
+ <el-dialog
|
|
|
+ :visible.sync="print_dpxx"
|
|
|
+ width="70%"
|
|
|
+ :close-on-click-modal="false"
|
|
|
+ :modal="false"
|
|
|
+ >
|
|
|
+ <div id="print_area1" class="print-div">
|
|
|
+ <div
|
|
|
+ class="print-title"
|
|
|
+ style="display: flex; justify-content: center; font-size: 24px;margin-bottom:5px"
|
|
|
+ >
|
|
|
+ {{ company }}有限公司货物标识卡
|
|
|
+ </div>
|
|
|
+ <div
|
|
|
+ class="print-title2"
|
|
|
+ style="display: flex; justify-content: center; font-size: 18px;margin-bottom:5px"
|
|
|
+ >
|
|
|
+ <div>入 库 计 划 单</div>
|
|
|
+ </div>
|
|
|
+ <div style="display: flex; justify-content: space-around;margin-bottom:5px">
|
|
|
+ <div>
|
|
|
+ <div>提单号：{{form.fMblno}}</div>
|
|
|
+ <div>客户名称：{{form.fCorpid}}</div>
|
|
|
+ <div>货物名称：{{form.fGoodsid}}</div>
|
|
|
+ <div>预计净重：{{form.fPlannetweight}}</div>
|
|
|
+ </div>
|
|
|
+ <div>
|
|
|
+ <div>入库计划单号：</div>
|
|
|
+ <div>计划入库日期：{{form.fBsdate}}</div>
|
|
|
+ <div>制单日期：</div>
|
|
|
+ <div>实际毛重：</div>
|
|
|
+ </div>
|
|
|
+ <div>
|
|
|
+ <div>清单号：</div>
|
|
|
+ <div>存放仓库：{{form.fWarehouseid}}</div>
|
|
|
+ <div>预计毛重：{{form.fPlangrossweight}}</div>
|
|
|
+ <div>实际净重：</div>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ <div style="display:flex">
|
|
|
+ <table class="print_table" border="1" cellspacing="0" cellpadding="0" style="width:100%">
|
|
|
+ <tr>
|
|
|
+ <th>箱号</th>
|
|
|
+ <th>铅封号</th>
|
|
|
+ <th>预计件数</th>
|
|
|
+ <th>实际件数</th>
|
|
|
+ <th>垛位</th>
|
|
|
+ <th>实际入库日期</th>
|
|
|
+ <th>送货车号</th>
|
|
|
+ <th>送货司机</th>
|
|
|
+ <th>备注</th>
|
|
|
+ </tr>
|
|
|
+ <tr>
|
|
|
+ <th>箱号</th>
|
|
|
+ <th>铅封号</th>
|
|
|
+ <th>预计件数</th>
|
|
|
+ <th>实际件数</th>
|
|
|
+ <th>垛位</th>
|
|
|
+ <th>实际入库日期</th>
|
|
|
+ <th>送货车号</th>
|
|
|
+ <th>送货司机</th>
|
|
|
+ <th>备注</th>
|
|
|
+ </tr>
|
|
|
+ </table>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ <span slot="footer" class="dialog-footer">
|
|
|
+ <el-button type="primary" :disabled="browseStatus" @click="addprint"
|
|
|
+ >打印
|
|
|
+ </el-button>
|
|
|
+ <el-button @click="print_dpxx = false">取消 </el-button>
|
|
|
+ </span>
|
|
|
+ </el-dialog>
|
|
|
</el-dialog>
|
|
|
<el-dialog
|
|
|
title="选择库位"
|
|
|
@@ -3820,6 +4051,9 @@ export default {
|
|
|
addOrUpdateVisible: false,
|
|
|
addOrUpdateVisib: false,
|
|
|
print_lhd: false,
|
|
|
+ print_hwqr: false,
|
|
|
+ print_lwqr: false,
|
|
|
+ print_dpxx: false,
|
|
|
// 新增计划净重
|
|
|
weightList: false,
|
|
|
dataList: [],
|
|
|
@@ -4052,6 +4286,12 @@ export default {
|
|
|
this.showEditDialog_s();
|
|
|
} else if (command == "c") {
|
|
|
this.print_lhd = true;
|
|
|
+ }else if (command == "d") {
|
|
|
+ this.print_hwqr = true;
|
|
|
+ }else if (command == "e") {
|
|
|
+ this.print_lwqr = true;
|
|
|
+ }else if (command == "f") {
|
|
|
+ this.print_dpxx = true;
|
|
|
}
|
|
|
},
|
|
|
full() {
|
|
|
@@ -6267,7 +6507,9 @@ export default {
|
|
|
},
|
|
|
//打印
|
|
|
addprint() {
|
|
|
- const style ='@page { } ' +'@media print { .print-div{ padding:8px;background-color:#cccccc;line-height:12px } .print-title{display:flex;justify-content: center;font-size:24px}' ;
|
|
|
+ const style =
|
|
|
+ "@page { } " +
|
|
|
+ "@media print { .print-div{ padding:8px;background-color:#cccccc;} .print-title{display:flex;justify-content: center;font-size:24px}";
|
|
|
print({
|
|
|
printable: "print_area1",
|
|
|
type: "html",
|
|
|
@@ -7202,6 +7444,12 @@ export default {
|
|
|
border-bottom: 1px solid #dfe6ec !important;
|
|
|
border-bottom: 1px solid #dfe6ec !important;
|
|
|
}
|
|
|
+.print_table > tr > td {
|
|
|
+ text-align: center;
|
|
|
+ border-right: 1px solid #000000 !important;
|
|
|
+ border-bottom: 1px solid #000000 !important;
|
|
|
+ border-bottom: 1px solid #000000 !important;
|
|
|
+}
|
|
|
.el-table thead th {
|
|
|
background: #1890ff;
|
|
|
color: #fff;
|
Qukaidi