|
|
@@ -84,7 +84,7 @@
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
- <el-col :span="8" v-if="dataShowcar == '1'">
|
|
|
+ <el-col :span="8">
|
|
|
<el-form-item label="计费单位" prop="fFeetUnit">
|
|
|
<el-select
|
|
|
v-model="form.fFeetUnit"
|
|
|
@@ -102,29 +102,6 @@
|
|
|
</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
|
|
|
@@ -340,25 +317,7 @@
|
|
|
</el-row>
|
|
|
<div v-if="detailsHidden2">
|
|
|
<el-row>
|
|
|
- <el-col :span="8" v-if="dataShowcar == '0'">
|
|
|
- <el-form-item label="计费单位" prop="fFeetUnit">
|
|
|
- <el-select
|
|
|
- v-model="form.fFeetUnit"
|
|
|
- placeholder="请选择计费单位"
|
|
|
- clearable
|
|
|
- :disabled="browseStatus || form.warehouseStatus > 3"
|
|
|
- style="width: 80%"
|
|
|
- >
|
|
|
- <el-option
|
|
|
- v-for="(item, index) in fFeetUnitOptions"
|
|
|
- :key="index.dictValue"
|
|
|
- :label="item.dictLabel"
|
|
|
- :value="item.dictValue"
|
|
|
- />
|
|
|
- </el-select>
|
|
|
- </el-form-item>
|
|
|
- </el-col>
|
|
|
- <el-col :span="8" v-else>
|
|
|
+ <el-col :span="8">
|
|
|
<el-form-item label="作业类型" prop="fBusinessType">
|
|
|
<el-select
|
|
|
style="width: 80%"
|
|
|
@@ -1138,19 +1097,15 @@
|
|
|
@click="addRelevant('copy')"
|
|
|
>复制录入</el-button
|
|
|
>
|
|
|
- <el-button
|
|
|
- :disabled="browseStatus"
|
|
|
- type="primary"
|
|
|
- size="small"
|
|
|
- @click="tishi"
|
|
|
- >导入模板</el-button
|
|
|
+ <el-button :disabled="browseStatus" type="primary" size="small"
|
|
|
+ >下载模板</el-button
|
|
|
>
|
|
|
<el-button
|
|
|
:disabled="browseStatus"
|
|
|
type="primary"
|
|
|
size="small"
|
|
|
@click="tishi"
|
|
|
- >导入接口</el-button
|
|
|
+ >导入Excel</el-button
|
|
|
>
|
|
|
</el-col>
|
|
|
<el-col style="display: flex; justify-content: flex-end">
|
|
|
@@ -1924,7 +1879,7 @@
|
|
|
</tr>
|
|
|
<tr>
|
|
|
<td>序号</td>
|
|
|
- <td>入货日期</td>
|
|
|
+ <td>出库日期</td>
|
|
|
<td>箱量(20GP)</td>
|
|
|
<td>重量</td>
|
|
|
<td>件数</td>
|
|
|
@@ -2007,7 +1962,7 @@
|
|
|
margin-bottom: 5px;
|
|
|
"
|
|
|
>
|
|
|
- {{ company }}有限公司（入库单-标准）
|
|
|
+ {{ company }}有限公司（入库单）
|
|
|
</div>
|
|
|
<div class="print_table" style="display: flex">
|
|
|
<table border="0" cellspacing="0" cellpadding="0" style="width: 100%">
|
|
|
@@ -2015,23 +1970,19 @@
|
|
|
<td>客户名称</td>
|
|
|
<td>{{ form.fCorpidName }}</td>
|
|
|
<td>入库日期</td>
|
|
|
- <td>{{ form.fBsdate | fBsdateFormat }}</td>
|
|
|
+ <td colspan="2">{{ form.fBsdate | fBsdateFormat }}</td>
|
|
|
<td>流水号</td>
|
|
|
<td colspan="2">{{ form.fBillno }}</td>
|
|
|
</tr>
|
|
|
<tr>
|
|
|
<td>车号</td>
|
|
|
- <td>{{ form.fTruckno }}</td>
|
|
|
- <td>提单号</td>
|
|
|
- <td>{{ form.fMblno }}</td>
|
|
|
- <td>箱号</td>
|
|
|
- <td colspan="2" v-if="Printinglist.length">
|
|
|
- {{ Printinglist[0].fCntrno }}
|
|
|
- </td>
|
|
|
- <td colspan="2" v-else></td>
|
|
|
+ <td colspan="2">{{ 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>
|
|
|
@@ -2041,6 +1992,7 @@
|
|
|
</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 v-if="item.fGrossweight">
|
|
|
@@ -2053,9 +2005,9 @@
|
|
|
</tr>
|
|
|
<tr>
|
|
|
<td>备注</td>
|
|
|
- <td colspan="4">不贴标签不卸货</td>
|
|
|
+ <td colspan="4"></td>
|
|
|
<td>总件数</td>
|
|
|
- <td>{{ allfQty }}</td>
|
|
|
+ <td colspan="2">{{ allfQty }}</td>
|
|
|
</tr>
|
|
|
</table>
|
|
|
</div>
|
|
|
@@ -2066,8 +2018,7 @@
|
|
|
<div>理货：</div>
|
|
|
<div>叉车：</div>
|
|
|
<div>司机：</div>
|
|
|
-
|
|
|
- <div style="width: 150px">电话：</div>
|
|
|
+ <div style="width: 200px">电话：</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
<span slot="footer" class="dialog-footer">
|
|
|
@@ -2679,6 +2630,8 @@ import draggable from "vuedraggable";
|
|
|
import upLoad from "../components/upLoad";
|
|
|
import incomeMoney from "../components/incomeMoney";
|
|
|
import payMoney from "../components/payMoney";
|
|
|
+// import downloadTemplate from "./downloadTemplate";
|
|
|
+import uploadExcel from "./uploadExcel";
|
|
|
export default {
|
|
|
name: "inStock",
|
|
|
props: {
|
|
|
@@ -2700,6 +2653,7 @@ export default {
|
|
|
upLoad,
|
|
|
incomeMoney,
|
|
|
payMoney,
|
|
|
+ uploadExcel,
|
|
|
},
|
|
|
data() {
|
|
|
return {
|
|
|
@@ -3028,6 +2982,7 @@ export default {
|
|
|
ifsamplingList: [],
|
|
|
ifweightRecoveryList: [],
|
|
|
showApproval: null,
|
|
|
+ downloadTemplateVisible: false,
|
|
|
};
|
|
|
},
|
|
|
created() {
|
|
|
@@ -4564,10 +4519,13 @@ export default {
|
|
|
this.importList.fBsdate = this.Printinglist[0].fBsdate;
|
|
|
}
|
|
|
this.importList.fGoodsid = this.Printinglist[0].fGoodsid;
|
|
|
- this.importList.fBusinessType = this.Printinglist[0].fBusinessType.toString();
|
|
|
+ this.importList.fBusinessType =
|
|
|
+ this.Printinglist[0].fBusinessType.toString();
|
|
|
this.importList.fMarks = this.Printinglist[0].fMarks;
|
|
|
- this.importList.fWarehouselocid = this.Printinglist[0].fWarehouselocid;
|
|
|
- this.importList.fWarehouseInformation = this.Printinglist[0].fWarehouseInformation;
|
|
|
+ this.importList.fWarehouselocid =
|
|
|
+ this.Printinglist[0].fWarehouselocid;
|
|
|
+ this.importList.fWarehouseInformation =
|
|
|
+ this.Printinglist[0].fWarehouseInformation;
|
|
|
this.importList.fPackagespecs = this.Printinglist[0].fPackagespecs;
|
|
|
this.importList.fCntrtype = Number(this.Printinglist[0].fCntrtype);
|
|
|
this.importList.fCntqty = this.Printinglist[0].fCntqty;
|
|
|
@@ -4906,7 +4864,6 @@ export default {
|
|
|
}
|
|
|
}
|
|
|
});
|
|
|
-
|
|
|
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;}";
|
|
|
@@ -4943,6 +4900,7 @@ export default {
|
|
|
this.cancel();
|
|
|
});
|
|
|
},
|
|
|
+ downLoad() {},
|
|
|
},
|
|
|
watch: {
|
|
|
// 监听 addOrUpdateVisible 改变
|
qukaidi