|
@@ -212,12 +212,13 @@
|
|
|
style="width: 260px"
|
|
style="width: 260px"
|
|
|
></el-input>
|
|
></el-input>
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
- <el-form-item label="请托到:" prop="taskIds">
|
|
|
|
|
|
|
+ <el-form-item label="请托到:" prop="taskIdes">
|
|
|
<el-select
|
|
<el-select
|
|
|
- v-model="taskIds"
|
|
|
|
|
|
|
+ v-model="attributeData.taskIdes"
|
|
|
placeholder="请选择"
|
|
placeholder="请选择"
|
|
|
style="width: 260px"
|
|
style="width: 260px"
|
|
|
@change="changeTaskId"
|
|
@change="changeTaskId"
|
|
|
|
|
+ multiple
|
|
|
>
|
|
>
|
|
|
<el-option
|
|
<el-option
|
|
|
v-for="item in newStepsList"
|
|
v-for="item in newStepsList"
|
|
@@ -269,7 +270,7 @@
|
|
|
|
|
|
|
|
<el-form-item label="请托单位:">
|
|
<el-form-item label="请托单位:">
|
|
|
<el-select
|
|
<el-select
|
|
|
- v-model="attributeData.taskIds"
|
|
|
|
|
|
|
+ v-model="attributeData.factoriesId"
|
|
|
placeholder="请选择"
|
|
placeholder="请选择"
|
|
|
style="width: 260px"
|
|
style="width: 260px"
|
|
|
@change="changeTaskId"
|
|
@change="changeTaskId"
|
|
@@ -314,7 +315,7 @@
|
|
|
<el-form-item label="交付交期:" prop="requireDeliveryTime">
|
|
<el-form-item label="交付交期:" prop="requireDeliveryTime">
|
|
|
<el-date-picker
|
|
<el-date-picker
|
|
|
v-model="attributeData.requireDeliveryTime"
|
|
v-model="attributeData.requireDeliveryTime"
|
|
|
- value-format="yyyy-MM-dd HH:mm:ss"
|
|
|
|
|
|
|
+ value-format="yyyy-MM-dd"
|
|
|
style="width: 260px"
|
|
style="width: 260px"
|
|
|
type="date"
|
|
type="date"
|
|
|
placeholder="选择日期"
|
|
placeholder="选择日期"
|
|
@@ -362,7 +363,9 @@
|
|
|
produceRoutingId: '', //工艺路线id
|
|
produceRoutingId: '', //工艺路线id
|
|
|
supplierId: '', //供应商id
|
|
supplierId: '', //供应商id
|
|
|
supplierName: '',
|
|
supplierName: '',
|
|
|
- taskIdes: []
|
|
|
|
|
|
|
+ taskIdes: [],
|
|
|
|
|
+ factoriesId: '',
|
|
|
|
|
+ factoriesName: ''
|
|
|
},
|
|
},
|
|
|
isInWarehouse: true,
|
|
isInWarehouse: true,
|
|
|
produceList: [],
|
|
produceList: [],
|
|
@@ -532,9 +535,11 @@
|
|
|
handleClick(tab, event) {
|
|
handleClick(tab, event) {
|
|
|
this.activeName = tab._props.name;
|
|
this.activeName = tab._props.name;
|
|
|
if (this.activeName == '1') {
|
|
if (this.activeName == '1') {
|
|
|
- this.attributeData.name = this.outsourceFormVal.name + '委托';
|
|
|
|
|
|
|
+ this.resetData();
|
|
|
|
|
+ this.attributeData.name = this.taskName + '委托';
|
|
|
} else if (this.activeName == '2') {
|
|
} else if (this.activeName == '2') {
|
|
|
- this.attributeData.name = this.outsourceFormVal.name + '请托';
|
|
|
|
|
|
|
+ this.resetData();
|
|
|
|
|
+ this.attributeData.name = this.taskName + '请托';
|
|
|
}
|
|
}
|
|
|
},
|
|
},
|
|
|
|
|
|
|
@@ -596,12 +601,26 @@
|
|
|
}
|
|
}
|
|
|
},
|
|
},
|
|
|
|
|
|
|
|
|
|
+ resetData() {
|
|
|
|
|
+ this.attributeData.type = '';
|
|
|
|
|
+ this.attributeData.sceneText = '';
|
|
|
|
|
+ this.attributeData.taskIds = '';
|
|
|
|
|
+ this.attributeData.isFirstTask = '';
|
|
|
|
|
+ this.attributeData.clientEnvironmentId = 1;
|
|
|
|
|
+ this.attributeData.requireDeliveryTime = '';
|
|
|
|
|
+ this.attributeData.warehouseId = '';
|
|
|
|
|
+ this.attributeData.produceRoutingId = '';
|
|
|
|
|
+ this.attributeData.supplierId = '';
|
|
|
|
|
+ this.attributeData.taskIdes = [];
|
|
|
|
|
+ this.attributeData.factoriesId = '';
|
|
|
|
|
+ },
|
|
|
|
|
+
|
|
|
//跳转
|
|
//跳转
|
|
|
|
|
|
|
|
confirm() {
|
|
confirm() {
|
|
|
this.$refs.form.validate((valid) => {
|
|
this.$refs.form.validate((valid) => {
|
|
|
if (valid) {
|
|
if (valid) {
|
|
|
- console.log(this.attributeData, '11111187887877');
|
|
|
|
|
|
|
+ // if (this.activeName == '1') {
|
|
|
if (this.attributeData.supplierId) {
|
|
if (this.attributeData.supplierId) {
|
|
|
const obj = this.gysList.find(
|
|
const obj = this.gysList.find(
|
|
|
(item) => item.id === this.attributeData.supplierId
|
|
(item) => item.id === this.attributeData.supplierId
|
|
@@ -609,7 +628,17 @@
|
|
|
this.attributeData.supplierName = obj ? obj.name : '';
|
|
this.attributeData.supplierName = obj ? obj.name : '';
|
|
|
}
|
|
}
|
|
|
this.attributeData.taskIds = this.attributeData.taskIdes.join(',');
|
|
this.attributeData.taskIds = this.attributeData.taskIdes.join(',');
|
|
|
- this.$emit('changePlugIn', this.attributeData);
|
|
|
|
|
|
|
+ this.$emit('changePlugIn', this.attributeData, this.activeName);
|
|
|
|
|
+ // } else if (this.activeName == '2') {
|
|
|
|
|
+ // const obj = this.factoryList.find(
|
|
|
|
|
+ // (item) => item.id === this.attributeData.factoriesId
|
|
|
|
|
+ // );
|
|
|
|
|
+ // this.attributeData.factoriesName = obj ? obj.name : '';
|
|
|
|
|
+ // this.attributeData.taskIds =
|
|
|
|
|
+ // this.attributeData.taskIdes.join(',');
|
|
|
|
|
+ // console.log(this.attributeData);
|
|
|
|
|
+ // this.$emit('changePlugIn', this.attributeData, this.activeName);
|
|
|
|
|
+ // }
|
|
|
} else {
|
|
} else {
|
|
|
console.log('error submit!!');
|
|
console.log('error submit!!');
|
|
|
return false;
|
|
return false;
|