|
|
@@ -136,11 +136,11 @@
|
|
|
v-model="queryParams.fWarehouseid"
|
|
|
filterable
|
|
|
remote
|
|
|
- clearable
|
|
|
+ @select="treeseLect"
|
|
|
+ :disabled="browseStatus || formBrowseStatus"
|
|
|
style="width: 80%"
|
|
|
- :remote-method="warehouseRemoteMethod"
|
|
|
@keyup.enter.native="handleQuery"
|
|
|
- placeholder="请选择仓库"
|
|
|
+ placeholder="请选择"
|
|
|
>
|
|
|
<el-option
|
|
|
v-for="(dict, index) in warehouseOptions"
|
|
|
@@ -247,10 +247,12 @@
|
|
|
<span>{{ parseTime(scope.row.fBsdate, "{y}-{m}-{d}") }}</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column label="仓库" align="center" prop="fWarehouseid" />
|
|
|
- <el-table-column label="调拨件数" align="center" prop="fPlanqty" />
|
|
|
- <el-table-column label="调拨毛重" align="center" prop="fPlangrossweight" />
|
|
|
- <el-table-column label="调拨净重" align="center" prop="fPlannetweight" />
|
|
|
+ <el-table-column label="调入仓库" align="center" prop="fWarehouseid" />
|
|
|
+ <el-table-column label="调出仓库" align="center" prop="fInwarehouseid" />
|
|
|
+ <el-table-column label="实际调拨件数" align="center" prop="fQty" />
|
|
|
+ <el-table-column label="计划调拨件数" align="center" prop="fPlanqty" />
|
|
|
+ <el-table-column label="计划调拨毛重(kg)" align="center" prop="fPlangrossweight" />
|
|
|
+ <el-table-column label="计划调拨净重(kg)" align="center" prop="fPlannetweight" />
|
|
|
<el-table-column label="业务类别" align="center" prop="fBusinessType" :formatter="fBusinessTypeFormat"/>
|
|
|
|
|
|
<el-table-column
|
|
|
@@ -430,7 +432,7 @@
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="8">
|
|
|
- <el-form-item label="仓库" prop="fWarehouseid">
|
|
|
+ <el-form-item label="调入仓库" prop="fWarehouseid">
|
|
|
<el-select
|
|
|
v-model="form.fWarehouseid"
|
|
|
filterable
|
|
|
@@ -450,8 +452,26 @@
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
|
|
|
- </el-row>
|
|
|
- <el-row>
|
|
|
+ <el-col :span="8">
|
|
|
+ <el-form-item label="调出仓库" prop="fInwarehouseid">
|
|
|
+ <el-select
|
|
|
+ v-model="form.fInwarehouseid"
|
|
|
+ filterable
|
|
|
+ remote
|
|
|
+ :disabled="browseStatus || formBrowseStatus"
|
|
|
+ style="width: 80%"
|
|
|
+ @keyup.enter.native="handleQuery"
|
|
|
+ placeholder="请选择"
|
|
|
+ >
|
|
|
+ <el-option
|
|
|
+ v-for="(dict, index) in warehouseOptions"
|
|
|
+ :key="index.fId"
|
|
|
+ :label="dict.fName"
|
|
|
+ :value="dict.fId"
|
|
|
+ ></el-option>
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
<el-col :span="8">
|
|
|
<el-form-item label="单据编号" prop="fBillno">
|
|
|
<el-input
|
|
|
@@ -529,7 +549,7 @@
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="8">
|
|
|
- <el-form-item label="计划调拨净重">
|
|
|
+ <el-form-item label="计划调拨净重(kg)">
|
|
|
<el-input
|
|
|
v-model="form.fPlannetweight"
|
|
|
style="width: 80%"
|
|
|
@@ -539,7 +559,7 @@
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="8">
|
|
|
- <el-form-item label="计划调拨毛重">
|
|
|
+ <el-form-item label="计划调拨毛重(kg)">
|
|
|
<el-input
|
|
|
v-model="form.fPlangrossweight"
|
|
|
style="width: 80%"
|
|
|
@@ -619,11 +639,13 @@
|
|
|
v-model="form.fLabour"
|
|
|
@keyup.enter.native="handleQuery"
|
|
|
:remote-method="flabourRemoteMethod"
|
|
|
+ remote
|
|
|
+ filterable
|
|
|
:disabled="contrOl"
|
|
|
placeholder="请输入劳务公司"
|
|
|
>
|
|
|
<el-option
|
|
|
- v-for="(dict, index) in fMblnoOptions"
|
|
|
+ v-for="(dict, index) in fCompanyOptIons"
|
|
|
:key="index.fId"
|
|
|
:label="dict.fName"
|
|
|
:value="dict.fId"
|
|
|
@@ -642,13 +664,13 @@
|
|
|
<el-select
|
|
|
style="width: 80%"
|
|
|
v-model="form.fFleet"
|
|
|
- @keyup.enter.native="handleQuery"
|
|
|
+ filterable
|
|
|
+ remote
|
|
|
:remote-method="fleetRemoteMethod"
|
|
|
:disabled="contrOl"
|
|
|
- placeholder="请输入车队"
|
|
|
- >
|
|
|
+ placeholder="请输入车队">
|
|
|
<el-option
|
|
|
- v-for="(dict, index) in fMblnoOptions"
|
|
|
+ v-for="(dict, index) in fleetOptions"
|
|
|
:key="index.fId"
|
|
|
:label="dict.fName"
|
|
|
:value="dict.fId"
|
|
|
@@ -790,7 +812,7 @@
|
|
|
</div>
|
|
|
<div style="display: flex">
|
|
|
<el-button type="info" :disabled="printinglist.length <= 0 || browseStatus" prop="打印" @click="printJobSheet">作业单</el-button>
|
|
|
- <el-button :disabled="printinglist.length <= 0 || browseStatus" @click="discharge">装货</el-button>
|
|
|
+ <el-button :disabled="printinglist.length <= 0 || browseStatu " @click="discharge">装货</el-button>
|
|
|
<el-button
|
|
|
:disabled="dataListSelection.length <= 0 || browseStatus"
|
|
|
@click.prevent="creditClick"
|
|
|
@@ -908,7 +930,7 @@
|
|
|
</el-table-column>
|
|
|
|
|
|
<el-table-column
|
|
|
- prop="fWarehouseids"
|
|
|
+ prop="fOrgwarehouseInformation"
|
|
|
header-align="center"
|
|
|
align="center"
|
|
|
label="库位"
|
|
|
@@ -916,11 +938,11 @@
|
|
|
</el-table-column>
|
|
|
|
|
|
<el-table-column
|
|
|
- prop="fWarehouseInformation"
|
|
|
+ prop="fTransferWarehouselocid"
|
|
|
header-align="center"
|
|
|
width="240px"
|
|
|
align="center"
|
|
|
- label="*调入库位"
|
|
|
+ label="*调入1库位"
|
|
|
>
|
|
|
<template slot-scope="scope">
|
|
|
<el-input
|
|
|
@@ -931,7 +953,8 @@
|
|
|
>
|
|
|
</el-input>
|
|
|
</template>
|
|
|
- </el-table-column> <el-table-column
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
prop="fPlanqty"
|
|
|
header-align="center"
|
|
|
align="center"
|
|
|
@@ -944,7 +967,7 @@
|
|
|
header-align="center"
|
|
|
align="center"
|
|
|
width="180px"
|
|
|
- label="*结余毛重"
|
|
|
+ label="*结余毛重(kg)"
|
|
|
>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
@@ -952,7 +975,7 @@
|
|
|
header-align="center"
|
|
|
align="center"
|
|
|
width="180px"
|
|
|
- label="*结余净重"
|
|
|
+ label="*结余净重(kg)"
|
|
|
>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
@@ -978,7 +1001,7 @@
|
|
|
header-align="center"
|
|
|
width="180px"
|
|
|
align="center"
|
|
|
- label="*调拨毛重"
|
|
|
+ label="*调拨毛重(kg)"
|
|
|
>
|
|
|
<template slot-scope="scope">
|
|
|
<el-input
|
|
|
@@ -996,7 +1019,7 @@
|
|
|
header-align="center"
|
|
|
width="180px"
|
|
|
align="center"
|
|
|
- label="*调拨净重"
|
|
|
+ label="*调拨净重(kg)"
|
|
|
>
|
|
|
<template slot-scope="scope">
|
|
|
<el-input
|
|
|
@@ -1358,7 +1381,7 @@
|
|
|
<el-button type="primary" :disabled="browseStatus" @click="saveForm">保 存</el-button>
|
|
|
<el-button type="danger"
|
|
|
:disabled="browseStatus"
|
|
|
- @click.prevent="addAgreement('Dr')"
|
|
|
+ @click.prevent="addAgreement('Dr',3)"
|
|
|
>作业费协议</el-button
|
|
|
>
|
|
|
</div>
|
|
|
@@ -1434,19 +1457,22 @@
|
|
|
width="180px"
|
|
|
label="作业类型"
|
|
|
>
|
|
|
- <el-select
|
|
|
- style="width: 80%"
|
|
|
- v-model="warehouseDrList.fBusinessType"
|
|
|
- filterable
|
|
|
- disabled
|
|
|
- >
|
|
|
- <el-option
|
|
|
- v-for="(dict,index) in businessTypeOption"
|
|
|
- :key="dict.dictValue"
|
|
|
- :label="dict.dictLabel"
|
|
|
- :value="dict.dictValue"
|
|
|
- ></el-option>
|
|
|
- </el-select>
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <el-select
|
|
|
+ style="width: 80%"
|
|
|
+ v-model="scope.row.fBusinessType"
|
|
|
+ filterable
|
|
|
+ disabled
|
|
|
+ >
|
|
|
+ <el-option
|
|
|
+ v-for="(dict,index) in businessTypeOption"
|
|
|
+ :key="dict.dictValue"
|
|
|
+ :label="dict.dictLabel"
|
|
|
+ :value="dict.dictValue"
|
|
|
+ ></el-option>
|
|
|
+ </el-select>
|
|
|
+
|
|
|
+ </template>
|
|
|
</el-table-column>
|
|
|
|
|
|
<el-table-column
|
|
|
@@ -1540,7 +1566,7 @@
|
|
|
:disabled="browseStatus"
|
|
|
>
|
|
|
<el-option
|
|
|
- v-for="dict in fStltypeidOptions"
|
|
|
+ v-for="dict in fStltypeOptions"
|
|
|
:key="dict.dictValue"
|
|
|
:label="dict.dictLabel"
|
|
|
:value="parseInt(dict.dictValue)"
|
|
|
@@ -1695,7 +1721,7 @@
|
|
|
<el-button type="primary" :disabled="browseStatus" @click="saveForm">保 存</el-button>
|
|
|
<el-button type="danger"
|
|
|
:disabled="browseStatus"
|
|
|
- @click.prevent="addAgreement('Cr')"
|
|
|
+ @click.prevent="addAgreement('Cr',1)"
|
|
|
>作业费协议</el-button>
|
|
|
</div>
|
|
|
</div>
|
|
|
@@ -1770,19 +1796,22 @@
|
|
|
width="180px"
|
|
|
label="作业类型"
|
|
|
>
|
|
|
- <el-select
|
|
|
- style="width: 80%"
|
|
|
- v-model="warehouseDrList.fBusinessType"
|
|
|
- filterable
|
|
|
- disabled
|
|
|
- >
|
|
|
- <el-option
|
|
|
- v-for="(dict,index) in businessTypeOption"
|
|
|
- :key="dict.dictValue"
|
|
|
- :label="dict.dictLabel"
|
|
|
- :value="dict.dictValue"
|
|
|
- ></el-option>
|
|
|
- </el-select>
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <el-select
|
|
|
+ style="width: 80%"
|
|
|
+ v-model="scope.row.fBusinessType"
|
|
|
+ filterable
|
|
|
+ disabled
|
|
|
+ >
|
|
|
+ <el-option
|
|
|
+ v-for="(dict,index) in businessTypeOption"
|
|
|
+ :key="dict.dictValue"
|
|
|
+ :label="dict.dictLabel"
|
|
|
+ :value="dict.dictValue"
|
|
|
+ ></el-option>
|
|
|
+ </el-select>
|
|
|
+
|
|
|
+ </template>
|
|
|
</el-table-column>
|
|
|
|
|
|
<el-table-column
|
|
|
@@ -1876,7 +1905,7 @@
|
|
|
:disabled="browseStatus"
|
|
|
>
|
|
|
<el-option
|
|
|
- v-for="dict in fStltypeidOptions"
|
|
|
+ v-for="dict in fStltypeOptions"
|
|
|
:key="dict.dictValue"
|
|
|
:label="dict.dictLabel"
|
|
|
:value="parseInt(dict.dictValue)"
|
|
|
@@ -2117,7 +2146,13 @@
|
|
|
style="box-shadow: 0 1px 3px rgba(0, 0, 0, 0) !important"
|
|
|
:visible.sync="warehousingagreements"
|
|
|
width="70%"
|
|
|
+
|
|
|
>
|
|
|
+ <el-menu :default-active="activeIndex" v-if="Navigation === true" class="el-menu-demo" mode="horizontal" @select="handleSelect">
|
|
|
+ <el-menu-item index="1">车队作业费</el-menu-item>
|
|
|
+ <el-menu-item index="2">劳务作业费</el-menu-item>
|
|
|
+ </el-menu>
|
|
|
+
|
|
|
<el-table
|
|
|
:data="tasklegList"
|
|
|
ref="table"
|
|
|
@@ -2177,7 +2212,7 @@
|
|
|
/>
|
|
|
<div slot="footer" class="dialog-footer">
|
|
|
<el-button type="primary" @click="zhgenlegData">导入作业费</el-button>
|
|
|
- <el-button @click="warehousingagreements = false">取 消</el-button>
|
|
|
+ <el-button @click="warehousingagreements = false;Navigation = false">取 消</el-button>
|
|
|
</div>
|
|
|
</el-dialog>
|
|
|
<el-dialog
|
|
|
@@ -2221,15 +2256,31 @@
|
|
|
调拨日期：{{ form.fBsdates }}
|
|
|
</td>
|
|
|
</tr>
|
|
|
- <tr v-for="(item, index) in printinglist" :key="index">
|
|
|
+<!-- <tr v-for="(item, index) in printinglist" :key="index">-->
|
|
|
+<!-- <td width="200">车号</td>-->
|
|
|
+<!-- <td width="200">{{ item.fTruckno }}</td>-->
|
|
|
+<!-- <td width="200">货物品名</td>-->
|
|
|
+<!-- <td width="200" class="zzss">-->
|
|
|
+<!-- {{ item.fGoodsids }}-->
|
|
|
+<!-- </td>-->
|
|
|
+<!-- <td width="200">{{item.fBusinessTypes}}</td>-->
|
|
|
+<!-- <td width="200">{{item.fMarks}}</td>-->
|
|
|
+<!-- </tr>-->
|
|
|
+ <tr>
|
|
|
<td width="200">车号</td>
|
|
|
- <td width="200">{{ item.fTruckno }}</td>
|
|
|
<td width="200">货物品名</td>
|
|
|
- <td width="200" class="zzss">
|
|
|
- {{ item.fGoodsids }}
|
|
|
- </td>
|
|
|
- <td width="200">{{item.fBusinessTypes}}</td>
|
|
|
- <td width="200">{{item.fMarks}}</td>
|
|
|
+ <td width="200">提单号</td>
|
|
|
+ <td width="200">品牌/规格/产地</td>
|
|
|
+ <td width="200">净重(kg)</td>
|
|
|
+ <td width="200">件数(50KG)</td>
|
|
|
+ </tr>
|
|
|
+ <tr v-for="(item, index) in printinglist" :key="index">
|
|
|
+ <td width="200">{{ item.fTruckno }}</td>
|
|
|
+ <td width="200">{{ item.fGoodsids }}</td>
|
|
|
+ <td width="200">{{ item.fMblno }}</td>
|
|
|
+ <td width="200">{{item.fBusinessTypes}}/{{item.fMarks}}</td>
|
|
|
+ <td width="200">{{item.fNetweight}}</td>
|
|
|
+ <td width="200">{{ item.fQty }}</td>
|
|
|
</tr>
|
|
|
<tr>
|
|
|
<td width="1400" colspan="6"> </td>
|
|
|
@@ -2351,6 +2402,11 @@ export default {
|
|
|
},
|
|
|
data() {
|
|
|
return {
|
|
|
+ browseStatu:false,
|
|
|
+ fCompanyOptIons:[],
|
|
|
+ fleetOptions:[],
|
|
|
+ activeIndex: '1',
|
|
|
+ activeIndex2: '1',
|
|
|
//控制选择库位弹出
|
|
|
choiceWarehouse:false,
|
|
|
information:'',
|
|
|
@@ -2363,9 +2419,11 @@ export default {
|
|
|
},
|
|
|
//仓库树状图
|
|
|
fWarehouseidOptions:[],
|
|
|
+ fWarehouseidOption:[],
|
|
|
activeNames:['1'],
|
|
|
//作业类型校验
|
|
|
isrequired:2,
|
|
|
+ Navigation:false,
|
|
|
isrequired_s:2,
|
|
|
isrequired_l:2,
|
|
|
contrOl:false,
|
|
|
@@ -2551,6 +2609,7 @@ export default {
|
|
|
fMblno: null,
|
|
|
fCorpid: null,
|
|
|
fWarehouseid: null,
|
|
|
+ fInwarehouseid:null
|
|
|
},
|
|
|
// 表单参数
|
|
|
form: {
|
|
|
@@ -2626,9 +2685,16 @@ export default {
|
|
|
this.getDicts("st_trans_type").then((response) => {
|
|
|
this.businessTypeOption = response.data;
|
|
|
});
|
|
|
- this.getDicts("data_stltype_type").then(response => {
|
|
|
- this.fStltypeidOptions = response.data;
|
|
|
- });
|
|
|
+ // this.getDicts("data_customer_category").then(response => {
|
|
|
+ // this.fCompanyOptIons = response.data;
|
|
|
+ // });
|
|
|
+ // this.getDicts("data_customer_category").then(response => {
|
|
|
+ // this.fleetOptions = response.data;
|
|
|
+ // });
|
|
|
+ treeselect().then(response => {
|
|
|
+ this.warehouseOptions = response.data
|
|
|
+ })
|
|
|
+ this.warehousesssMethod()
|
|
|
this.register()
|
|
|
},
|
|
|
activated(){
|
|
|
@@ -2638,13 +2704,41 @@ export default {
|
|
|
// 'form.fWarehouseid' : 'warehouseMethod'
|
|
|
// },
|
|
|
methods: {
|
|
|
+ handleSelect(key, keyPath) {
|
|
|
+ this.addAgreements(key)
|
|
|
+ this.getWhgenlegListt(key)
|
|
|
+ },
|
|
|
+ // 新增付款作业费协议
|
|
|
+ addAgreements(kye) {
|
|
|
+ if (!this.form.fCorpid) {
|
|
|
+ this.$message({
|
|
|
+ message: "请维护货权方",
|
|
|
+ type: "warning",
|
|
|
+ });
|
|
|
+ }else if(this.form.fProductName == undefined) {
|
|
|
+ this.$message({
|
|
|
+ message: "请维护入库明细品名",
|
|
|
+ type: "warning",
|
|
|
+ });
|
|
|
+ } else {
|
|
|
+ this.whgenlegList = [];
|
|
|
+ this.dialogWhgenlegList = [];
|
|
|
+ this.whgenlegTotal = 0;
|
|
|
+ this.warehousingagreements = true;
|
|
|
+ this.getWhgenlegList(kye);
|
|
|
+ }
|
|
|
+ },
|
|
|
/** 查询部门下拉树结构 */
|
|
|
+ treeseLect(tree){
|
|
|
+ this.queryParams.fWarehouselocid = tree.id
|
|
|
+ },
|
|
|
getTreeselect(row) {
|
|
|
this.treeselectList.fWarehouselocid = null
|
|
|
this.inDex = row.$index
|
|
|
this.choiceWarehouse = true
|
|
|
treeselect(this.form.fWarehouseid).then(response => {
|
|
|
this.fWarehouseidOptions = response.data;
|
|
|
+ // this.dataList[this.inDex].fTransferWarehouselocid
|
|
|
})
|
|
|
this.Warehouse = this.dataList[this.inDex].fWarehouseInformation
|
|
|
},
|
|
|
@@ -2654,8 +2748,9 @@ export default {
|
|
|
},
|
|
|
confirm(){
|
|
|
this.$set(this.dataList[this.inDex], 'fWarehouseInformation', this.information)
|
|
|
- this.$set(this.dataList[this.inDex], 'fWarehouselocid', this.informationId)
|
|
|
+ this.$set(this.dataList[this.inDex], 'fTransferWarehouselocid', this.informationId)
|
|
|
this.choiceWarehouse = false
|
|
|
+ this.dataList.fTransferWarehouselocid = this.informationId
|
|
|
},
|
|
|
// 撤销审核
|
|
|
backrRconciliation(){
|
|
|
@@ -2683,13 +2778,13 @@ export default {
|
|
|
Jump(){
|
|
|
this.approval = this.$route.query.data
|
|
|
if(this.approval){
|
|
|
- this.getTreeselect()
|
|
|
this.reset()
|
|
|
this.colseButton = false
|
|
|
this.approval = JSON.parse(this.approval)
|
|
|
this.hide = false
|
|
|
this.open = true
|
|
|
this.browseStatus = true
|
|
|
+ this.browseStatus = true
|
|
|
this.contrOl = true
|
|
|
this.notChange = true
|
|
|
this.approve = true
|
|
|
@@ -2708,7 +2803,7 @@ export default {
|
|
|
if (response.data.corps) {
|
|
|
this.fMblnoOptions = response.data.corps;
|
|
|
this.KHblnoOptions = response.data.corps;
|
|
|
- this.fSbuOptions = response.data.corps;
|
|
|
+ this.fCompanyOptIons = response.data.corps;
|
|
|
}
|
|
|
if (response.data.feesList) {
|
|
|
this.fWbuOptions = response.data.feesList;
|
|
|
@@ -2889,7 +2984,7 @@ export default {
|
|
|
});
|
|
|
},
|
|
|
// 新增作业费协议
|
|
|
- addAgreement(status) {
|
|
|
+ addAgreement(status,kye) {
|
|
|
this.costStatus = status
|
|
|
if (this.dataList.length === 0 || !this.dataList[0].fGoodsid) {
|
|
|
this.$message({ message: "请维护库存明细，或第一行品名", type: "warning", });
|
|
|
@@ -2903,7 +2998,7 @@ export default {
|
|
|
this.dialogWhgenlegList = []
|
|
|
this.whgenlegTotal = 0
|
|
|
this.warehousingagreements = true
|
|
|
- this.getWhgenlegListt()
|
|
|
+ this.getWhgenlegListt(kye)
|
|
|
},
|
|
|
// 新增仓储费协议
|
|
|
addStorages() {
|
|
|
@@ -2926,14 +3021,39 @@ export default {
|
|
|
});
|
|
|
},
|
|
|
// 查询作业费信息
|
|
|
- getWhgenlegListt() {
|
|
|
- let data = {
|
|
|
- pageNum:1,
|
|
|
- pageSize:10,
|
|
|
- fLineno:this.form.fCorpid,
|
|
|
- fFeeid:this.dataList[0].fGoodsid
|
|
|
+ getWhgenlegListt(kye) {
|
|
|
+ let daTa = []
|
|
|
+ let fTaskType = kye
|
|
|
+ if (kye == 2){
|
|
|
+ this.Navigation = true
|
|
|
+ daTa = {
|
|
|
+ pageNum:1,
|
|
|
+ pageSize:10,
|
|
|
+ fTaskType:Number(fTaskType),
|
|
|
+ fLabour:this.form.fLabour
|
|
|
+ }
|
|
|
+ this.ueryTO(daTa)
|
|
|
+ }else if (kye == 1) {
|
|
|
+ this.Navigation = true
|
|
|
+ daTa = {
|
|
|
+ pageNum:1,
|
|
|
+ pageSize:10,
|
|
|
+ fTaskType:Number(fTaskType),
|
|
|
+ fFleet:this.form.fFleet
|
|
|
+ }
|
|
|
+ this.ueryTO(daTa)
|
|
|
+ }else {
|
|
|
+ this.Navigation = false
|
|
|
+ daTa = {
|
|
|
+ pageNum:1,
|
|
|
+ pageSize:10,
|
|
|
+ fCorpid:this.form.fCorpid
|
|
|
+ }
|
|
|
+ this.ueryTO(daTa)
|
|
|
}
|
|
|
- operationAgreement(data).then((response) => {
|
|
|
+ },
|
|
|
+ ueryTO(daTa){
|
|
|
+ operationAgreement(daTa).then((response) => {
|
|
|
this.tasklegList = response.rows;
|
|
|
this.whgenlegTotal = response.total;
|
|
|
});
|
|
|
@@ -3013,7 +3133,6 @@ export default {
|
|
|
fProductName:this.form.fProductName,
|
|
|
fMarks:this.form.fMarks,
|
|
|
fBusinessType:this.$set(this.warehouseCrList,'fBusinessType',this.form.fBusinessType)
|
|
|
-
|
|
|
})
|
|
|
} else {
|
|
|
this.warehouseDrList.push({
|
|
|
@@ -3118,14 +3237,18 @@ export default {
|
|
|
fGoodsids: this.dialogWhgenlegList[whgen].fGoodsids,
|
|
|
fBillingway: this.dialogWhgenlegList[whgen].fBillingway,
|
|
|
fChargedate: this.dialogWhgenlegList[whgen].fChargedate,
|
|
|
- fWarehouseids: this.dialogWhgenlegList[whgen].fWarehouseids,
|
|
|
+ fOrgwarehouseInformation: this.dialogWhgenlegList[whgen].fWarehouseids,
|
|
|
fPackagespecs: this.dialogWhgenlegList[whgen].fPackagespecs,
|
|
|
fPlannetweight: this.dialogWhgenlegList[whgen].fNetweightblc,
|
|
|
fOriginalbillno: this.dialogWhgenlegList[whgen].fOriginalbillno,
|
|
|
fBusinessType: this.dialogWhgenlegList[whgen].fBusinessType + '',
|
|
|
fPlangrossweight: this.dialogWhgenlegList[whgen].fGrossweightblc,
|
|
|
fOriginalbilldate: this.dialogWhgenlegList[whgen].fOriginalbilldate,
|
|
|
+
|
|
|
+
|
|
|
fWarehouselocid: this.dialogWhgenlegList[whgen].fWarehouseLocationid,
|
|
|
+
|
|
|
+
|
|
|
fWarehouselocids: this.dialogWhgenlegList[whgen].fWarehouseLocationids,
|
|
|
fWarehouseLocationids: this.dialogWhgenlegList[whgen].fWarehouseLocationids,
|
|
|
fTransferWarehouselocid: null,
|
|
|
@@ -3213,38 +3336,50 @@ export default {
|
|
|
},
|
|
|
// 收款信息
|
|
|
addCollection() {
|
|
|
- this.warehouseDrList.push({
|
|
|
- fcorpid: this.form.fCorpid,
|
|
|
- ffeeid: null,
|
|
|
- fFeeUnitid: null,
|
|
|
- fQty: 0,
|
|
|
- funitprice: 0,
|
|
|
- fAmount: 0,
|
|
|
- fCurrency: "RMB",
|
|
|
- fExrate: 1,
|
|
|
- fTaxrate: this.fTaxrate,
|
|
|
- remarks: null,
|
|
|
- fMblno:this.form.fMblno,
|
|
|
- fProductName:this.form.fProductName,
|
|
|
- fMarks:this.form.fMarks
|
|
|
- });
|
|
|
+ if(this.form.fBusinessType == null){
|
|
|
+ this.$message.error("请维护作业类型")
|
|
|
+ return false
|
|
|
+ }else{
|
|
|
+ this.warehouseDrList.push({
|
|
|
+ fcorpid: this.form.fCorpid,
|
|
|
+ ffeeid: null,
|
|
|
+ fFeeunitid: '2',
|
|
|
+ fQty: 0,
|
|
|
+ funitprice: 0,
|
|
|
+ fAmount: 0,
|
|
|
+ fCurrency: "RMB",
|
|
|
+ fExrate: 1,
|
|
|
+ fTaxrate: this.fTaxrate,
|
|
|
+ remarks: null,
|
|
|
+ fMblno:this.form.fMblno,
|
|
|
+ fProductName:this.form.fProductName,
|
|
|
+ fMarks:this.form.fMarks,
|
|
|
+ fBusinessType: this.form.fBusinessType
|
|
|
+ });
|
|
|
+ }
|
|
|
},
|
|
|
addpayment() {
|
|
|
- this.warehouseCrList.push({
|
|
|
- fcorpid: this.form.fCorpid,
|
|
|
- ffeeid: null,
|
|
|
- fFeeUnitid: null,
|
|
|
- fQty: 0,
|
|
|
- funitprice: 0,
|
|
|
- fAmount: 0,
|
|
|
- fCurrency: "RMB",
|
|
|
- fExrate: 1,
|
|
|
- fTaxrate: this.fTaxrate,
|
|
|
- remarks: null,
|
|
|
- fMblno:this.form.fMblno,
|
|
|
- fProductName:this.form.fProductName,
|
|
|
- fMarks:this.form.fMarks
|
|
|
- });
|
|
|
+ if(this.form.fBusinessType == null){
|
|
|
+ this.$message.error("请维护作业类型")
|
|
|
+ return false
|
|
|
+ }else {
|
|
|
+ this.warehouseCrList.push({
|
|
|
+ fcorpid: this.form.fCorpid,
|
|
|
+ ffeeid: null,
|
|
|
+ fFeeunitid: '2',
|
|
|
+ fQty: 0,
|
|
|
+ funitprice: 0,
|
|
|
+ fAmount: 0,
|
|
|
+ fCurrency: "RMB",
|
|
|
+ fExrate: 1,
|
|
|
+ fTaxrate: this.fTaxrate,
|
|
|
+ remarks: null,
|
|
|
+ fMblno: this.form.fMblno,
|
|
|
+ fProductName: this.form.fProductName,
|
|
|
+ fMarks: this.form.fMarks,
|
|
|
+ fBusinessType: this.form.fBusinessType
|
|
|
+ });
|
|
|
+ }
|
|
|
},
|
|
|
queryUser() {
|
|
|
queryUserVal().then((response) => {
|
|
|
@@ -3266,6 +3401,14 @@ export default {
|
|
|
},
|
|
|
/** 查询仓库主(出入库)列表 */
|
|
|
getList() {
|
|
|
+ let queryParams = { pageNum: 1, pageSize: 10, fTypeid: 6}
|
|
|
+ listCorps(queryParams).then((response) => {
|
|
|
+ this.fCompanyOptIons = response.rows;
|
|
|
+ });
|
|
|
+ let params = { pageNum: 1, pageSize: 10, fTypeid: 2}
|
|
|
+ listCorps(params).then((response) => {
|
|
|
+ this.fleetOptions = response.rows;
|
|
|
+ });
|
|
|
this.loading = true;
|
|
|
getStockTransferList(this.queryParams).then((response) => {
|
|
|
this.warehousebillsList = response.rows;
|
|
|
@@ -3278,6 +3421,7 @@ export default {
|
|
|
this.whgenlegParams.fMblno = this.form.fMblno;
|
|
|
this.whgenlegParams.fCorpid = this.form.fCorpid;
|
|
|
this.whgenlegParams.fTrademodeid = this.form.fTrademodeid;
|
|
|
+ this.whgenlegParams.fWarehouseid = this.form.fInwarehouseid
|
|
|
listWhgenleg(this.whgenlegParams).then((response) => {
|
|
|
this.whgenlegList = response.rows;
|
|
|
this.whgenlegTotal = response.total;
|
|
|
@@ -3428,6 +3572,7 @@ export default {
|
|
|
this.reset();
|
|
|
this.contrOl = true
|
|
|
this.browseStatus = status;
|
|
|
+ this.browseStatu = status;
|
|
|
this.detailsHidden = false;
|
|
|
let data = row || this.ids;
|
|
|
getStockTransfer(data.fId).then((response) => {
|
|
|
@@ -3592,12 +3737,14 @@ export default {
|
|
|
/** 修改按钮操作 */
|
|
|
handleUpdate(row, status) {
|
|
|
this.reset();
|
|
|
-
|
|
|
this.browseStatus = status;
|
|
|
this.contrOl = status
|
|
|
this.detailsHidden = false;
|
|
|
this.formBrowseStatus = false;
|
|
|
let fId = row.fId || this.ids;
|
|
|
+ if (fId.length === 1){
|
|
|
+ fId = fId[0].fId
|
|
|
+ }
|
|
|
this.dataList = [];
|
|
|
getStockTransfer(fId).then((response) => {
|
|
|
if (response.data.warehousebills) {
|
|
|
@@ -3615,9 +3762,11 @@ export default {
|
|
|
}
|
|
|
}
|
|
|
if (response.data.corps) {
|
|
|
+ this.flabourOptions = response.data.corps;
|
|
|
this.fMblnoOptions = response.data.corps;
|
|
|
this.KHblnoOptions = response.data.corps;
|
|
|
- this.fSbuOptions = response.data.corps;
|
|
|
+ this.fCompanyOptIons = response.data.corps;
|
|
|
+ this.fleetOptions = response.data.corps;
|
|
|
}
|
|
|
if (response.data.feesList) {
|
|
|
this.fWbuOptions = response.data.feesList;
|
|
|
@@ -3678,6 +3827,8 @@ export default {
|
|
|
}
|
|
|
this.open = true;
|
|
|
this.title = "修改调拨";
|
|
|
+
|
|
|
+ this.warehousesssMethod()
|
|
|
});
|
|
|
},
|
|
|
// 数量计算
|
|
|
@@ -3774,7 +3925,8 @@ export default {
|
|
|
} else {
|
|
|
return prev;
|
|
|
}
|
|
|
- }, 0); // sums[index]
|
|
|
+ }, 0);
|
|
|
+ sums[index] = sums[index].toFixed(2);
|
|
|
}
|
|
|
});
|
|
|
this.sums = sums;
|
|
|
@@ -3838,15 +3990,13 @@ export default {
|
|
|
}
|
|
|
}
|
|
|
if (row.fFeeunitid == "1") {
|
|
|
- this.$set(row, 'fQty', this.fQty.toFixed(2))
|
|
|
+ this.$set(row, 'fQty', this.fPlanqty.toFixed(2))
|
|
|
} else if (row.fFeeunitid == "2") {
|
|
|
- this.$set(row, 'fQty', (fGrossweight/1000).toFixed(2))
|
|
|
+ this.$set(row, 'fQty', (fPlannetweight/1000).toFixed(2))
|
|
|
}else if (row.fFeeunitid == "3") {
|
|
|
- this.$set(row, 'fQty', (fNetweight/1000).toFixed(2))
|
|
|
- // }else if (row.fFeeunitid == "4") {
|
|
|
- // this.$set(row, 'fQty', (volumn/1000).toFixed(2))
|
|
|
- // }else if (row.fFeeunitid == "5") {
|
|
|
- // this.$set(row, 'fQty', (fixed/1000).toFixed(2))
|
|
|
+ this.$set(row, 'fQty', (fPlangrossweight/1000).toFixed(2))
|
|
|
+ }else if (row.fFeeunitid == "7") {
|
|
|
+ this.$set(row, 'fQty', this.fCntqty.toFixed(2))
|
|
|
}else {
|
|
|
this.$set(row, "fQty", 0);
|
|
|
}
|
|
|
@@ -3863,7 +4013,7 @@ export default {
|
|
|
return false;
|
|
|
}
|
|
|
if (!this.dataListSelection[warehouse].fGrossweight) {
|
|
|
- this.$message.error("请选择调拨毛重");
|
|
|
+ this.$message.error("请选择调拨毛重(kg)");
|
|
|
return false;
|
|
|
} else if (!this.dataListSelection[warehouse].fWarehouseInformation) {
|
|
|
this.$message.error("请选择调入库位");
|
|
|
@@ -3872,7 +4022,7 @@ export default {
|
|
|
this.$message.error("调拨库区不得与原库区相同");
|
|
|
return false;
|
|
|
} else if (!this.dataListSelection[warehouse].fNetweight) {
|
|
|
- this.$message.error("请选择调拨净重");
|
|
|
+ this.$message.error("请选择调拨净重(kg)");
|
|
|
return false;
|
|
|
}
|
|
|
// else if (!this.dataListSelection[warehouse].fQty) {
|
|
|
@@ -3911,27 +4061,37 @@ export default {
|
|
|
addList() {
|
|
|
this.$refs["form"].validate((valid) => {
|
|
|
if (valid) {
|
|
|
- let listSelection = JSON.parse(JSON.stringify(this.dataListSelection))
|
|
|
- let formData = new window.FormData();
|
|
|
- formData.append("warehouseBills", JSON.stringify(this.form));
|
|
|
- formData.append("tEnclosure", JSON.stringify(this.relevantAttachments));
|
|
|
- formData.append("warehousebillsitems", JSON.stringify(this.dataListSelection));
|
|
|
- formData.append("warehousebillsfeesCr", JSON.stringify(this.warehouseCrList));
|
|
|
- formData.append("warehousebillsfeesDr", JSON.stringify(this.warehouseDrList));
|
|
|
- addJoblist(formData).then((response) => {
|
|
|
- this.formBrowseStatus = true;
|
|
|
- this.$refs.tableDr.clearSelection();
|
|
|
- this.$refs.tableList.clearSelection();
|
|
|
- let dataitem = response.data.warehousebillsitems
|
|
|
- for (let ite in dataitem) {
|
|
|
- for (let li in this.dataList) {
|
|
|
- if (this.dataList[li].fId === dataitem[ite].fId) {
|
|
|
- this.$set(this.dataList[li], 'fBillstatus', dataitem[ite].fBillstatus)
|
|
|
- this.$set(this.dataList[li], 'fSerialNumber', dataitem[ite].fSerialNumber)
|
|
|
+ let dataList = []
|
|
|
+ for (let se in this.dataListSelection) {
|
|
|
+ if (Number(this.dataListSelection[se].fBillstatus) >= 10) {
|
|
|
+ dataList.push(this.dataListSelection[se])
|
|
|
+ console.log("111")
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if (dataList.length !== 0) {
|
|
|
+ let formData = new window.FormData();
|
|
|
+ formData.append("warehouseBills", JSON.stringify(this.form));
|
|
|
+ formData.append("tEnclosure", JSON.stringify(this.relevantAttachments));
|
|
|
+ formData.append("warehousebillsitems", JSON.stringify(dataList));
|
|
|
+ formData.append("warehousebillsfeesCr", JSON.stringify(this.warehouseCrList));
|
|
|
+ formData.append("warehousebillsfeesDr", JSON.stringify(this.warehouseDrList));
|
|
|
+ addJoblist(formData).then((response) => {
|
|
|
+ this.formBrowseStatus = true;
|
|
|
+ // this.$refs.tableDr.clearSelection();
|
|
|
+ // this.$refs.tableList.clearSelection();
|
|
|
+ let dataSelection = response.data.warehousebillsitems
|
|
|
+ for (let ite in dataSelection) {
|
|
|
+ for (let li in this.dataList) {
|
|
|
+ if (dataSelection[ite].fId === this.dataList[li].fId && this.dataList[li].fBillstatus === 10) {
|
|
|
+ this.$set(this.dataList[li], 'fBillstatus', dataSelection[li].fBillstatus)
|
|
|
+ this.$set(this.dataList[li], 'fSerialNumber', dataSelection[li].fSerialNumber)
|
|
|
+ break
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
- }
|
|
|
- });
|
|
|
+ this.$refs.tableList.clearSelection()
|
|
|
+ });
|
|
|
+ }
|
|
|
}
|
|
|
});
|
|
|
},
|
|
|
@@ -4050,6 +4210,15 @@ export default {
|
|
|
},
|
|
|
// 库存明细多选
|
|
|
selectinventory(selection) {
|
|
|
+ for(let item in selection){
|
|
|
+ console.log(selection[item].fBillstatus)
|
|
|
+ if(selection[item].fBillstatus > '20'){
|
|
|
+ console.log("111")
|
|
|
+ this.browseStatu = true
|
|
|
+ }else{
|
|
|
+ this.browseStatu = false
|
|
|
+ }
|
|
|
+ }
|
|
|
this.dataWithdrawList = [];
|
|
|
this.dataListSelection = [];
|
|
|
this.printinglist = selection;
|
|
|
@@ -4090,10 +4259,10 @@ export default {
|
|
|
saveForm () {
|
|
|
this.updateDeduplication()
|
|
|
this.$refs['form'].validate((valid) => {
|
|
|
- if (this.dataList.length === 0) {
|
|
|
- this.$message.error('请添加库存明细!')
|
|
|
- return false
|
|
|
- }
|
|
|
+ // if (this.dataList.length === 0) {
|
|
|
+ // this.$message.error('请添加库存明细!')
|
|
|
+ // return false
|
|
|
+ // }
|
|
|
for (let list in this.dataList) {
|
|
|
this.changeStock(this.dataList[list])
|
|
|
}
|
|
|
@@ -4101,13 +4270,13 @@ export default {
|
|
|
setTimeout(() => {
|
|
|
this.form.fBillstatus = 2
|
|
|
let formData = new window.FormData()
|
|
|
+ // this.dataList.fTransferWarehouselocid = this.treeselectList.fWarehouselocid
|
|
|
formData.append("warehouseBills", JSON.stringify(this.form));
|
|
|
formData.append("warehousebillsitems", JSON.stringify(this.dataList));
|
|
|
formData.append("tEnclosure", JSON.stringify(this.relevantAttachments));
|
|
|
formData.append("warehousebillsfeesCr", JSON.stringify(this.warehouseCrList));
|
|
|
formData.append("warehousebillsfeesDr", JSON.stringify(this.warehouseDrList));
|
|
|
addStockTransfer(formData).then((response) => {
|
|
|
- console.log(response)
|
|
|
this.msgSuccess('保存成功')
|
|
|
this.form = response.data.warehouseBills
|
|
|
this.$set(this.form, 'fEta', Date.parse(this.form.fEta))
|
|
|
@@ -4129,14 +4298,10 @@ export default {
|
|
|
},
|
|
|
//作业类型校验
|
|
|
educationChange() {
|
|
|
- console.log(this.form.fBusinessType)
|
|
|
if (this.form.fBusinessType === '0') {
|
|
|
- console.log("111")
|
|
|
- console.log("走这")
|
|
|
this.isrequired = 1
|
|
|
this.isrequired_l = 2
|
|
|
}else if(this.form.fBusinessType === '1' || this.form.fBusinessType === '3'){
|
|
|
- console.log("333")
|
|
|
this.isrequired_l = 1
|
|
|
this.isrequired = 2
|
|
|
}else if(this.form.fBusinessType === '2'){
|
|
|
@@ -4318,7 +4483,7 @@ export default {
|
|
|
}
|
|
|
let queryParams = { pageNum: 1, pageSize: 10, fName: name, fTypeid: 6};
|
|
|
listCorps(queryParams).then((response) => {
|
|
|
- this.fSbuOptions = response.rows;
|
|
|
+ this.fCompanyOptIons = response.rows;
|
|
|
});
|
|
|
},
|
|
|
/* 远程模糊查询车队 */
|
|
|
@@ -4328,7 +4493,7 @@ export default {
|
|
|
}
|
|
|
let queryParams = { pageNum: 1, pageSize: 10, fName: name, fTypeid: 2 };
|
|
|
listCorps(queryParams).then((response) => {
|
|
|
- this.fSbuOptions = response.rows;
|
|
|
+ this.fleetOptions = response.rows;
|
|
|
});
|
|
|
},
|
|
|
/* 远程模糊查询用户 */
|
|
|
@@ -4403,9 +4568,7 @@ export default {
|
|
|
fWarehouseid: this.form.fWarehouseid,
|
|
|
fName: name
|
|
|
};
|
|
|
- console.log(this.kqhouseOptions)
|
|
|
listArea(queryParams).then((response) => {
|
|
|
- console.log(response)
|
|
|
this.kqhouseOptions = response.rows;
|
|
|
});
|
|
|
},
|
|
|
@@ -4447,4 +4610,12 @@ export default {
|
|
|
.el-form-item__label {
|
|
|
font-size: 12px !important;
|
|
|
}
|
|
|
+.el-collapse-item__header{
|
|
|
+ font-size: 16px;
|
|
|
+ font-weight: bolder;
|
|
|
+ padding-left: 5px;
|
|
|
+}
|
|
|
+.el-icon-s-home,.el-icon-s-order,.el-icon-circle-plus,.el-icon-remove{
|
|
|
+ padding-right: 5px;
|
|
|
+}
|
|
|
</style>
|
qukaidi