|
@@ -108,6 +108,7 @@
|
|
|
placeholder="请输入"
|
|
placeholder="请输入"
|
|
|
v-model="formData.extInfo.documentSource"
|
|
v-model="formData.extInfo.documentSource"
|
|
|
@click.native="handlePicker()"
|
|
@click.native="handlePicker()"
|
|
|
|
|
+ :disabled="isTask"
|
|
|
>
|
|
>
|
|
|
<el-button
|
|
<el-button
|
|
|
slot="append"
|
|
slot="append"
|
|
@@ -1099,7 +1100,8 @@
|
|
|
<el-button type="primary" @click="handleSave" :loading="saveLoading"
|
|
<el-button type="primary" @click="handleSave" :loading="saveLoading"
|
|
|
>保存</el-button
|
|
>保存</el-button
|
|
|
>
|
|
>
|
|
|
- <el-button @click="$router.go(-1)">返回</el-button>
|
|
|
|
|
|
|
+ <el-button @click="$router.go(-1)" v-if="!isTask">返回</el-button>
|
|
|
|
|
+ <el-button @click="cancel" v-if="isTask">返回</el-button>
|
|
|
</div>
|
|
</div>
|
|
|
</el-card>
|
|
</el-card>
|
|
|
|
|
|
|
@@ -1169,7 +1171,9 @@
|
|
|
import { tableHeader } from '../handleTask/components/inoutBound/common';
|
|
import { tableHeader } from '../handleTask/components/inoutBound/common';
|
|
|
import { getCode } from '@/api/codeManagement/index.js';
|
|
import { getCode } from '@/api/codeManagement/index.js';
|
|
|
import { number } from 'echarts/core';
|
|
import { number } from 'echarts/core';
|
|
|
- import { purchaseorderGetById, contactlink } from '@/api/mes';
|
|
|
|
|
|
|
+ // import { purchaseorderGetById, contactlink } from '@/api/mes';
|
|
|
|
|
+ import { getReceiveSaleOrderrecordDetail } from '@/api/bpm/components/purchasingManage/purchaseorderreceive';
|
|
|
|
|
+
|
|
|
export default {
|
|
export default {
|
|
|
components: {
|
|
components: {
|
|
|
selectUpload,
|
|
selectUpload,
|
|
@@ -1182,6 +1186,7 @@
|
|
|
},
|
|
},
|
|
|
data() {
|
|
data() {
|
|
|
return {
|
|
return {
|
|
|
|
|
+ isTask:false,
|
|
|
isWeight: true,
|
|
isWeight: true,
|
|
|
resultArray: [],
|
|
resultArray: [],
|
|
|
isDetail: false,
|
|
isDetail: false,
|
|
@@ -1274,6 +1279,9 @@
|
|
|
this.initData();
|
|
this.initData();
|
|
|
},
|
|
},
|
|
|
methods: {
|
|
methods: {
|
|
|
|
|
+ cancel(){
|
|
|
|
|
+ this.$emit('cancel');
|
|
|
|
|
+ },
|
|
|
weightInput(value, row) {
|
|
weightInput(value, row) {
|
|
|
const newValue = value.replace(/[^\d.]/g, ''); // 保留数字和小数点
|
|
const newValue = value.replace(/[^\d.]/g, ''); // 保留数字和小数点
|
|
|
const decimalCount = (newValue.match(/\./g) || []).length; // 计算小数点的个数
|
|
const decimalCount = (newValue.match(/\./g) || []).length; // 计算小数点的个数
|
|
@@ -1378,16 +1386,18 @@
|
|
|
this.contactList = data.data;
|
|
this.contactList = data.data;
|
|
|
},
|
|
},
|
|
|
async pickerSuccess(row) {
|
|
async pickerSuccess(row) {
|
|
|
|
|
+ this.formData.bizType='2'
|
|
|
|
|
+ this.isTask=true
|
|
|
this.pickerRow = row;
|
|
this.pickerRow = row;
|
|
|
this.formData.extInfo.documentSource = row.orderNo;
|
|
this.formData.extInfo.documentSource = row.orderNo;
|
|
|
this.formData.clientName = row.partaName;
|
|
this.formData.clientName = row.partaName;
|
|
|
this.formData.clientCode = row.partaId;
|
|
this.formData.clientCode = row.partaId;
|
|
|
- this.formData.extInfo.supplierName = row.partbName;
|
|
|
|
|
- this.formData.extInfo.supplierId = row.partbId;
|
|
|
|
|
- await this.searchContact(row.partbId);
|
|
|
|
|
- const data = await purchaseorderGetById(row.id);
|
|
|
|
|
|
|
+ this.formData.extInfo.supplierName = row.supplierName;
|
|
|
|
|
+ this.formData.extInfo.supplierId = row.supplierId;
|
|
|
|
|
+ // await this.searchContact(row.partbId);
|
|
|
|
|
+ const data = await getReceiveSaleOrderrecordDetail(row.id);
|
|
|
if (this.warehousingMaterialList.length == 0) {
|
|
if (this.warehousingMaterialList.length == 0) {
|
|
|
- let list = data.data.productList.map((item) => {
|
|
|
|
|
|
|
+ let list = data.productList.map((item) => {
|
|
|
return {
|
|
return {
|
|
|
...item,
|
|
...item,
|
|
|
assetName: item.productName,
|
|
assetName: item.productName,
|
|
@@ -1963,6 +1973,7 @@
|
|
|
const res = await outin.save(obj);
|
|
const res = await outin.save(obj);
|
|
|
if (res.code == 0) {
|
|
if (res.code == 0) {
|
|
|
this.$message.success('保存成功!');
|
|
this.$message.success('保存成功!');
|
|
|
|
|
+ this.$emit('handleAudit',1)
|
|
|
}
|
|
}
|
|
|
} catch (error) {
|
|
} catch (error) {
|
|
|
console.error('保存失败:', error);
|
|
console.error('保存失败:', error);
|