|
|
@@ -374,7 +374,7 @@
|
|
|
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
|
|
|
<el-row>
|
|
|
<el-col :span="8">
|
|
|
- <el-form-item label="货权方" prop="fCorpid">
|
|
|
+ <el-form-item label="货1权方" prop="fCorpid">
|
|
|
<el-select
|
|
|
v-model="form.fCorpid"
|
|
|
filterable
|
|
|
@@ -461,7 +461,23 @@
|
|
|
|
|
|
<el-col :span="8">
|
|
|
<el-form-item label="仓库" prop="fWarehouseid">
|
|
|
- <treeselect style="width:80%" v-model="form.fWarehouseid" :options="warehousesOptions" :show-count="true" placeholder="请选择归属库区" />
|
|
|
+ <el-select
|
|
|
+ v-model="queryParams.fWarehouseid"
|
|
|
+ filterable
|
|
|
+ remote
|
|
|
+ clearable
|
|
|
+ style="width: 80%"
|
|
|
+ :remote-method="warehouseRemoteMethod"
|
|
|
+ @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>
|
|
|
@@ -621,31 +637,48 @@
|
|
|
</el-col>
|
|
|
|
|
|
<el-col :span="8">
|
|
|
- <el-form-item label="劳务公司" prop="labour">
|
|
|
- <el-input
|
|
|
+ <el-form-item label="劳务公司" prop="fLabour">
|
|
|
+ <el-select
|
|
|
style="width: 80%"
|
|
|
- v-model="form.labour"
|
|
|
-
|
|
|
+ v-model="form.fLabour"
|
|
|
+ @keyup.enter.native="handleQuery"
|
|
|
+ :remote-method="flabourRemoteMethod"
|
|
|
+ filterable
|
|
|
:disabled="browseStatus"
|
|
|
- placeholder="请输入劳务公司"
|
|
|
- />
|
|
|
+ placeholder="请输入劳务公司">
|
|
|
+ <el-option
|
|
|
+ v-for="(dict, index) in fMblnoOptions"
|
|
|
+ :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="fleet"
|
|
|
+ <el-form-item label="车队" prop="fFleet"
|
|
|
:rules="{
|
|
|
required: isrequired === 1 ? true : false,
|
|
|
message: '请选择',
|
|
|
trigger: ['blur', 'change']
|
|
|
}"
|
|
|
>
|
|
|
- <el-input
|
|
|
+ <el-select
|
|
|
style="width: 80%"
|
|
|
- v-model="form.fleet"
|
|
|
-
|
|
|
+ v-model="form.fFleet"
|
|
|
+ filterable
|
|
|
+ @keyup.enter.native="handleQuery"
|
|
|
+ :remote-method="fleetRemoteMethod"
|
|
|
:disabled="browseStatus"
|
|
|
- placeholder="请输入车队"
|
|
|
- />
|
|
|
+ placeholder="请输入车队">
|
|
|
+
|
|
|
+ <el-option
|
|
|
+ v-for="(dict, index) in fMblnoOptions"
|
|
|
+ :key="index.fId"
|
|
|
+ :label="dict.fName"
|
|
|
+ :value="dict.fId"
|
|
|
+ ></el-option>
|
|
|
+ </el-select>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
@@ -1104,27 +1137,29 @@
|
|
|
align="center"
|
|
|
label="*库位"
|
|
|
>
|
|
|
- <template slot-scope="scope">
|
|
|
- <el-select
|
|
|
- v-model="scope.row.fWarehouselocid"
|
|
|
- filterable
|
|
|
- remote
|
|
|
- :disabled="
|
|
|
- browseStatus ||
|
|
|
- scope.row.fBillstatus === 20 ||
|
|
|
- scope.row.fBillstatus === 30 ||
|
|
|
- scope.row.fBillstatus === 40
|
|
|
- "
|
|
|
- placeholder="请选择库位"
|
|
|
- >
|
|
|
- <el-option
|
|
|
- v-for="(dict, index) in kqhouseOptions"
|
|
|
- :key="index.fId"
|
|
|
- :label="dict.fName"
|
|
|
- :value="dict.fId"
|
|
|
- ></el-option>
|
|
|
- </el-select>
|
|
|
- </template>
|
|
|
+ <treeselect :disabled="browseStatus" style="width:80%" v-model="form.fWarehouselocid" :options="warehousesOptions" :show-count="true" placeholder="请选择归属库区" />
|
|
|
+
|
|
|
+ <!-- <template slot-scope="scope">-->
|
|
|
+<!-- <el-select-->
|
|
|
+<!-- v-model="scope.row.fWarehouselocid"-->
|
|
|
+<!-- filterable-->
|
|
|
+<!-- remote-->
|
|
|
+<!-- :disabled="-->
|
|
|
+<!-- browseStatus ||-->
|
|
|
+<!-- scope.row.fBillstatus === 20 ||-->
|
|
|
+<!-- scope.row.fBillstatus === 30 ||-->
|
|
|
+<!-- scope.row.fBillstatus === 40-->
|
|
|
+<!-- "-->
|
|
|
+<!-- placeholder="请选择库位"-->
|
|
|
+<!-- >-->
|
|
|
+<!-- <el-option-->
|
|
|
+<!-- v-for="(dict, index) in kqhouseOptions"-->
|
|
|
+<!-- :key="index.fId"-->
|
|
|
+<!-- :label="dict.fName"-->
|
|
|
+<!-- :value="dict.fId"-->
|
|
|
+<!-- ></el-option>-->
|
|
|
+<!-- </el-select>-->
|
|
|
+<!-- </template>-->
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
prop="fcntrtype"
|
|
|
@@ -2849,7 +2884,7 @@ import { listCorps } from "@/api/basicdata/corps";
|
|
|
|
|
|
import { listFees, getFees } from "@/api/basicdata/fees";
|
|
|
|
|
|
-import {listWarehouse, treeselect} from "@/api/basicdata/warehouse";
|
|
|
+import {listWarehouse, treeselect , listWarehousesss } from "@/api/basicdata/warehouse";
|
|
|
|
|
|
import { listArea } from "@/api/basicdata/area";
|
|
|
|
|
|
@@ -2875,7 +2910,7 @@ export default {
|
|
|
data() {
|
|
|
return {
|
|
|
// 部门树选项
|
|
|
- warehousesOptions: undefined,
|
|
|
+ warehousesOptions:[],
|
|
|
activeNames:['1'],
|
|
|
isrequired:2,
|
|
|
isrequired_s:2,
|
|
|
@@ -3105,6 +3140,8 @@ export default {
|
|
|
approVal:false,
|
|
|
// 表单参数
|
|
|
form: {
|
|
|
+ fLabour:null,
|
|
|
+ fFleet:null,
|
|
|
fBusinessType:null,
|
|
|
fItemsStatus: null,
|
|
|
fFeetunit: '2'
|
|
|
@@ -3130,6 +3167,7 @@ export default {
|
|
|
fBsdate: [{ required: true, message: " ", trigger: "blur" }],
|
|
|
fTrademodeid: [{ required: true, message: " ", trigger: "blur" }],
|
|
|
fSbu: [{ required: true, message: " ", trigger: "blur" }],
|
|
|
+ fBusinessType:[{ required: true, message: " ", trigger: "blur" }],
|
|
|
fStorekeeper: {
|
|
|
required: true,
|
|
|
message: " ",
|
|
|
@@ -3199,6 +3237,9 @@ export default {
|
|
|
activated() {
|
|
|
this.adoPt()
|
|
|
},
|
|
|
+ watch:{
|
|
|
+ 'form.fWarehouseid' : 'warehouseMethod'
|
|
|
+ },
|
|
|
methods: {
|
|
|
handleSelect(key, keyPath) {
|
|
|
console.log(key, keyPath);
|
|
|
@@ -3559,7 +3600,7 @@ export default {
|
|
|
return false
|
|
|
}
|
|
|
if (!this.form.fBusinessType) {
|
|
|
- this.$message.error('请选择货物属性!')
|
|
|
+ this.$message.error('请选择作业类型!')
|
|
|
return false
|
|
|
}
|
|
|
for (let li in this.Printinglist) {
|
|
|
@@ -3785,7 +3826,7 @@ export default {
|
|
|
this.weightList = false;
|
|
|
// this.contrOl = true
|
|
|
// 查询库区下 所有库位
|
|
|
- this.warehouseMethod();
|
|
|
+ // this.warehouseMethod();
|
|
|
},
|
|
|
/* 所有库位信息 */
|
|
|
warehouseMethod() {
|
|
|
@@ -3797,8 +3838,6 @@ export default {
|
|
|
},
|
|
|
|
|
|
|
|
|
-
|
|
|
-
|
|
|
// 导入付款信息
|
|
|
whgenlegData() {
|
|
|
if (this.dialogWhgenlegList.length === 0) {
|
|
|
@@ -4069,6 +4108,7 @@ export default {
|
|
|
this.browseStatus = status;
|
|
|
this.queryUser();
|
|
|
this.goodsRemoteMethod()
|
|
|
+ this.warehousesssMethod()
|
|
|
this.open = true;
|
|
|
this.detailsHidden = false;
|
|
|
this.dataList = [];
|
|
|
@@ -4801,6 +4841,13 @@ export default {
|
|
|
this.goodsOptions = response.rows;
|
|
|
});
|
|
|
},
|
|
|
+ /* 获取所有仓库信息 */
|
|
|
+ warehousesssMethod() {
|
|
|
+ let queryParams = { pageNum: 1, pageSize: 10, fStatus: 0, delFlag: 0 };
|
|
|
+ listWarehousesss(queryParams).then((response) => {
|
|
|
+ this.warehouseOptions = response.rows;
|
|
|
+ });
|
|
|
+ },
|
|
|
// 选择费用信息时获取计价单位
|
|
|
changeFeeId (row) {
|
|
|
for (let li in this.fWbuOptions) {
|
|
|
@@ -4821,6 +4868,26 @@ export default {
|
|
|
this.fWbuOptions = response.rows;
|
|
|
});
|
|
|
},
|
|
|
+ /* 远程模糊查询劳务公司 */
|
|
|
+ flabourRemoteMethod(name) {
|
|
|
+ if (name == null || name === "") {
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+ let queryParams = { pageNum: 1, pageSize: 10, fName: name, fTypeid: 6};
|
|
|
+ listCorps(queryParams).then((response) => {
|
|
|
+ this.fSbuOptions = response.rows;
|
|
|
+ });
|
|
|
+ },
|
|
|
+ /* 远程模糊查询车队 */
|
|
|
+ fleetRemoteMethod(name) {
|
|
|
+ if (name == null || name === "") {
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+ let queryParams = { pageNum: 1, pageSize: 10, fName: name, fTypeid: 2};
|
|
|
+ listCorps(queryParams).then((response) => {
|
|
|
+ this.fSbuOptions = response.rows;
|
|
|
+ });
|
|
|
+ },
|
|
|
/* 远程模糊查询经营单位 */
|
|
|
fSbuRemoteMethod(name) {
|
|
|
if (name == null || name === "") {
|
caojunjie