|
@@ -146,6 +146,16 @@
|
|
|
<el-input disabled v-model="form.makerName" />
|
|
<el-input disabled v-model="form.makerName" />
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
</el-col>
|
|
</el-col>
|
|
|
|
|
+ <el-col :span="12">
|
|
|
|
|
+ <el-form-item prop="productionRequirements" label="生产要求">
|
|
|
|
|
+ <el-input
|
|
|
|
|
+ clearable
|
|
|
|
|
+ v-model="form.productionRequirements"
|
|
|
|
|
+ placeholder="请输入"
|
|
|
|
|
+ type="textarea"
|
|
|
|
|
+ />
|
|
|
|
|
+ </el-form-item>
|
|
|
|
|
+ </el-col>
|
|
|
</el-row>
|
|
</el-row>
|
|
|
</el-form>
|
|
</el-form>
|
|
|
<el-tabs v-model="activeName" style="margin-top: 15px" type="border-card">
|
|
<el-tabs v-model="activeName" style="margin-top: 15px" type="border-card">
|
|
@@ -378,6 +388,7 @@
|
|
|
//选择订单回调
|
|
//选择订单回调
|
|
|
changeOrder(obj) {
|
|
changeOrder(obj) {
|
|
|
this.form = Object.assign({}, this.form, {
|
|
this.form = Object.assign({}, this.form, {
|
|
|
|
|
+ productionRequirements: obj.map((item) => item.productionRequirements).toString(),
|
|
|
orderIds: obj.map((item) => item.id).toString(),
|
|
orderIds: obj.map((item) => item.id).toString(),
|
|
|
orderNo: obj.map((item) => item.orderNo).toString()
|
|
orderNo: obj.map((item) => item.orderNo).toString()
|
|
|
});
|
|
});
|
|
@@ -444,7 +455,8 @@
|
|
|
projectId,
|
|
projectId,
|
|
|
projectCode,
|
|
projectCode,
|
|
|
totalPrice,
|
|
totalPrice,
|
|
|
- receiveAddress
|
|
|
|
|
|
|
+ receiveAddress,
|
|
|
|
|
+ productionRequirements
|
|
|
} = data;
|
|
} = data;
|
|
|
if (productList && productList.length > 0) {
|
|
if (productList && productList.length > 0) {
|
|
|
productList.forEach((v) => {
|
|
productList.forEach((v) => {
|
|
@@ -468,7 +480,8 @@
|
|
|
payAmount,
|
|
payAmount,
|
|
|
projectName,
|
|
projectName,
|
|
|
projectId,
|
|
projectId,
|
|
|
- projectSn: projectCode
|
|
|
|
|
|
|
+ projectSn: projectCode,
|
|
|
|
|
+ productionRequirements,
|
|
|
});
|
|
});
|
|
|
productList.forEach((item, index) => {
|
|
productList.forEach((item, index) => {
|
|
|
item['tempId'] = index;
|
|
item['tempId'] = index;
|
|
@@ -672,7 +685,8 @@
|
|
|
orderId: '',
|
|
orderId: '',
|
|
|
pricingWay: '',
|
|
pricingWay: '',
|
|
|
entrustedCode: '',
|
|
entrustedCode: '',
|
|
|
- entrustedId: ''
|
|
|
|
|
|
|
+ entrustedId: '',
|
|
|
|
|
+ productionRequirements: ''
|
|
|
});
|
|
});
|
|
|
this.$refs.inventoryTableref &&
|
|
this.$refs.inventoryTableref &&
|
|
|
this.$refs.inventoryTableref.putTableValue([]);
|
|
this.$refs.inventoryTableref.putTableValue([]);
|