|
|
@@ -78,7 +78,6 @@
|
|
|
>
|
|
|
<el-input
|
|
|
placeholder="请输入"
|
|
|
- clearable
|
|
|
@change="handleDocumentSourceChange"
|
|
|
v-model="formData.documentSource"
|
|
|
@click.native="
|
|
|
@@ -88,7 +87,15 @@
|
|
|
? handleEom()
|
|
|
: null
|
|
|
"
|
|
|
- /></el-form-item>
|
|
|
+ >
|
|
|
+ <el-button
|
|
|
+ v-if="formData.bizType == 4 || formData.bizType == 3"
|
|
|
+ slot="append"
|
|
|
+ icon="el-icon-circle-close"
|
|
|
+ @click.stop="onClear"
|
|
|
+ ></el-button>
|
|
|
+ </el-input>
|
|
|
+ </el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="8">
|
|
|
<el-form-item label="出库物品类型" prop="extInfo.assetType">
|
|
|
@@ -194,21 +201,21 @@
|
|
|
:label="item.name"
|
|
|
:value="item.id"
|
|
|
@click.native="
|
|
|
- () => (formData.extInfo.deliveryPhone = item.phone)
|
|
|
+ () => (formData.extInfo.fromUserPhone = item.phone)
|
|
|
"
|
|
|
>
|
|
|
</el-option>
|
|
|
</el-select> </el-form-item
|
|
|
></el-col>
|
|
|
<el-col :span="8">
|
|
|
- <el-form-item label="领料人联系方式" prop="deliveryPhone">
|
|
|
+ <el-form-item label="领料人联系方式" prop="fromUserPhone">
|
|
|
<el-input
|
|
|
placeholder="请输入"
|
|
|
disabled
|
|
|
- v-model="formData.extInfo.deliveryPhone"
|
|
|
+ v-model="formData.extInfo.fromUserPhone"
|
|
|
clearable /></el-form-item
|
|
|
></el-col>
|
|
|
- <el-col :span="8">
|
|
|
+ <!-- <el-col :span="8">
|
|
|
<el-form-item label="紧急状态" prop="urgent">
|
|
|
<el-select
|
|
|
filterable
|
|
|
@@ -223,7 +230,7 @@
|
|
|
:label="item.label"
|
|
|
></el-option>
|
|
|
</el-select> </el-form-item
|
|
|
- ></el-col>
|
|
|
+ ></el-col> -->
|
|
|
<el-col :span="8">
|
|
|
<el-form-item label="审核人部门" prop="verifyDeptName">
|
|
|
<selectTree
|
|
|
@@ -558,7 +565,7 @@
|
|
|
verifyDeptCode: '', //审核部门编码
|
|
|
verifyDeptName: '', //审核部门名称
|
|
|
deliveryName: '', //送货人名称
|
|
|
- deliveryPhone: '', //送货人电话
|
|
|
+ fromUserPhone: '', //送货人电话
|
|
|
documentSource: '', //销售订单
|
|
|
urgent: '', //紧急状态
|
|
|
supplierId: '', //供应商ID
|
|
|
@@ -595,6 +602,7 @@
|
|
|
options: [],
|
|
|
loading: false,
|
|
|
onSelectTableDataVal: []
|
|
|
+ // shouldTriggerPickorder: true
|
|
|
};
|
|
|
},
|
|
|
computed: {
|
|
|
@@ -603,12 +611,6 @@
|
|
|
},
|
|
|
// 条码信息
|
|
|
materialCodeReqList() {
|
|
|
- console.log(
|
|
|
- '===',
|
|
|
- this.warehousingMaterialList
|
|
|
- .map((i) => i.warehouseLedgerDetails || [])
|
|
|
- .flat()
|
|
|
- );
|
|
|
return this.warehousingMaterialList
|
|
|
.map((i) => i.warehouseLedgerDetails || [])
|
|
|
.flat();
|
|
|
@@ -618,6 +620,11 @@
|
|
|
this.initData();
|
|
|
},
|
|
|
methods: {
|
|
|
+ onClear() {
|
|
|
+ this.formData.documentSource = '';
|
|
|
+ this.warehousingMaterialList = [];
|
|
|
+ this.$forceUpdate();
|
|
|
+ },
|
|
|
eomSuccess(row) {
|
|
|
this.formData.documentSource = row.orderNo;
|
|
|
this.onSelectTableData(row.tableData, 1);
|
|
|
@@ -671,6 +678,7 @@
|
|
|
this.$refs.pickOrderRef.open();
|
|
|
},
|
|
|
async handleDocumentSourceChange() {
|
|
|
+ // this.formData.documentSource = '';
|
|
|
if (!this.formData.documentSource) {
|
|
|
if (this.formData.bizType == 4) {
|
|
|
this.warehousingMaterialList = [];
|
|
|
@@ -725,7 +733,6 @@
|
|
|
}
|
|
|
});
|
|
|
}
|
|
|
-
|
|
|
loading.close();
|
|
|
},
|
|
|
// 备品备件来源单号
|
|
|
@@ -906,7 +913,10 @@
|
|
|
name: it.name,
|
|
|
pathIds: it.pathIds,
|
|
|
unit: it.unit,
|
|
|
- packageNo: it.num
|
|
|
+ packageNo: it.packageNo,
|
|
|
+ minPackingCount: it.minPackingCount,
|
|
|
+ procureTime: it.procureTime,
|
|
|
+ produceTime: it.produceTime
|
|
|
// num: it.minPackingCount
|
|
|
};
|
|
|
});
|
|
|
@@ -918,7 +928,7 @@
|
|
|
arr[key].count = arr[key].outInNum;
|
|
|
}
|
|
|
obj.outInDetailAddPOList = arr;
|
|
|
-
|
|
|
+ obj.extInfo.documentSource = obj.documentSource;
|
|
|
this.saveLoading = true;
|
|
|
|
|
|
// console.log('明细', this.warehousingMaterialList);
|
|
|
@@ -937,18 +947,18 @@
|
|
|
// delete newObj.inOutAddPO.extInfo;
|
|
|
console.log('2222', obj);
|
|
|
|
|
|
- // const res = await outin.save(obj);
|
|
|
- // if (res.code == 0) {
|
|
|
- // this.$message.success('保存成功！');
|
|
|
- // }
|
|
|
+ const res = await outin.save(obj);
|
|
|
+ if (res.code == 0) {
|
|
|
+ this.$message.success('保存成功！');
|
|
|
+ }
|
|
|
|
|
|
- // this.saveLoading = false;
|
|
|
- // this.$router.push('/warehouseManagement/outgoingManagement');
|
|
|
+ this.saveLoading = false;
|
|
|
+ this.$router.push('/warehouseManagement/outgoingManagement');
|
|
|
|
|
|
- // if (res?.success) {
|
|
|
- // this.$message.success('保存成功！');
|
|
|
- // this.$router.go(-1);
|
|
|
- // }
|
|
|
+ if (res?.success) {
|
|
|
+ this.$message.success('保存成功！');
|
|
|
+ this.$router.go(-1);
|
|
|
+ }
|
|
|
}
|
|
|
});
|
|
|
},
|
|
|
@@ -1043,12 +1053,16 @@
|
|
|
// /
|
|
|
// const res111 = await warehouseDefinition.list();
|
|
|
// this.warehouseList = res111.list;
|
|
|
+ // console.log('res=====', res);
|
|
|
const info = JSON.parse(localStorage.getItem('info'));
|
|
|
- let obj = res.find((item) => item.id === info.deptId);
|
|
|
+ let obj = res.find(
|
|
|
+ (item) => item.id === info.deptId[info.deptId.length - 1]
|
|
|
+ );
|
|
|
+ // console.log('obj=====', obj);
|
|
|
this.formData.extInfo.deptName = obj.name;
|
|
|
this.formData.extInfo.deptCode = obj.id;
|
|
|
this.formData.extInfo.createUserName = info.name;
|
|
|
- this.formData.createUserId = info.id;
|
|
|
+ this.formData.createUserId = info.userId;
|
|
|
},
|
|
|
addStock() {
|
|
|
if (!this.title) return this.$message.error('请选择出库产品类型');
|
huang_an