|
|
@@ -430,10 +430,26 @@
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="8">
|
|
|
- <el-form-item label="调入仓库" prop="fWarehouseid">
|
|
|
- <treeselect :disabled="browseStatus" style="width:80%" v-model="form.fWarehouseid" :options="warehousesOptions" :show-count="true" placeholder="请选择归属库区" />
|
|
|
+ <el-form-item label="仓库" prop="fWarehouseid">
|
|
|
+ <el-select
|
|
|
+ v-model="form.fWarehouseid"
|
|
|
+ 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-row>
|
|
|
<el-row>
|
|
|
<el-col :span="8">
|
|
|
@@ -603,7 +619,7 @@
|
|
|
v-model="form.fLabour"
|
|
|
@keyup.enter.native="handleQuery"
|
|
|
:remote-method="flabourRemoteMethod"
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="contrOl"
|
|
|
placeholder="请输入劳务公司"
|
|
|
>
|
|
|
<el-option
|
|
|
@@ -628,7 +644,7 @@
|
|
|
v-model="form.fFleet"
|
|
|
@keyup.enter.native="handleQuery"
|
|
|
:remote-method="fleetRemoteMethod"
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="contrOl"
|
|
|
placeholder="请输入车队"
|
|
|
>
|
|
|
<el-option
|
|
|
@@ -890,50 +906,32 @@
|
|
|
label="提单号"
|
|
|
>
|
|
|
</el-table-column>
|
|
|
+
|
|
|
<el-table-column
|
|
|
prop="fWarehouseids"
|
|
|
header-align="center"
|
|
|
- width="150px"
|
|
|
align="center"
|
|
|
- label="*原仓库"
|
|
|
- >
|
|
|
- </el-table-column>
|
|
|
- <el-table-column
|
|
|
- prop="fWarehouselocids"
|
|
|
- header-align="center"
|
|
|
- width="150px"
|
|
|
- align="center"
|
|
|
- label="*原库区"
|
|
|
+ label="库位"
|
|
|
>
|
|
|
</el-table-column>
|
|
|
+
|
|
|
<el-table-column
|
|
|
- prop="fTransferWarehouselocid"
|
|
|
+ prop="fWarehouseInformation"
|
|
|
header-align="center"
|
|
|
- width="150px"
|
|
|
+ width="240px"
|
|
|
align="center"
|
|
|
- label="*调入库区"
|
|
|
+ label="*调入库位"
|
|
|
>
|
|
|
<template slot-scope="scope">
|
|
|
- <el-select
|
|
|
- v-model="scope.row.fTransferWarehouselocid"
|
|
|
- :disabled="browseStatus || scope.row.fBillstatus === 40 || !form.fWarehouseid"
|
|
|
- filterable
|
|
|
- remote
|
|
|
- style="width: 80%"
|
|
|
- @change="kqhouseRemoteMethod"
|
|
|
- :remote-method="kqhouseRemoteMethod"
|
|
|
- placeholder="请输入模糊查找"
|
|
|
+ <el-input
|
|
|
+ placeholder="请选择"
|
|
|
+ :disabled="!form.fWarehouseid || browseStatus || scope.row.fBillstatus === 20 || scope.row.fBillstatus === 30 || scope.row.fBillstatus === 40"
|
|
|
+ v-model="scope.row.fWarehouseInformation"
|
|
|
+ @focus="getTreeselect(scope)"
|
|
|
>
|
|
|
- <el-option
|
|
|
- v-for="(dict, index) in kqhouseOptions"
|
|
|
- :key="index.fId"
|
|
|
- :label="dict.fName"
|
|
|
- :value="dict.fId"
|
|
|
- ></el-option>
|
|
|
- </el-select>
|
|
|
+ </el-input>
|
|
|
</template>
|
|
|
- </el-table-column>
|
|
|
- <el-table-column
|
|
|
+ </el-table-column> <el-table-column
|
|
|
prop="fPlanqty"
|
|
|
header-align="center"
|
|
|
align="center"
|
|
|
@@ -1430,6 +1428,28 @@
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
+ prop="fBusinessType"
|
|
|
+ header-align="center"
|
|
|
+ align="center"
|
|
|
+ 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>
|
|
|
+ </el-table-column>
|
|
|
+
|
|
|
+ <el-table-column
|
|
|
prop="fFeeunitid"
|
|
|
header-align="center"
|
|
|
align="center"
|
|
|
@@ -1507,6 +1527,29 @@
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
+ prop="fStltypeid"
|
|
|
+ header-align="center"
|
|
|
+ align="center"
|
|
|
+ width="130px"
|
|
|
+ label="结算方式"
|
|
|
+ >
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <el-select
|
|
|
+ v-model="scope.row.fStltypeid"
|
|
|
+ placeholder="请选择结算表票结、月结"
|
|
|
+ :disabled="browseStatus"
|
|
|
+ >
|
|
|
+ <el-option
|
|
|
+ v-for="dict in fStltypeidOptions"
|
|
|
+ :key="dict.dictValue"
|
|
|
+ :label="dict.dictLabel"
|
|
|
+ :value="parseInt(dict.dictValue)"
|
|
|
+ ></el-option>
|
|
|
+ </el-select>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+
|
|
|
+ <el-table-column
|
|
|
prop="fCurrency"
|
|
|
header-align="center"
|
|
|
align="center"
|
|
|
@@ -1721,6 +1764,28 @@
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
+ prop="fBusinessType"
|
|
|
+ header-align="center"
|
|
|
+ align="center"
|
|
|
+ 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>
|
|
|
+ </el-table-column>
|
|
|
+
|
|
|
+ <el-table-column
|
|
|
prop="fFeeunitid"
|
|
|
header-align="center"
|
|
|
align="center"
|
|
|
@@ -1798,6 +1863,29 @@
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
+ prop="fStltypeid"
|
|
|
+ header-align="center"
|
|
|
+ align="center"
|
|
|
+ width="130px"
|
|
|
+ label="结算方式"
|
|
|
+ >
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <el-select
|
|
|
+ v-model="scope.row.fStltypeid"
|
|
|
+ placeholder="请选择结算表票结、月结"
|
|
|
+ :disabled="browseStatus"
|
|
|
+ >
|
|
|
+ <el-option
|
|
|
+ v-for="dict in fStltypeidOptions"
|
|
|
+ :key="dict.dictValue"
|
|
|
+ :label="dict.dictLabel"
|
|
|
+ :value="parseInt(dict.dictValue)"
|
|
|
+ ></el-option>
|
|
|
+ </el-select>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+
|
|
|
+ <el-table-column
|
|
|
prop="fCurrency"
|
|
|
header-align="center"
|
|
|
align="center"
|
|
|
@@ -2003,13 +2091,6 @@
|
|
|
>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
- prop="fWarehouseLocationids"
|
|
|
- header-align="center"
|
|
|
- align="center"
|
|
|
- label="库区"
|
|
|
- >
|
|
|
- </el-table-column>
|
|
|
- <el-table-column
|
|
|
prop="fMarks"
|
|
|
header-align="center"
|
|
|
align="center"
|
|
|
@@ -2200,6 +2281,20 @@
|
|
|
</div>
|
|
|
</el-dialog>
|
|
|
</el-dialog>
|
|
|
+ <el-dialog
|
|
|
+ title="选择库位"
|
|
|
+ :data="treeselectList"
|
|
|
+ :visible.sync="choiceWarehouse"
|
|
|
+ width="30%"
|
|
|
+ :before-close="hanDleclose">
|
|
|
+ <treeselect v-model="treeselectList.fWarehouselocid" @select="getAlltree" :options="fWarehouseidOptions" :show-count="true" :disable-branch-nodes="true" placeholder="请选择归属库区" />
|
|
|
+ <div>{{Warehouse}}</div>
|
|
|
+ <span slot="footer" class="dialog-footer">
|
|
|
+ <el-button @click="choiceWarehouse = false">取 消</el-button>
|
|
|
+ <el-button type="primary" @click="confirm">确 定</el-button>
|
|
|
+ </span>
|
|
|
+ </el-dialog>
|
|
|
+
|
|
|
</div>
|
|
|
</template>
|
|
|
|
|
|
@@ -2229,7 +2324,7 @@ import { listCorps } from "@/api/basicdata/corps";
|
|
|
|
|
|
import { listFees, getFees } from "@/api/basicdata/fees";
|
|
|
|
|
|
-import { listWarehouse, treeselect } from '@/api/basicdata/warehouse'
|
|
|
+import { listWarehouse, listWarehousesss, treeselect } from '@/api/basicdata/warehouse'
|
|
|
|
|
|
import { listArea } from "@/api/basicdata/area";
|
|
|
|
|
|
@@ -2256,8 +2351,18 @@ export default {
|
|
|
},
|
|
|
data() {
|
|
|
return {
|
|
|
+ //控制选择库位弹出
|
|
|
+ choiceWarehouse:false,
|
|
|
+ information:'',
|
|
|
+ informationId:'',
|
|
|
+ inDex:'',
|
|
|
+ Warehouse:'',
|
|
|
+ //树状下来库位表
|
|
|
+ treeselectList:{
|
|
|
+ fWarehouselocid:null
|
|
|
+ },
|
|
|
//仓库树状图
|
|
|
- warehousesOptions:[],
|
|
|
+ fWarehouseidOptions:[],
|
|
|
activeNames:['1'],
|
|
|
//作业类型校验
|
|
|
isrequired:2,
|
|
|
@@ -2380,6 +2485,8 @@ export default {
|
|
|
fBilltypeOptions: [],
|
|
|
// 状态(数据字典),N 入字典
|
|
|
fBillstatusOptions: [],
|
|
|
+ //结算方式对应字典表
|
|
|
+ fStltypeidOptions:[],
|
|
|
// 费用名称
|
|
|
fWbuOptions: [],
|
|
|
// 计价单位
|
|
|
@@ -2469,6 +2576,7 @@ export default {
|
|
|
fWarehouseid: [{ required: true, message: " ", trigger: "blur" }],
|
|
|
fPlannetweight: [{ required: true, message: " ", trigger: "blur"},],
|
|
|
fPlangrossweight: [{ required: true, message: " ", trigger: "blur"},],
|
|
|
+ fBusinessType: [{ required: true, message: " ", trigger: "blur"},],
|
|
|
fbillingway: [
|
|
|
{
|
|
|
required: true,
|
|
|
@@ -2518,6 +2626,9 @@ 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.register()
|
|
|
},
|
|
|
activated(){
|
|
|
@@ -2528,10 +2639,23 @@ export default {
|
|
|
// },
|
|
|
methods: {
|
|
|
/** 查询部门下拉树结构 */
|
|
|
- getTreeselect() {
|
|
|
- treeselect().then(response => {
|
|
|
- this.warehousesOptions = response.data;
|
|
|
- });
|
|
|
+ getTreeselect(row) {
|
|
|
+ this.treeselectList.fWarehouselocid = null
|
|
|
+ this.inDex = row.$index
|
|
|
+ this.choiceWarehouse = true
|
|
|
+ treeselect(this.form.fWarehouseid).then(response => {
|
|
|
+ this.fWarehouseidOptions = response.data;
|
|
|
+ })
|
|
|
+ this.Warehouse = this.dataList[this.inDex].fWarehouseInformation
|
|
|
+ },
|
|
|
+ getAlltree(tree){
|
|
|
+ this.information = tree.fWarehouseInformation
|
|
|
+ this.informationId = tree.id
|
|
|
+ },
|
|
|
+ confirm(){
|
|
|
+ this.$set(this.dataList[this.inDex], 'fWarehouseInformation', this.information)
|
|
|
+ this.$set(this.dataList[this.inDex], 'fWarehouselocid', this.informationId)
|
|
|
+ this.choiceWarehouse = false
|
|
|
},
|
|
|
// 撤销审核
|
|
|
backrRconciliation(){
|
|
|
@@ -2649,7 +2773,14 @@ export default {
|
|
|
|
|
|
}
|
|
|
},
|
|
|
-
|
|
|
+ //树状库位下拉关闭询问
|
|
|
+ hanDleclose(done){
|
|
|
+ this.$confirm('确认关闭？')
|
|
|
+ .then(_ => {
|
|
|
+ done();
|
|
|
+ })
|
|
|
+ .catch(_ => {});
|
|
|
+ },
|
|
|
homepaGe(){
|
|
|
let view = {
|
|
|
fullPath: "/business/stockTransfer",
|
|
|
@@ -2880,7 +3011,9 @@ export default {
|
|
|
fTaxrate: this.fTaxrate,
|
|
|
fMblno:this.form.fMblno,
|
|
|
fProductName:this.form.fProductName,
|
|
|
- fMarks:this.form.fMarks
|
|
|
+ fMarks:this.form.fMarks,
|
|
|
+ fBusinessType:this.$set(this.warehouseCrList,'fBusinessType',this.form.fBusinessType)
|
|
|
+
|
|
|
})
|
|
|
} else {
|
|
|
this.warehouseDrList.push({
|
|
|
@@ -2895,7 +3028,8 @@ export default {
|
|
|
fTaxrate: this.fTaxrate,
|
|
|
fMblno:this.form.fMblno,
|
|
|
fProductName:this.form.fProductName,
|
|
|
- fMarks:this.form.fMarks
|
|
|
+ fMarks:this.form.fMarks,
|
|
|
+ fBusinessType:this.$set(this.warehouseDrList,'fBusinessType',this.form.fBusinessType)
|
|
|
})
|
|
|
}
|
|
|
}
|
|
|
@@ -3057,8 +3191,8 @@ export default {
|
|
|
showEditDialog_ss() {
|
|
|
if (this.printinglist.length > 0) {
|
|
|
for (let warehouseCr in this.printinglist) {
|
|
|
- if (!this.printinglist[warehouseCr].fTransferWarehouselocid) {
|
|
|
- this.$message.error('请选择调拨库区')
|
|
|
+ if (!this.printinglist[warehouseCr].fWarehouseInformation) {
|
|
|
+ this.$message.error('请选择调入库位')
|
|
|
return false
|
|
|
} else if (!this.printinglist[warehouseCr].fDriverName || this.printinglist[warehouseCr].fDriverName !== this.printinglist[0].fDriverName) {
|
|
|
this.$message.error('请选择相同司机名')
|
|
|
@@ -3273,9 +3407,10 @@ export default {
|
|
|
},
|
|
|
/** 新增按钮操作 */
|
|
|
handleAdd(status) {
|
|
|
- this.getTreeselect()
|
|
|
+ this.warehousesssMethod()
|
|
|
this.reset();
|
|
|
this.browseStatus = status;
|
|
|
+ this.contrOl = status;
|
|
|
this.notChange = false
|
|
|
this.queryUser();
|
|
|
this.open = true;
|
|
|
@@ -3288,10 +3423,10 @@ export default {
|
|
|
this.formBrowseStatus = false;
|
|
|
},
|
|
|
check_s(row,status){
|
|
|
- this.getTreeselect()
|
|
|
// this.disappear = true
|
|
|
// this.notChange = true
|
|
|
this.reset();
|
|
|
+ this.contrOl = true
|
|
|
this.browseStatus = status;
|
|
|
this.detailsHidden = false;
|
|
|
let data = row || this.ids;
|
|
|
@@ -3371,7 +3506,6 @@ export default {
|
|
|
},
|
|
|
|
|
|
check(row,status,res){
|
|
|
- this.getTreeselect()
|
|
|
this.reset();
|
|
|
this.disappear = false
|
|
|
this.notChange = true
|
|
|
@@ -3457,9 +3591,10 @@ export default {
|
|
|
},
|
|
|
/** 修改按钮操作 */
|
|
|
handleUpdate(row, status) {
|
|
|
- this.getTreeselect()
|
|
|
this.reset();
|
|
|
+
|
|
|
this.browseStatus = status;
|
|
|
+ this.contrOl = status
|
|
|
this.detailsHidden = false;
|
|
|
this.formBrowseStatus = false;
|
|
|
let fId = row.fId || this.ids;
|
|
|
@@ -3479,11 +3614,6 @@ export default {
|
|
|
this.approvalStatus = true
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
if (response.data.corps) {
|
|
|
this.fMblnoOptions = response.data.corps;
|
|
|
this.KHblnoOptions = response.data.corps;
|
|
|
@@ -3496,10 +3626,6 @@ export default {
|
|
|
this.warehouseOptions = response.data.warehouse;
|
|
|
}
|
|
|
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
if (response.data.warehouseBillsItem) {
|
|
|
this.dataList = response.data.warehouseBillsItem;
|
|
|
for (let list in this.dataList) {
|
|
|
@@ -3513,10 +3639,6 @@ export default {
|
|
|
this.$set(this.dataList[list], 'fBusinessType', this.dataList[list].fBusinessType + '')
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
if (response.data.enclosures) {
|
|
|
this.relevantAttachments = response.data.enclosures;
|
|
|
}
|
|
|
@@ -3743,10 +3865,10 @@ export default {
|
|
|
if (!this.dataListSelection[warehouse].fGrossweight) {
|
|
|
this.$message.error("请选择调拨毛重");
|
|
|
return false;
|
|
|
- } else if (!this.dataListSelection[warehouse].fTransferWarehouselocid) {
|
|
|
- this.$message.error("请选择调拨库区");
|
|
|
+ } else if (!this.dataListSelection[warehouse].fWarehouseInformation) {
|
|
|
+ this.$message.error("请选择调入库位");
|
|
|
return false;
|
|
|
- } else if (this.dataListSelection[warehouse].fTransferWarehouselocid === this.dataListSelection[warehouse].fWarehouselocids) {
|
|
|
+ } else if (this.dataListSelection[warehouse].fWarehouseInformation === this.dataListSelection[warehouse].fWarehouselocids) {
|
|
|
this.$message.error("调拨库区不得与原库区相同");
|
|
|
return false;
|
|
|
} else if (!this.dataListSelection[warehouse].fNetweight) {
|
|
|
@@ -3985,6 +4107,7 @@ export default {
|
|
|
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))
|
|
|
@@ -4043,8 +4166,8 @@ export default {
|
|
|
this.$message.error('请输入调拨毛重!')
|
|
|
return false
|
|
|
}
|
|
|
- if (!this.dataList[list].fTransferWarehouselocid || this.dataList[list].fTransferWarehouselocid === 0) {
|
|
|
- this.$message.error('请选择调拨毛重!')
|
|
|
+ if (!this.dataList[list].fWarehouseInformation || this.dataList[list].fWarehouseInformation === 0) {
|
|
|
+ this.$message.error('请选择调拨仓库!')
|
|
|
return false
|
|
|
}
|
|
|
if (this.dataList[list].fBillstatus !== 40) {
|
|
|
@@ -4181,6 +4304,13 @@ export default {
|
|
|
}
|
|
|
}
|
|
|
},
|
|
|
+ /* 获取所有仓库信息 */
|
|
|
+ warehousesssMethod() {
|
|
|
+ let queryParams = { pageNum: 1, pageSize: 10, fStatus: 0, delFlag: 0 };
|
|
|
+ listWarehousesss(queryParams).then((response) => {
|
|
|
+ this.warehouseOptions = response.rows;
|
|
|
+ });
|
|
|
+ },
|
|
|
/* 远程模糊查询劳务公司 */
|
|
|
flabourRemoteMethod(name) {
|
|
|
if (name == null || name === "") {
|
wengyuwen