|
|
@@ -82,7 +82,7 @@
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
- <el-col :span="8">
|
|
|
+ <el-col :span="8" v-if="dataShowcar == 1">
|
|
|
<el-form-item label="结算方式" prop="fStltypeid">
|
|
|
<el-select
|
|
|
v-model="form.fStltypeid"
|
|
|
@@ -100,6 +100,29 @@
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
+ <el-col :span="8" v-else>
|
|
|
+ <el-form-item label="作业类型" prop="fBusinessType">
|
|
|
+ <el-select
|
|
|
+ style="width: 80%"
|
|
|
+ v-model="form.fBusinessType"
|
|
|
+ filterable
|
|
|
+ @change="educationChange"
|
|
|
+ :disabled="
|
|
|
+ browseStatus ||
|
|
|
+ warehouseDrList.length > 0 ||
|
|
|
+ warehouseCrList.length > 0 ||
|
|
|
+ form.warehouseStatus > 3
|
|
|
+ "
|
|
|
+ >
|
|
|
+ <el-option
|
|
|
+ v-for="(item, index) in businessTypeOption"
|
|
|
+ :key="index.dictValue"
|
|
|
+ :label="item.dictLabel"
|
|
|
+ :value="item.dictValue"
|
|
|
+ ></el-option>
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
<el-col :span="8">
|
|
|
<el-form-item label="提单号" prop="fMblno">
|
|
|
<el-input
|
|
|
@@ -270,7 +293,25 @@
|
|
|
</el-row>
|
|
|
<div v-if="detailsHidden2">
|
|
|
<el-row>
|
|
|
- <el-col :span="8">
|
|
|
+ <el-col :span="8" v-if="dataShowcar == 0">
|
|
|
+ <el-form-item label="结算方式" prop="fStltypeid">
|
|
|
+ <el-select
|
|
|
+ v-model="form.fStltypeid"
|
|
|
+ placeholder="请选择结算方式"
|
|
|
+ clearable
|
|
|
+ :disabled="browseStatus || form.warehouseStatus > 3"
|
|
|
+ style="width: 80%"
|
|
|
+ >
|
|
|
+ <el-option
|
|
|
+ v-for="(item, index) in fStltypeOptions"
|
|
|
+ :key="index.dictValue"
|
|
|
+ :label="item.dictLabel"
|
|
|
+ :value="item.dictValue"
|
|
|
+ />
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="8" v-else>
|
|
|
<el-form-item label="作业类型" prop="fBusinessType">
|
|
|
<el-select
|
|
|
style="width: 80%"
|
|
|
@@ -786,7 +827,12 @@
|
|
|
>
|
|
|
</el-col>
|
|
|
<el-col style="display: flex; justify-content: flex-end">
|
|
|
- <el-button size="small" type="info" prop="打印" @click="printZyd"
|
|
|
+ <el-button
|
|
|
+ size="small"
|
|
|
+ type="info"
|
|
|
+ :disabled="browseStatus"
|
|
|
+ prop="打印"
|
|
|
+ @click="printZyd"
|
|
|
>作业单
|
|
|
</el-button>
|
|
|
<el-button
|
|
|
@@ -813,13 +859,13 @@
|
|
|
</el-button>
|
|
|
<el-dropdown-menu slot="dropdown">
|
|
|
<el-dropdown-item command="d">标准出库单</el-dropdown-item>
|
|
|
- <!-- <el-dropdown-item command="b">出库单</el-dropdown-item>-->
|
|
|
-<!-- <el-dropdown-item command="c">理货单</el-dropdown-item>-->
|
|
|
-<!-- <el-dropdown-item command="e">出库确认</el-dropdown-item>-->
|
|
|
-<!-- <el-dropdown-item command="e">劳务确认</el-dropdown-item>-->
|
|
|
- <el-dropdown-item command="f">叉车出库单</el-dropdown-item>
|
|
|
- <el-dropdown-item command="g">单车出库单</el-dropdown-item>
|
|
|
- <el-dropdown-item command="h">装车存档出库单</el-dropdown-item>
|
|
|
+ <el-dropdown-item command="b">出库单</el-dropdown-item>
|
|
|
+ <el-dropdown-item command="c">理货单</el-dropdown-item>
|
|
|
+ <el-dropdown-item command="e">出库确认</el-dropdown-item>
|
|
|
+ <el-dropdown-item command="e">劳务确认</el-dropdown-item>
|
|
|
+ <el-dropdown-item command="f">叉车出库单</el-dropdown-item>
|
|
|
+ <el-dropdown-item command="g">单车出库单</el-dropdown-item>
|
|
|
+ <el-dropdown-item command="h">装车存档出库单</el-dropdown-item>
|
|
|
</el-dropdown-menu>
|
|
|
</el-dropdown>
|
|
|
<div style="margin: 0 10px">
|
|
|
@@ -2063,12 +2109,7 @@
|
|
|
"
|
|
|
></div>
|
|
|
<div class="print_table" style="display: flex">
|
|
|
- <table
|
|
|
- border="0"
|
|
|
- cellspacing="0"
|
|
|
- cellpadding="0"
|
|
|
- style="width: 100%; line-height: 30px"
|
|
|
- >
|
|
|
+ <table border="0" cellspacing="0" cellpadding="0" style="width: 100%">
|
|
|
<tr>
|
|
|
<td>作业类型</td>
|
|
|
<td colspan="2">
|
|
|
@@ -2087,7 +2128,7 @@
|
|
|
</tr>
|
|
|
<tr v-for="(item, index) in Printinglist" :key="index">
|
|
|
<td>{{ item.fTruckno }}</td>
|
|
|
- <td>{{ item.fGoodsid | goodsFormat(goodsOptions) }}</td>
|
|
|
+ <td>{{ item.fGoodsids }}</td>
|
|
|
<td>{{ item.fMblno }}</td>
|
|
|
<td>
|
|
|
{{ item.fBusinessType | fStorageFormat }}/{{ item.fMarks }}
|
|
|
@@ -2132,6 +2173,7 @@
|
|
|
<el-button
|
|
|
type="primary"
|
|
|
size="mini"
|
|
|
+ :disabled="browseStatus"
|
|
|
@click="
|
|
|
print_zyd = false;
|
|
|
addprint('zyd');
|
|
|
@@ -2147,7 +2189,7 @@
|
|
|
:close-on-click-modal="false"
|
|
|
:modal="false"
|
|
|
>
|
|
|
- <div id="print_area2" class="print-div">
|
|
|
+ <div id="print_area1" class="print-div">
|
|
|
<div
|
|
|
class="print-title"
|
|
|
style="
|
|
|
@@ -2157,15 +2199,10 @@
|
|
|
margin-bottom: 5px;
|
|
|
"
|
|
|
>
|
|
|
- {{ company }}有限公司出库单
|
|
|
+ {{ company }}有限公司进仓单
|
|
|
</div>
|
|
|
<div class="print_table" style="display: flex">
|
|
|
- <table
|
|
|
- border="0"
|
|
|
- cellspacing="0"
|
|
|
- cellpadding="0"
|
|
|
- style="width: 100%; line-height: 30px"
|
|
|
- >
|
|
|
+ <table border="0" cellspacing="0" cellpadding="0" style="width: 100%">
|
|
|
<tr>
|
|
|
<td>客户</td>
|
|
|
<td>{{ form.fCorpidName }}</td>
|
|
|
@@ -2193,7 +2230,7 @@
|
|
|
</tr>
|
|
|
<tr v-for="(item, index) in Printinglist" :key="index">
|
|
|
<td>{{ item.fMblno }}</td>
|
|
|
- <td>{{ item.fGoodsid | goodsFormat(goodsOptions) }}</td>
|
|
|
+ <td>{{ item.fGoodsids }}</td>
|
|
|
<td>{{ item.fCntrtype }}</td>
|
|
|
<td>{{ item.fMarks }}</td>
|
|
|
<td>{{ item.fQty }}</td>
|
|
|
@@ -2202,16 +2239,16 @@
|
|
|
</tr>
|
|
|
<tr>
|
|
|
<td>序号</td>
|
|
|
- <td>出货日期</td>
|
|
|
+ <td>入货日期</td>
|
|
|
<td>箱量(20GP)</td>
|
|
|
<td>重量</td>
|
|
|
<td>件数</td>
|
|
|
- <td>出库重量</td>
|
|
|
- <td>出库件数</td>
|
|
|
+ <td>入库重量</td>
|
|
|
+ <td>入库件数</td>
|
|
|
</tr>
|
|
|
<tr v-for="(item, index) in Printinglist" :key="'info2-' + index">
|
|
|
<td>{{ index + 1 }}</td>
|
|
|
- <td>{{ item.fBsdate | fBsdateFormat }}</td>
|
|
|
+ <td>{{ item.fBsdate }}</td>
|
|
|
<td>{{ item.fCntqty }}</td>
|
|
|
<td v-if="item.fGrossweight">
|
|
|
{{ (item.fGrossweight / 1000).toFixed(2) }}
|
|
|
@@ -2259,9 +2296,10 @@
|
|
|
<span slot="footer" class="dialog-footer">
|
|
|
<el-button
|
|
|
type="primary"
|
|
|
+ :disabled="browseStatus"
|
|
|
@click="
|
|
|
print_rkd = false;
|
|
|
- addprint('rkd');
|
|
|
+ addprint();
|
|
|
"
|
|
|
>打印
|
|
|
</el-button>
|
|
|
@@ -2274,7 +2312,7 @@
|
|
|
:close-on-click-modal="false"
|
|
|
:modal="false"
|
|
|
>
|
|
|
- <div id="print_area3" class="print-div">
|
|
|
+ <div id="print_area1" class="print-div">
|
|
|
<div
|
|
|
class="print-title"
|
|
|
style="
|
|
|
@@ -2284,37 +2322,26 @@
|
|
|
margin-bottom: 5px;
|
|
|
"
|
|
|
>
|
|
|
- {{ company }}有限公司出库单
|
|
|
+ {{ company }}有限公司（出库单-标准）
|
|
|
</div>
|
|
|
<div class="print_table" style="display: flex">
|
|
|
- <table
|
|
|
- border="0"
|
|
|
- cellspacing="0"
|
|
|
- cellpadding="0"
|
|
|
- style="width: 100%; line-height: 30px"
|
|
|
- >
|
|
|
+ <table border="0" cellspacing="0" cellpadding="0" style="width: 100%">
|
|
|
<tr>
|
|
|
<td>公司名称</td>
|
|
|
- <td colspan="3">{{ form.fCorpidName }}</td>
|
|
|
- <td>出库日期</td>
|
|
|
- <td colspan="2" v-if="Printinglist.length">
|
|
|
- {{ Printinglist[0].fBsdate | fBsdateFormat }}{{ " " + ckTime }}
|
|
|
- </td>
|
|
|
- <td colspan="2" v-else></td>
|
|
|
+ <td colspan="4">{{ form.fCorpidName }}</td>
|
|
|
+ <td>{{ form.createTime | fBsdateFormat }}</td>
|
|
|
</tr>
|
|
|
<tr>
|
|
|
- <td style="width: 15%">货物名称</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.fGoodsid | goodsFormat(goodsOptions) }}</td>
|
|
|
+ <td>{{ item.fGoodsids }}</td>
|
|
|
<td>{{ item.fMblno }}</td>
|
|
|
- <td>{{ item.fCntrno }}</td>
|
|
|
<td>{{ item.fQty }}</td>
|
|
|
<td v-if="item.fGrossweight">
|
|
|
{{ (item.fGrossweight / 1000).toFixed(2) }}
|
|
|
@@ -2325,40 +2352,34 @@
|
|
|
</tr>
|
|
|
<tr>
|
|
|
<td>车号</td>
|
|
|
- <td colspan="2" v-if="Printinglist.length">
|
|
|
- {{ Printinglist[0].fTruckno }}
|
|
|
- </td>
|
|
|
- <td colspan="2" v-else></td>
|
|
|
+ <td v-if="Printinglist.length">{{ Printinglist[0].fTruckno }}</td>
|
|
|
+ <td v-else></td>
|
|
|
<td colspan="2">身份证号</td>
|
|
|
<td colspan="2"></td>
|
|
|
</tr>
|
|
|
<tr>
|
|
|
<td>地址</td>
|
|
|
- <td colspan="6">{{ stockaddr }}</td>
|
|
|
+ <td>{{ stockaddr }}</td>
|
|
|
+ <td>提货人</td>
|
|
|
+ <td></td>
|
|
|
+ <td>手机号</td>
|
|
|
+ <td></td>
|
|
|
</tr>
|
|
|
<tr>
|
|
|
- <td colspan="7">
|
|
|
+ <td colspan="6">
|
|
|
雨/雪天装货司机自愿装车，出现货物水湿与仓库无关！数量准确无误，货物包装完好！
|
|
|
</td>
|
|
|
</tr>
|
|
|
</table>
|
|
|
</div>
|
|
|
- <div
|
|
|
- style="display: flex; justify-content: space-between; font-size: 12px"
|
|
|
- >
|
|
|
- <div>操作：</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="
|
|
|
print_bzckd = false;
|
|
|
- addprint('bzckd');
|
|
|
+ addprint();
|
|
|
"
|
|
|
>打印
|
|
|
</el-button>
|
|
|
@@ -2371,7 +2392,7 @@
|
|
|
:close-on-click-modal="false"
|
|
|
:modal="false"
|
|
|
>
|
|
|
- <div id="print_area5" class="print-div">
|
|
|
+ <div id="print_area1" class="print-div">
|
|
|
<div
|
|
|
class="print-title"
|
|
|
style="
|
|
|
@@ -2421,12 +2442,7 @@
|
|
|
</div>
|
|
|
</div>
|
|
|
<div class="print_table" style="display: flex">
|
|
|
- <table
|
|
|
- border="0"
|
|
|
- cellspacing="0"
|
|
|
- cellpadding="0"
|
|
|
- style="width: 100%; line-height: 30px"
|
|
|
- >
|
|
|
+ <table border="0" cellspacing="0" cellpadding="0" style="width: 100%">
|
|
|
<tr>
|
|
|
<td>箱号</td>
|
|
|
<td>铅封号</td>
|
|
|
@@ -2472,8 +2488,9 @@
|
|
|
<span slot="footer" class="dialog-footer">
|
|
|
<el-button
|
|
|
type="primary"
|
|
|
+ :disabled="browseStatus"
|
|
|
@click="
|
|
|
- addprint('lhd');
|
|
|
+ addprint();
|
|
|
print_lhd = false;
|
|
|
"
|
|
|
>打印
|
|
|
@@ -2487,7 +2504,7 @@
|
|
|
:close-on-click-modal="false"
|
|
|
:modal="false"
|
|
|
>
|
|
|
- <div id="print_area10" class="print-div">
|
|
|
+ <div id="print_area1" class="print-div">
|
|
|
<div
|
|
|
class="print-title"
|
|
|
style="
|
|
|
@@ -2516,12 +2533,7 @@
|
|
|
</div>
|
|
|
</div>
|
|
|
<div class="print_table" style="display: flex">
|
|
|
- <table
|
|
|
- border="0"
|
|
|
- cellspacing="0"
|
|
|
- cellpadding="0"
|
|
|
- style="width: 100%; line-height: 30px"
|
|
|
- >
|
|
|
+ <table border="0" cellspacing="0" cellpadding="0" style="width: 100%">
|
|
|
<tr>
|
|
|
<td>品名</td>
|
|
|
<td colspan="3">{{ form.fProductName }}</td>
|
|
|
@@ -2566,8 +2578,9 @@
|
|
|
<span slot="footer" class="dialog-footer">
|
|
|
<el-button
|
|
|
type="primary"
|
|
|
+ :disabled="browseStatus"
|
|
|
@click="
|
|
|
- addprint('lwqr');
|
|
|
+ addprint();
|
|
|
print_lwqr = false;
|
|
|
"
|
|
|
>打印
|
|
|
@@ -2594,28 +2607,24 @@
|
|
|
{{ company }}有限公司
|
|
|
</div>
|
|
|
|
|
|
- <div
|
|
|
- style="
|
|
|
+ <div
|
|
|
+ style="
|
|
|
display: flex;
|
|
|
justify-content: center;
|
|
|
margin-left: 350px;
|
|
|
margin-bottom: 5px;
|
|
|
"
|
|
|
- >
|
|
|
- <div style="font-size: 18px">出 库 单</div>
|
|
|
- <div style="margin-left: 200px">
|
|
|
- <div style="margin-bottom: 5px">{{ form.fBillno }}</div>
|
|
|
- <div>存放地点：{{ stockName }}</div>
|
|
|
+ >
|
|
|
+ <div style="font-size: 18px;">出 库 单</div>
|
|
|
+ <div style="margin-left: 200px">
|
|
|
+ <div style="margin-bottom: 5px;">{{form.fBillno}}</div>
|
|
|
+ <div>存放地点：{{stockName}}</div>
|
|
|
+ </div>
|
|
|
+
|
|
|
</div>
|
|
|
- </div>
|
|
|
|
|
|
<div class="print_table" style="display: flex">
|
|
|
- <table
|
|
|
- border="0"
|
|
|
- cellspacing="0"
|
|
|
- cellpadding="0"
|
|
|
- style="width: 100%; line-height: 30px"
|
|
|
- >
|
|
|
+ <table border="0" cellspacing="0" cellpadding="0" style="width: 100%">
|
|
|
<tr>
|
|
|
<td>品名</td>
|
|
|
<td colspan="2">{{ form.fProductName }}</td>
|
|
|
@@ -2626,7 +2635,7 @@
|
|
|
<td>提单号</td>
|
|
|
<td colspan="2">{{ form.fMblno }}</td>
|
|
|
<td>出库日期</td>
|
|
|
- <td colspan="3">{{ fBsdate }}</td>
|
|
|
+ <td colspan="3">{{ fBsdate}} {{timeOut}}</td>
|
|
|
</tr>
|
|
|
<tr>
|
|
|
<td>原入库箱号</td>
|
|
|
@@ -2634,22 +2643,22 @@
|
|
|
<td>铅封号</td>
|
|
|
<td>垛位</td>
|
|
|
<td>件数</td>
|
|
|
- <td>净重</td>
|
|
|
+ <td>净重(吨)</td>
|
|
|
<td>备注</td>
|
|
|
</tr>
|
|
|
<tr v-for="(item, index) in Printinglist" :key="index">
|
|
|
<td>{{ item.fCntrno }}</td>
|
|
|
<td>{{ item.fTruckno }}</td>
|
|
|
- <td>{{ item.fSealno }}</td>
|
|
|
+ <td>{{item.fSealno}}</td>
|
|
|
<td>{{ item.fWarehouseInformation }}</td>
|
|
|
<td>{{ item.fQty }}</td>
|
|
|
- <td>{{ item.fNetweight }}</td>
|
|
|
+ <td>{{(item.fNetweight/1000).toFixed(2)}}</td>
|
|
|
<td>{{ item.remark }}</td>
|
|
|
</tr>
|
|
|
<tr>
|
|
|
<td colspan="4">合计：</td>
|
|
|
- <td>{{ allfQty }}</td>
|
|
|
- <td>{{ allfNetweight }}</td>
|
|
|
+ <td>{{allfQty}}</td>
|
|
|
+ <td>{{(allfNetweight/1000).toFixed(2)}}</td>
|
|
|
<td></td>
|
|
|
</tr>
|
|
|
</table>
|
|
|
@@ -2672,11 +2681,12 @@
|
|
|
<span slot="footer" class="dialog-footer">
|
|
|
<el-button
|
|
|
type="primary"
|
|
|
+ :disabled="browseStatus"
|
|
|
@click="
|
|
|
addprint('ccckd');
|
|
|
print_ccckd = false;
|
|
|
"
|
|
|
- >打印
|
|
|
+ >打印
|
|
|
</el-button>
|
|
|
<el-button @click="print_ccckd = false">取消 </el-button>
|
|
|
</span>
|
|
|
@@ -2708,22 +2718,20 @@
|
|
|
margin-bottom: 5px;
|
|
|
"
|
|
|
>
|
|
|
- <div style="font-size: 18px">出 库 单</div>
|
|
|
- <div style="margin-left: 200px">
|
|
|
- <div style="margin-bottom: 5px">{{ form.fBillno }}</div>
|
|
|
+ <div style="font-size: 18px;">出 库 单</div>
|
|
|
+ <div style="margin-left: 200px">
|
|
|
+ <div style="margin-bottom: 5px;">{{form.fBillno}}</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
- <div style="display: flex; margin-bottom: 5px">
|
|
|
- <div style="width: 50%">客户名称：{{ form.fCorpidName }}</div>
|
|
|
- <div style="margin-left: 250px">存放地点：{{ stockName }}</div>
|
|
|
+ <div style="
|
|
|
+ display: flex;
|
|
|
+ margin-bottom: 5px;
|
|
|
+ ">
|
|
|
+ <div style="width: 50%">客户名称：{{form.fCorpidName}}</div>
|
|
|
+ <div style="margin-left: 250px">存放地点：{{stockName}}</div>
|
|
|
</div>
|
|
|
<div class="print_table" style="display: flex">
|
|
|
- <table
|
|
|
- border="0"
|
|
|
- cellspacing="0"
|
|
|
- cellpadding="0"
|
|
|
- style="width: 100%; line-height: 30px"
|
|
|
- >
|
|
|
+ <table border="0" cellspacing="0" cellpadding="0" style="width: 100%">
|
|
|
<tr>
|
|
|
<td>品名</td>
|
|
|
<td colspan="2">{{ form.fProductName }}</td>
|
|
|
@@ -2734,7 +2742,7 @@
|
|
|
<td>提单号</td>
|
|
|
<td colspan="2">{{ form.fMblno }}</td>
|
|
|
<td>出库日期</td>
|
|
|
- <td colspan="3">{{ fBsdate }}</td>
|
|
|
+ <td colspan="3">{{ fBsdate}} {{timeOut}}</td>
|
|
|
</tr>
|
|
|
<tr>
|
|
|
<td>原入库箱号</td>
|
|
|
@@ -2742,22 +2750,22 @@
|
|
|
<td>铅封号</td>
|
|
|
<td>垛位</td>
|
|
|
<td>件数</td>
|
|
|
- <td>净重</td>
|
|
|
+ <td>净重(吨)</td>
|
|
|
<td>备注</td>
|
|
|
</tr>
|
|
|
<tr v-for="(item, index) in Printinglist" :key="index">
|
|
|
<td>{{ item.fCntrno }}</td>
|
|
|
<td>{{ item.fTruckno }}</td>
|
|
|
- <td>{{ item.fSealno }}</td>
|
|
|
+ <td>{{item.fSealno}}</td>
|
|
|
<td>{{ item.fWarehouseInformation }}</td>
|
|
|
<td>{{ item.fQty }}</td>
|
|
|
- <td>{{ item.fNetweight }}</td>
|
|
|
+ <td>{{(item.fNetweight/1000).toFixed(2)}}</td>
|
|
|
<td>{{ item.remark }}</td>
|
|
|
</tr>
|
|
|
<tr>
|
|
|
<td colspan="4">合计：</td>
|
|
|
- <td>{{ allfQty }}</td>
|
|
|
- <td>{{ allfNetweight }}</td>
|
|
|
+ <td>{{allfQty}}</td>
|
|
|
+ <td>{{(allfNetweight/1000).toFixed(2)}}</td>
|
|
|
<td></td>
|
|
|
</tr>
|
|
|
</table>
|
|
|
@@ -2771,11 +2779,12 @@
|
|
|
<span slot="footer" class="dialog-footer">
|
|
|
<el-button
|
|
|
type="primary"
|
|
|
+ :disabled="browseStatus"
|
|
|
@click="
|
|
|
addprint('dcckd');
|
|
|
print_dcckd = false;
|
|
|
"
|
|
|
- >打印
|
|
|
+ >打印
|
|
|
</el-button>
|
|
|
<el-button @click="print_dcckd = false">取消 </el-button>
|
|
|
</span>
|
|
|
@@ -2807,22 +2816,20 @@
|
|
|
margin-bottom: 5px;
|
|
|
"
|
|
|
>
|
|
|
- <div style="font-size: 18px">出 库 单</div>
|
|
|
- <div style="margin-left: 200px">
|
|
|
- <div style="margin-bottom: 5px">{{ form.fBillno }}</div>
|
|
|
+ <div style="font-size: 18px;">出 库 单</div>
|
|
|
+ <div style="margin-left: 200px">
|
|
|
+ <div style="margin-bottom: 5px;">{{form.fBillno}}</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
- <div style="display: flex; margin-bottom: 5px">
|
|
|
- <div style="width: 50%">客户名称：{{ form.fCorpidName }}</div>
|
|
|
- <div style="margin-left: 250px">存放地点：{{ stockName }}</div>
|
|
|
+ <div style="
|
|
|
+ display: flex;
|
|
|
+ margin-bottom: 5px;
|
|
|
+ ">
|
|
|
+ <div style="width: 50%">客户名称：{{form.fCorpidName}}</div>
|
|
|
+ <div style="margin-left: 250px">存放地点：{{stockName}}</div>
|
|
|
</div>
|
|
|
<div class="print_table" style="display: flex">
|
|
|
- <table
|
|
|
- border="0"
|
|
|
- cellspacing="0"
|
|
|
- cellpadding="0"
|
|
|
- style="width: 100%; line-height: 30px"
|
|
|
- >
|
|
|
+ <table border="0" cellspacing="0" cellpadding="0" style="width: 100%">
|
|
|
<tr>
|
|
|
<td>品名</td>
|
|
|
<td colspan="3">{{ form.fProductName }}</td>
|
|
|
@@ -2833,14 +2840,14 @@
|
|
|
<td>提单号</td>
|
|
|
<td colspan="3">{{ form.fMblno }}</td>
|
|
|
<td colspan="2">出库日期</td>
|
|
|
- <td colspan="3">{{ fBsdate }}</td>
|
|
|
+ <td colspan="3">{{ fBsdate}} {{timeOut}}</td>
|
|
|
</tr>
|
|
|
<tr>
|
|
|
<td>原入库箱号</td>
|
|
|
<td>出库车号</td>
|
|
|
<td>垛位</td>
|
|
|
<td>件数</td>
|
|
|
- <td>净重</td>
|
|
|
+ <td>净重(吨)</td>
|
|
|
<td>提货人签字手印</td>
|
|
|
<td>提货人电话</td>
|
|
|
<td>所收费用</td>
|
|
|
@@ -2851,7 +2858,7 @@
|
|
|
<td>{{ item.fTruckno }}</td>
|
|
|
<td>{{ item.fWarehouseInformation }}</td>
|
|
|
<td>{{ item.fQty }}</td>
|
|
|
- <td>{{ item.fNetweight }}</td>
|
|
|
+ <td>{{(item.fNetweight/1000).toFixed(2)}}</td>
|
|
|
<td></td>
|
|
|
<td></td>
|
|
|
<td></td>
|
|
|
@@ -2859,8 +2866,8 @@
|
|
|
</tr>
|
|
|
<tr>
|
|
|
<td colspan="3">合计：</td>
|
|
|
- <td>{{ allfQty }}</td>
|
|
|
- <td>{{ allfNetweight }}</td>
|
|
|
+ <td>{{allfQty}}</td>
|
|
|
+ <td>{{(allfNetweight/1000).toFixed(2)}}</td>
|
|
|
<td></td>
|
|
|
<td></td>
|
|
|
<td></td>
|
|
|
@@ -2886,11 +2893,12 @@
|
|
|
<span slot="footer" class="dialog-footer">
|
|
|
<el-button
|
|
|
type="primary"
|
|
|
+ :disabled="browseStatus"
|
|
|
@click="
|
|
|
addprint('zccdckd');
|
|
|
print_zccdckd = false;
|
|
|
"
|
|
|
- >打印
|
|
|
+ >打印
|
|
|
</el-button>
|
|
|
<el-button @click="print_zccdckd = false">取消 </el-button>
|
|
|
</span>
|
|
|
@@ -3031,14 +3039,26 @@
|
|
|
@click="addOrUpdateHand(form, 'f_billstatus')"
|
|
|
>审批</el-button
|
|
|
>
|
|
|
- <el-button type="success" prop="打印" @click="print_shd = true"
|
|
|
+ <el-button
|
|
|
+ :disabled="browseStatus"
|
|
|
+ type="success"
|
|
|
+ prop="打印"
|
|
|
+ @click="print_shd = true"
|
|
|
>收货单
|
|
|
</el-button>
|
|
|
- <el-button type="warning" prop="打印" @click="print_rkd = true"
|
|
|
+ <el-button
|
|
|
+ :disabled="browseStatus"
|
|
|
+ type="warning"
|
|
|
+ prop="打印"
|
|
|
+ @click="print_rkd = true"
|
|
|
>出库单
|
|
|
</el-button>
|
|
|
<el-button @click="discharge" :disabled="browseStatus">卸货</el-button>
|
|
|
- <el-button type="info" prop="打印" @click="print_zyd = true"
|
|
|
+ <el-button
|
|
|
+ type="info"
|
|
|
+ :disabled="browseStatus"
|
|
|
+ prop="打印"
|
|
|
+ @click="print_zyd = true"
|
|
|
>作业单
|
|
|
</el-button>
|
|
|
<el-button :disabled="browseStatus" type="primary" @click="saveForm()"
|
|
|
@@ -3132,6 +3152,8 @@ export default {
|
|
|
},
|
|
|
data() {
|
|
|
return {
|
|
|
+ timeOut:'',
|
|
|
+ allfPlanqty: 0,
|
|
|
pageNum: 1,
|
|
|
pageSize: 10,
|
|
|
dialogWhgenlegList: [],
|
|
|
@@ -3574,8 +3596,6 @@ export default {
|
|
|
tfNetweightnum: 0,
|
|
|
tfGrossweightnum: 0,
|
|
|
showApproval: null,
|
|
|
- allfPlanqty: 0,
|
|
|
- ckTime: null,
|
|
|
};
|
|
|
},
|
|
|
created() {
|
|
|
@@ -5281,11 +5301,6 @@ export default {
|
|
|
},
|
|
|
handleCommand(command) {
|
|
|
if (this.Printinglist.length > 0) {
|
|
|
- for (let item in this.Printinglist) {
|
|
|
- if (!this.Printinglist[item].fId) {
|
|
|
- return this.$message.error("请先保存!");
|
|
|
- }
|
|
|
- }
|
|
|
this.$refs["form"].validate((valid) => {
|
|
|
if (valid) {
|
|
|
for (let corp in this.fMblnoOptions) {
|
|
|
@@ -5303,15 +5318,18 @@ export default {
|
|
|
this.stockaddr = e.fAddr;
|
|
|
}
|
|
|
});
|
|
|
+ //获取当前时间
|
|
|
+ let now= new Date()
|
|
|
+ let _hour = ( 10 > now.getHours() ) ? '0' + now.getHours() : now.getHours();
|
|
|
+ let _minute = ( 10 > now.getMinutes() ) ? '0' + now.getMinutes() : now.getMinutes();
|
|
|
+ this.timeOut = _hour + ':' + _minute
|
|
|
+ console.log(this.data)
|
|
|
this.fDriverTel = this.Printinglist[0].fDriverTel;
|
|
|
- let date = new Date(this.Printinglist[0].fBsdate);
|
|
|
- let Y = date.getFullYear();
|
|
|
- let M =
|
|
|
- date.getMonth() + 1 < 10
|
|
|
- ? "0" + (date.getMonth() + 1)
|
|
|
- : date.getMonth() + 1;
|
|
|
- let D = date.getDate()<10?"0"+date.getDate():date.getDate();
|
|
|
- this.fBsdate = Y + "-" + M + "-" + D;
|
|
|
+ let date = new Date(this.Printinglist[0].fBsdate)
|
|
|
+ let Y = date.getFullYear()
|
|
|
+ let M = (date.getMonth() +1 <10 ?'0' + (date.getMonth() +1) : date.getMonth() +1)
|
|
|
+ let D = date.getDate()
|
|
|
+ this.fBsdate = Y + '-' + M + '-' + D
|
|
|
// this.fBsdate = this.Printinglist[0].fBsdate;
|
|
|
this.fTruckno = this.Printinglist[0].fTruckno;
|
|
|
this.allfCntqty = 0;
|
|
|
@@ -5343,23 +5361,15 @@ export default {
|
|
|
} else if (command == "c") {
|
|
|
this.print_lhd = true;
|
|
|
} else if (command == "d") {
|
|
|
- let date = new Date();
|
|
|
- let hours =
|
|
|
- date.getHours() < 10 ? "0" + date.getHours() : date.getHours();
|
|
|
- let minutes =
|
|
|
- date.getMinutes() < 10
|
|
|
- ? "0" + date.getMinutes()
|
|
|
- : date.getMinutes();
|
|
|
- this.ckTime = hours + ":" + minutes;
|
|
|
this.print_bzckd = true;
|
|
|
} else if (command == "e") {
|
|
|
this.print_lwqr = true;
|
|
|
- } else if (command == "f") {
|
|
|
- this.print_ccckd = true;
|
|
|
- } else if (command == "g") {
|
|
|
- this.print_dcckd = true;
|
|
|
- } else if (command == "h") {
|
|
|
- this.print_zccdckd = true;
|
|
|
+ } else if(command == "f"){
|
|
|
+ this.print_ccckd = true
|
|
|
+ } else if (command == "g"){
|
|
|
+ this.print_dcckd = true
|
|
|
+ } else if(command == "h"){
|
|
|
+ this.print_zccdckd = true
|
|
|
}
|
|
|
}
|
|
|
});
|
|
|
@@ -5620,93 +5630,93 @@ export default {
|
|
|
//打印
|
|
|
addprint(status) {
|
|
|
// if (status == "zyd") {
|
|
|
- // if (this.CntrTable.length > 0) {
|
|
|
- // let arr = [];
|
|
|
- // this.CntrTable.map((e) => {
|
|
|
- // this.cntrList.map((item) => {
|
|
|
- // if (item.fId == e.fCntrid) {
|
|
|
- // arr.push(item.fName + "X" + e.fCntrcount);
|
|
|
- // }
|
|
|
- // });
|
|
|
- // });
|
|
|
- // arr = [...new Set(arr)];
|
|
|
- // this.form.fCntval = arr.join(",");
|
|
|
- // } else {
|
|
|
- // this.form.fCntval = null;
|
|
|
- // }
|
|
|
- // if (this.detailList.length > 0) {
|
|
|
- // let arr = [];
|
|
|
- // this.detailList.map((e) => {
|
|
|
- // this.goodsOptions.map((item) => {
|
|
|
- // if (e.fGoodsid == item.fId) {
|
|
|
- // arr.push(item.fName);
|
|
|
- // }
|
|
|
- // });
|
|
|
- // });
|
|
|
- // arr = [...new Set(arr)];
|
|
|
- // this.form.fProductName = arr.join(",");
|
|
|
- // } else {
|
|
|
- // this.form.fProductName = "";
|
|
|
- // }
|
|
|
- // if (this.detailList.length > 0) {
|
|
|
- // let arr = [];
|
|
|
- // this.detailList.map((e) => {
|
|
|
- // arr.push(e.fMarks);
|
|
|
- // });
|
|
|
- // arr = [...new Set(arr)];
|
|
|
- // this.form.fMarks = arr.join(",");
|
|
|
- // } else {
|
|
|
- // this.form.fMarks = "";
|
|
|
- // }
|
|
|
- // this.form.fBillingway = this.form.fFeetUnit;
|
|
|
- // if (this.detailList.length == 0) {
|
|
|
- // this.form.fNetweight = 0;
|
|
|
- // this.form.fPlanvolumn = 0;
|
|
|
- // this.form.fGrossweight = 0;
|
|
|
- // } else {
|
|
|
- // this.form.fNetweight = this.fNetweight;
|
|
|
- // this.form.fPlanvolumn = this.fPlanvolumn;
|
|
|
- // this.form.fGrossweight = this.fGrossweight;
|
|
|
- // }
|
|
|
- // let formData = new window.FormData();
|
|
|
- // formData.append("warehouseBills", JSON.stringify(this.form));
|
|
|
- // formData.append(
|
|
|
- // "warehousebillsitems",
|
|
|
- // JSON.stringify(this.Printinglist)
|
|
|
- // );
|
|
|
- // formData.append(
|
|
|
- // "warehousebillsfeesDr",
|
|
|
- // JSON.stringify(this.warehouseDrList)
|
|
|
- // );
|
|
|
- // formData.append(
|
|
|
- // "warehousebillsfeesCr",
|
|
|
- // JSON.stringify(this.warehouseCrList)
|
|
|
- // );
|
|
|
- // formData.append("tEnclosure", JSON.stringify(this.relevantAttachments));
|
|
|
- // formData.append("tCntr", JSON.stringify(this.CntrTable));
|
|
|
- // addJoblist(formData).then((response) => {
|
|
|
- // if (response.code == 200) {
|
|
|
- // this.detailList.map((e, index) => {
|
|
|
- // response.data.warehousebillsitems.map((item) => {
|
|
|
- // item.fBsdate = Date.parse(new Date(item.fBsdate));
|
|
|
- // if (item.fBusinessType) {
|
|
|
- // item.fBusinessType = item.fBusinessType.toString();
|
|
|
- // }
|
|
|
- // if (e.fId == item.fId) {
|
|
|
- // this.$set(this.detailList, index, item);
|
|
|
- // }
|
|
|
- // });
|
|
|
- // });
|
|
|
- // this.$set(this.form, "fItemsStatus", 2);
|
|
|
- // }
|
|
|
- // });
|
|
|
+ // if (this.CntrTable.length > 0) {
|
|
|
+ // let arr = [];
|
|
|
+ // this.CntrTable.map((e) => {
|
|
|
+ // this.cntrList.map((item) => {
|
|
|
+ // if (item.fId == e.fCntrid) {
|
|
|
+ // arr.push(item.fName + "X" + e.fCntrcount);
|
|
|
+ // }
|
|
|
+ // });
|
|
|
+ // });
|
|
|
+ // arr = [...new Set(arr)];
|
|
|
+ // this.form.fCntval = arr.join(",");
|
|
|
+ // } else {
|
|
|
+ // this.form.fCntval = null;
|
|
|
+ // }
|
|
|
+ // if (this.detailList.length > 0) {
|
|
|
+ // let arr = [];
|
|
|
+ // this.detailList.map((e) => {
|
|
|
+ // this.goodsOptions.map((item) => {
|
|
|
+ // if (e.fGoodsid == item.fId) {
|
|
|
+ // arr.push(item.fName);
|
|
|
+ // }
|
|
|
+ // });
|
|
|
+ // });
|
|
|
+ // arr = [...new Set(arr)];
|
|
|
+ // this.form.fProductName = arr.join(",");
|
|
|
+ // } else {
|
|
|
+ // this.form.fProductName = "";
|
|
|
+ // }
|
|
|
+ // if (this.detailList.length > 0) {
|
|
|
+ // let arr = [];
|
|
|
+ // this.detailList.map((e) => {
|
|
|
+ // arr.push(e.fMarks);
|
|
|
+ // });
|
|
|
+ // arr = [...new Set(arr)];
|
|
|
+ // this.form.fMarks = arr.join(",");
|
|
|
+ // } else {
|
|
|
+ // this.form.fMarks = "";
|
|
|
+ // }
|
|
|
+ // this.form.fBillingway = this.form.fFeetUnit;
|
|
|
+ // if (this.detailList.length == 0) {
|
|
|
+ // this.form.fNetweight = 0;
|
|
|
+ // this.form.fPlanvolumn = 0;
|
|
|
+ // this.form.fGrossweight = 0;
|
|
|
+ // } else {
|
|
|
+ // this.form.fNetweight = this.fNetweight;
|
|
|
+ // this.form.fPlanvolumn = this.fPlanvolumn;
|
|
|
+ // this.form.fGrossweight = this.fGrossweight;
|
|
|
+ // }
|
|
|
+ // let formData = new window.FormData();
|
|
|
+ // formData.append("warehouseBills", JSON.stringify(this.form));
|
|
|
+ // formData.append(
|
|
|
+ // "warehousebillsitems",
|
|
|
+ // JSON.stringify(this.Printinglist)
|
|
|
+ // );
|
|
|
+ // formData.append(
|
|
|
+ // "warehousebillsfeesDr",
|
|
|
+ // JSON.stringify(this.warehouseDrList)
|
|
|
+ // );
|
|
|
+ // formData.append(
|
|
|
+ // "warehousebillsfeesCr",
|
|
|
+ // JSON.stringify(this.warehouseCrList)
|
|
|
+ // );
|
|
|
+ // formData.append("tEnclosure", JSON.stringify(this.relevantAttachments));
|
|
|
+ // formData.append("tCntr", JSON.stringify(this.CntrTable));
|
|
|
+ // addJoblist(formData).then((response) => {
|
|
|
+ // if (response.code == 200) {
|
|
|
+ // this.detailList.map((e, index) => {
|
|
|
+ // response.data.warehousebillsitems.map((item) => {
|
|
|
+ // item.fBsdate = Date.parse(new Date(item.fBsdate));
|
|
|
+ // if (item.fBusinessType) {
|
|
|
+ // item.fBusinessType = item.fBusinessType.toString();
|
|
|
+ // }
|
|
|
+ // if (e.fId == item.fId) {
|
|
|
+ // this.$set(this.detailList, index, item);
|
|
|
+ // }
|
|
|
+ // });
|
|
|
+ // });
|
|
|
+ // this.$set(this.form, "fItemsStatus", 2);
|
|
|
+ // }
|
|
|
+ // });
|
|
|
// }
|
|
|
const style =
|
|
|
"@page { } " +
|
|
|
"@media print { .print-div{ padding:8px;background-color:#cccccc;} .print-title{display:flex;justify-content: center;font-size:24px} .print_form{font-size:12px} .print_table table {border-right: 1px solid #000;border-bottom: 1px solid #000;font-size:12px} .print_table table td {border-left: 1px solid #000;border-top: 1px solid #000;padding:2px;vertical-align:middle;text-align: center;}";
|
|
|
|
|
|
- switch (status) {
|
|
|
- case "zyd":
|
|
|
+ switch (status){
|
|
|
+ case 'zyd':
|
|
|
if (this.CntrTable.length > 0) {
|
|
|
let arr = [];
|
|
|
this.CntrTable.map((e) => {
|
|
|
@@ -5769,10 +5779,7 @@ export default {
|
|
|
"warehousebillsfeesCr",
|
|
|
JSON.stringify(this.warehouseCrList)
|
|
|
);
|
|
|
- formData.append(
|
|
|
- "tEnclosure",
|
|
|
- JSON.stringify(this.relevantAttachments)
|
|
|
- );
|
|
|
+ formData.append("tEnclosure", JSON.stringify(this.relevantAttachments));
|
|
|
formData.append("tCntr", JSON.stringify(this.CntrTable));
|
|
|
addJoblist(formData).then((response) => {
|
|
|
if (response.code == 200) {
|
|
|
@@ -5790,61 +5797,38 @@ export default {
|
|
|
this.$set(this.form, "fItemsStatus", 2);
|
|
|
}
|
|
|
});
|
|
|
+ break
|
|
|
+ case 'ccckd':
|
|
|
print({
|
|
|
- printable: "print_area1",
|
|
|
- type: "html",
|
|
|
- style: style, // 亦可使用引入的外部css;
|
|
|
- scanStyles: false,
|
|
|
- });
|
|
|
- break;
|
|
|
- case "rkd":
|
|
|
- print({
|
|
|
- printable: "print_area2",
|
|
|
- type: "html",
|
|
|
- style: style, // 亦可使用引入的外部css;
|
|
|
- scanStyles: false,
|
|
|
- });
|
|
|
- break;
|
|
|
- case "bzckd":
|
|
|
- print({
|
|
|
- printable: "print_area3",
|
|
|
+ printable: "print_area6",
|
|
|
type: "html",
|
|
|
style: style, // 亦可使用引入的外部css;
|
|
|
scanStyles: false,
|
|
|
});
|
|
|
- break;
|
|
|
- case "lhd":
|
|
|
- print({
|
|
|
- printable: "print_area5",
|
|
|
- type: "html",
|
|
|
- style: style, // 亦可使用引入的外部css;
|
|
|
- scanStyles: false,
|
|
|
- });
|
|
|
- break;
|
|
|
- case "dcckd":
|
|
|
+ break
|
|
|
+ case 'dcckd':
|
|
|
print({
|
|
|
printable: "print_area7",
|
|
|
type: "html",
|
|
|
style: style, // 亦可使用引入的外部css;
|
|
|
scanStyles: false,
|
|
|
});
|
|
|
- break;
|
|
|
- case "zccdckd":
|
|
|
+ break
|
|
|
+ case 'zccdckd':
|
|
|
print({
|
|
|
printable: "print_area8",
|
|
|
type: "html",
|
|
|
style: style, // 亦可使用引入的外部css;
|
|
|
scanStyles: false,
|
|
|
});
|
|
|
- break;
|
|
|
- case "lwqr":
|
|
|
- print({
|
|
|
- printable: "print_area10",
|
|
|
- type: "html",
|
|
|
- style: style, // 亦可使用引入的外部css;
|
|
|
- scanStyles: false,
|
|
|
- });
|
|
|
- break;
|
|
|
+ break
|
|
|
+ default:
|
|
|
+ print({
|
|
|
+ printable: "print_area1",
|
|
|
+ type: "html",
|
|
|
+ style: style, // 亦可使用引入的外部css;
|
|
|
+ scanStyles: false,
|
|
|
+ });
|
|
|
}
|
|
|
},
|
|
|
cancel() {
|
wengyuwen