|
@@ -1100,13 +1100,14 @@
|
|
|
<el-button :disabled="browseStatus" type="primary" size="small">
|
|
|
下载模板
|
|
|
</el-button>
|
|
|
- <el-button
|
|
|
- :disabled="browseStatus"
|
|
|
- type="primary"
|
|
|
- size="small"
|
|
|
- @click="tishi"
|
|
|
- >导入Excel</el-button
|
|
|
+ <el-upload
|
|
|
+ class="upload-demo"
|
|
|
+ :headers="headers"
|
|
|
+ :action="actionUrl"
|
|
|
+ multiple
|
|
|
>
|
|
|
+ <el-button size="small" type="primary">导入Execl</el-button>
|
|
|
+ </el-upload>
|
|
|
</el-col>
|
|
|
<el-col style="display: flex; justify-content: flex-end">
|
|
|
<el-button
|
|
@@ -1142,7 +1143,10 @@
|
|
|
<el-dropdown-menu slot="dropdown">
|
|
|
<el-dropdown-item command="a">收货单</el-dropdown-item>
|
|
|
<el-dropdown-item command="z">标准入库单</el-dropdown-item>
|
|
|
-<!-- <el-dropdown-item command="b">入库单</el-dropdown-item>-->
|
|
|
+ <el-dropdown-item command="y"
|
|
|
+ >标准入库单(件数)</el-dropdown-item
|
|
|
+ >
|
|
|
+ <!-- <el-dropdown-item command="b">入库单</el-dropdown-item>-->
|
|
|
<el-dropdown-item command="c">理货单</el-dropdown-item>
|
|
|
<el-dropdown-item command="d">货物确认</el-dropdown-item>
|
|
|
<el-dropdown-item command="e">劳务确认</el-dropdown-item>
|
|
@@ -1975,7 +1979,10 @@
|
|
|
<td>客户名称</td>
|
|
|
<td>{{ form.fCorpidName }}</td>
|
|
|
<td>入库日期</td>
|
|
|
- <td colspan="2">{{ form.fBsdate | fBsdateFormat }}</td>
|
|
|
+ <td colspan="2" v-if="Printinglist.length">
|
|
|
+ {{ Printinglist[0].fBsdate | fBsdateFormat }}
|
|
|
+ </td>
|
|
|
+ <td colspan="2" v-else></td>
|
|
|
<td>流水号</td>
|
|
|
<td colspan="2">{{ form.fBillno }}</td>
|
|
|
</tr>
|
|
@@ -2040,6 +2047,94 @@
|
|
|
</span>
|
|
|
</el-dialog>
|
|
|
<el-dialog
|
|
|
+ :visible.sync="print_bzrkd_js"
|
|
|
+ width="70%"
|
|
|
+ :close-on-click-modal="false"
|
|
|
+ :modal="false"
|
|
|
+ >
|
|
|
+ <div id="print_area15" class="print-div">
|
|
|
+ <div
|
|
|
+ class="print-title"
|
|
|
+ style="
|
|
|
+ display: flex;
|
|
|
+ justify-content: center;
|
|
|
+ font-size: 24px;
|
|
|
+ margin-bottom: 5px;
|
|
|
+ "
|
|
|
+ >
|
|
|
+ {{ company }}有限公司入库单
|
|
|
+ </div>
|
|
|
+ <div class="print_table" style="display: flex">
|
|
|
+ <table border="0" cellspacing="0" cellpadding="0" style="width: 100%">
|
|
|
+ <tr>
|
|
|
+ <td>客户名称</td>
|
|
|
+ <td>{{ form.fCorpidName }}</td>
|
|
|
+ <td>入库日期</td>
|
|
|
+ <td colspan="2" v-if="Printinglist.length">
|
|
|
+ {{ Printinglist[0].fBsdate | fBsdateFormat }}
|
|
|
+ </td>
|
|
|
+ <td colspan="2" v-else></td>
|
|
|
+ <td>流水号</td>
|
|
|
+ <td colspan="2">{{ form.fBillno }}</td>
|
|
|
+ </tr>
|
|
|
+ <tr>
|
|
|
+ <td>车号</td>
|
|
|
+ <td colspan="3">{{ form.fTruckno }}</td>
|
|
|
+ <td colspan="2">提单号</td>
|
|
|
+ <td colspan="3">{{ form.fMblno }}</td>
|
|
|
+ </tr>
|
|
|
+ <tr>
|
|
|
+ <td>货名</td>
|
|
|
+ <td>箱号</td>
|
|
|
+ <td>箱量</td>
|
|
|
+ <td>件数</td>
|
|
|
+ <td>毛重</td>
|
|
|
+ <td>规格</td>
|
|
|
+ <td>区位</td>
|
|
|
+ <td>备注</td>
|
|
|
+ </tr>
|
|
|
+ <tr v-for="(item, index) in Printinglist" :key="index">
|
|
|
+ <td>{{ item.fGoodsids }}</td>
|
|
|
+ <td>{{ item.fCntrno }}</td>
|
|
|
+ <td>{{ item.fCntqty }}</td>
|
|
|
+ <td>{{ item.fQty }}</td>
|
|
|
+ <td></td>
|
|
|
+ <td>{{ item.fPackagespecs }}</td>
|
|
|
+ <td>{{ item.fWarehouseInformation }}</td>
|
|
|
+ <td>{{ item.remark }}</td>
|
|
|
+ </tr>
|
|
|
+ <tr>
|
|
|
+ <td>备注</td>
|
|
|
+ <td colspan="3"></td>
|
|
|
+ <td>总件数</td>
|
|
|
+ <td colspan="3">{{ allfQty }}</td>
|
|
|
+ </tr>
|
|
|
+ </table>
|
|
|
+ </div>
|
|
|
+ <div
|
|
|
+ style="display: flex; justify-content: space-between; font-size: 12px"
|
|
|
+ >
|
|
|
+ <div>操作:{{ form.createBy }}</div>
|
|
|
+ <div>理货:</div>
|
|
|
+ <div>叉车:</div>
|
|
|
+ <div>司机:</div>
|
|
|
+ <div style="width: 200px">电话:</div>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ <span slot="footer" class="dialog-footer">
|
|
|
+ <el-button
|
|
|
+ type="primary"
|
|
|
+ :disabled="browseStatus"
|
|
|
+ @click="
|
|
|
+ addprint('bzrkd_js');
|
|
|
+ print_bzrkd_js = false;
|
|
|
+ "
|
|
|
+ >打印
|
|
|
+ </el-button>
|
|
|
+ <el-button @click="print_bzrkd_js = false">取消 </el-button>
|
|
|
+ </span>
|
|
|
+ </el-dialog>
|
|
|
+ <el-dialog
|
|
|
:visible.sync="print_lhd"
|
|
|
width="70%"
|
|
|
:close-on-click-modal="false"
|
|
@@ -3097,6 +3192,7 @@
|
|
|
|
|
|
<script>
|
|
|
import print from "print-js";
|
|
|
+import { getToken } from "@/utils/auth";
|
|
|
import {
|
|
|
addWhgenleg,
|
|
|
addJoblist,
|
|
@@ -3250,6 +3346,7 @@ export default {
|
|
|
print_xhcdrkd: false,
|
|
|
print_zpdkrkd: false,
|
|
|
print_bzrkd: false,
|
|
|
+ print_bzrkd_js: false,
|
|
|
print_dk: false,
|
|
|
company: "",
|
|
|
Printinglist: [],
|
|
@@ -3495,6 +3592,12 @@ export default {
|
|
|
ifweightRecoveryList: [],
|
|
|
showApproval: null,
|
|
|
downloadTemplateVisible: false,
|
|
|
+ actionUrl:
|
|
|
+ process.env.VUE_APP_BASE_API +
|
|
|
+ "/warehouseBusiness/inStock/importInstock", // 上传的图片服务器地址
|
|
|
+ headers: {
|
|
|
+ Authorization: "Bearer " + getToken(),
|
|
|
+ },
|
|
|
};
|
|
|
},
|
|
|
created() {
|
|
@@ -5194,6 +5297,8 @@ export default {
|
|
|
this.print_bzrkd = true;
|
|
|
} else if (command == "h") {
|
|
|
this.print_dk = true;
|
|
|
+ } else if (command == "y") {
|
|
|
+ this.print_bzrkd_js = true;
|
|
|
}
|
|
|
}
|
|
|
});
|
|
@@ -5516,6 +5621,14 @@ export default {
|
|
|
scanStyles: false,
|
|
|
});
|
|
|
break;
|
|
|
+ case "bzrkd_js":
|
|
|
+ print({
|
|
|
+ printable: "print_area15",
|
|
|
+ type: "html",
|
|
|
+ style: style, // 亦可使用引入的外部css;
|
|
|
+ scanStyles: false,
|
|
|
+ });
|
|
|
+ break;
|
|
|
}
|
|
|
},
|
|
|
cancel() {
|