|
|
@@ -27,221 +27,196 @@
|
|
|
</div>
|
|
|
</div>
|
|
|
<div v-show="activeComp == 'order'">
|
|
|
- <el-form ref="form" class="el-form-box" :model="form" :rules="rules" label-width="120px">
|
|
|
+ <el-form
|
|
|
+ ref="form"
|
|
|
+ class="el-form-box"
|
|
|
+ :model="form"
|
|
|
+ label-width="120px"
|
|
|
+ >
|
|
|
<headerTitle title="订单信息"> </headerTitle>
|
|
|
<el-row>
|
|
|
<el-col :span="12">
|
|
|
- <el-form-item
|
|
|
- label="订单编号:"
|
|
|
- prop="orderNo"
|
|
|
-
|
|
|
- >
|
|
|
+ <el-form-item label="订单编号:" prop="orderNo">
|
|
|
<el-input v-model="form.orderNo" disabled></el-input>
|
|
|
</el-form-item>
|
|
|
- <el-form-item
|
|
|
- label="合同名称:"
|
|
|
- prop="contractName"
|
|
|
-
|
|
|
- >
|
|
|
+ <el-form-item label="合同名称:" prop="contractName">
|
|
|
<el-input v-model="form.contractName" disabled></el-input>
|
|
|
</el-form-item>
|
|
|
- <el-form-item
|
|
|
- label="合同编号:"
|
|
|
- prop="contractNumber"
|
|
|
-
|
|
|
- >
|
|
|
+ <el-form-item label="合同编号:" prop="contractNumber">
|
|
|
<el-input v-model="form.contractNumber" disabled></el-input>
|
|
|
</el-form-item>
|
|
|
- <el-form-item
|
|
|
- label="结算方式:"
|
|
|
- prop="settlementModeName"
|
|
|
-
|
|
|
- >
|
|
|
+ <el-form-item label="结算方式:" prop="settlementModeName">
|
|
|
<el-input v-model="form.settlementModeName" disabled></el-input>
|
|
|
</el-form-item>
|
|
|
|
|
|
-
|
|
|
- <el-form-item
|
|
|
- label="客户收货地址:"
|
|
|
- prop="receiveAddress">
|
|
|
+ <el-form-item label="客户收货地址:" prop="receiveAddress">
|
|
|
<el-input v-model="form.receiveAddress" disabled></el-input>
|
|
|
</el-form-item>
|
|
|
- <el-form-item
|
|
|
- label="订单备注:"
|
|
|
- prop="remark">
|
|
|
- <el-input type="textarea" v-model="form.remark" disabled></el-input>
|
|
|
+ <el-form-item label="订单备注:" prop="remark">
|
|
|
+ <el-input
|
|
|
+ type="textarea"
|
|
|
+ v-model="form.remark"
|
|
|
+ disabled
|
|
|
+ ></el-input>
|
|
|
</el-form-item>
|
|
|
<el-form-item prop="orderFiles" label="订单附件:">
|
|
|
<fileMain v-model="form.orderFiles" type="view"></fileMain>
|
|
|
-
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
|
|
|
<el-col :span="12">
|
|
|
-
|
|
|
-
|
|
|
- <el-form-item
|
|
|
- label="项目名称:"
|
|
|
- prop="projectName">
|
|
|
+ <el-form-item label="项目名称:" prop="projectName">
|
|
|
<el-input v-model="form.projectName" disabled></el-input>
|
|
|
</el-form-item>
|
|
|
- <el-form-item
|
|
|
- label="销售部门:"
|
|
|
- prop="salesDeptName">
|
|
|
+ <el-form-item label="销售部门:" prop="salesDeptName">
|
|
|
<el-input v-model="form.salesDeptName" disabled></el-input>
|
|
|
</el-form-item>
|
|
|
- <el-form-item
|
|
|
- label="销售类型:"
|
|
|
- prop="saleTypeName">
|
|
|
+ <el-form-item label="销售类型:" prop="saleTypeName">
|
|
|
<el-input v-model="form.saleTypeName" disabled></el-input>
|
|
|
</el-form-item>
|
|
|
- <el-form-item
|
|
|
- label="总金额:"
|
|
|
- prop="totalAmount">
|
|
|
+ <el-form-item label="总金额:" prop="totalAmount">
|
|
|
<el-input v-model="form.totalAmount" disabled>
|
|
|
- <template slot="append">
|
|
|
- 元
|
|
|
- </template>
|
|
|
+ <template slot="append"> 元 </template>
|
|
|
</el-input>
|
|
|
</el-form-item>
|
|
|
- <el-form-item
|
|
|
- label="优惠后总金额:"
|
|
|
- prop="payAmount">
|
|
|
+ <el-form-item label="优惠后总金额:" prop="payAmount">
|
|
|
<el-input v-model="form.payAmount" disabled>
|
|
|
- <template slot="append">
|
|
|
- 元
|
|
|
- </template>
|
|
|
+ <template slot="append"> 元 </template>
|
|
|
</el-input>
|
|
|
</el-form-item>
|
|
|
- <el-form-item
|
|
|
- label="计价方式:">
|
|
|
- <el-radio v-model="form.pricingWay" disabled :label="1">按数量计费</el-radio>
|
|
|
- <el-radio v-model="form.pricingWay" disabled :label="2">按重量计费</el-radio>
|
|
|
- </el-form-item>
|
|
|
<el-form-item
|
|
|
label="订单类型:"
|
|
|
prop="needProduce"
|
|
|
- style="margin-bottom: 22px">
|
|
|
- <el-radio v-model="form.needProduce" disabled :label="1">生产性订单</el-radio>
|
|
|
- <el-radio v-model="form.needProduce" disabled :label="0">库存式订单</el-radio>
|
|
|
+ style="margin-bottom: 22px"
|
|
|
+ >
|
|
|
+ <el-radio v-model="form.needProduce" disabled :label="1"
|
|
|
+ >生产性订单</el-radio
|
|
|
+ >
|
|
|
+ <el-radio v-model="form.needProduce" disabled :label="0"
|
|
|
+ >库存式订单</el-radio
|
|
|
+ >
|
|
|
+ <el-radio v-model="form.needProduce" disabled :label="2"
|
|
|
+ >无客户生产性订单</el-radio
|
|
|
+ >
|
|
|
+ <el-radio v-model="form.needProduce" disabled :label="4"
|
|
|
+ >不定向订单</el-radio
|
|
|
+ >
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item
|
|
|
+ label="总数"
|
|
|
+ prop="totalPlanNum"
|
|
|
+ v-if="form.needProduce == 4"
|
|
|
+ >
|
|
|
+ <el-input
|
|
|
+ v-model="form.totalPlanNum"
|
|
|
+ class="totalPlanNum"
|
|
|
+ disabled
|
|
|
+ >
|
|
|
+ <template slot="append">
|
|
|
+ <DictSelection
|
|
|
+ dictName="计量单位"
|
|
|
+ disabled
|
|
|
+ v-model="form.planNumUnit"
|
|
|
+ >
|
|
|
+ </DictSelection>
|
|
|
+ </template>
|
|
|
+ </el-input>
|
|
|
</el-form-item>
|
|
|
-
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
<headerTitle title="基本信息"></headerTitle>
|
|
|
<el-row>
|
|
|
<el-col :span="12">
|
|
|
- <el-form-item
|
|
|
- label="客户名称:"
|
|
|
- prop="partaName">
|
|
|
+ <el-form-item label="客户名称:" prop="partaName">
|
|
|
<el-input v-model="form.partaName" disabled></el-input>
|
|
|
</el-form-item>
|
|
|
<el-form-item
|
|
|
label="客户统一社会信用代码:"
|
|
|
prop="partaUnifiedSocialCreditCode"
|
|
|
- class="form_item_label">
|
|
|
- <el-input v-model="form.partaUnifiedSocialCreditCode" disabled></el-input>
|
|
|
+ class="form_item_label"
|
|
|
+ >
|
|
|
+ <el-input
|
|
|
+ v-model="form.partaUnifiedSocialCreditCode"
|
|
|
+ disabled
|
|
|
+ ></el-input>
|
|
|
</el-form-item>
|
|
|
- <el-form-item
|
|
|
- label="客户联系人:"
|
|
|
- prop="partaLinkName">
|
|
|
+ <el-form-item label="客户联系人:" prop="partaLinkName">
|
|
|
<el-input v-model="form.partaLinkName" disabled></el-input>
|
|
|
</el-form-item>
|
|
|
- <el-form-item
|
|
|
- label="客户电话:"
|
|
|
- prop="partaTel">
|
|
|
+ <el-form-item label="客户电话:" prop="partaTel">
|
|
|
<el-input v-model="form.partaTel" disabled></el-input>
|
|
|
</el-form-item>
|
|
|
- <el-form-item
|
|
|
- label="客户传真:"
|
|
|
- prop="partaFax">
|
|
|
+ <el-form-item label="客户传真:" prop="partaFax">
|
|
|
<el-input v-model="form.partaFax" disabled></el-input>
|
|
|
</el-form-item>
|
|
|
- <el-form-item
|
|
|
- label=" 客户Email:"
|
|
|
- prop="partaEmail">
|
|
|
+ <el-form-item label=" 客户Email:" prop="partaEmail">
|
|
|
<el-input v-model="form.partaEmail" disabled></el-input>
|
|
|
</el-form-item>
|
|
|
- <el-form-item
|
|
|
- label="客户地址:"
|
|
|
- prop="partaAddress">
|
|
|
+ <el-form-item label="客户地址:" prop="partaAddress">
|
|
|
<el-input v-model="form.partaAddress" disabled></el-input>
|
|
|
</el-form-item>
|
|
|
- <!-- <el-form-item
|
|
|
- label="客户税号"
|
|
|
- prop="contactAddress"
|
|
|
-
|
|
|
- >
|
|
|
- <el-input
|
|
|
- clearable
|
|
|
- v-model="form.contactAddress"
|
|
|
- placeholder="请输入"
|
|
|
- />
|
|
|
- </el-form-item> -->
|
|
|
+
|
|
|
</el-col>
|
|
|
|
|
|
<el-col :span="12">
|
|
|
- <el-form-item
|
|
|
- label="售出方名称:"
|
|
|
- prop="partbName">
|
|
|
+ <el-form-item label="售出方名称:" prop="partbName">
|
|
|
<el-input v-model="form.partbName" disabled></el-input>
|
|
|
</el-form-item>
|
|
|
<el-form-item
|
|
|
label="售出方统一社会信用代码:"
|
|
|
prop="partbUnifiedSocialCreditCode"
|
|
|
- class="form_item_label">
|
|
|
- <el-input v-model="form.partbUnifiedSocialCreditCode" disabled></el-input>
|
|
|
+ class="form_item_label"
|
|
|
+ >
|
|
|
+ <el-input
|
|
|
+ v-model="form.partbUnifiedSocialCreditCode"
|
|
|
+ disabled
|
|
|
+ ></el-input>
|
|
|
</el-form-item>
|
|
|
- <el-form-item
|
|
|
- label="售出方联系人:"
|
|
|
- prop="partbLinkName">
|
|
|
+ <el-form-item label="售出方联系人:" prop="partbLinkName">
|
|
|
<el-input v-model="form.partbLinkName" disabled></el-input>
|
|
|
</el-form-item>
|
|
|
<el-form-item
|
|
|
prop="partbTel"
|
|
|
- label="售出方联系电话:" class="form_item_label">
|
|
|
+ label="售出方联系电话:"
|
|
|
+ class="form_item_label"
|
|
|
+ >
|
|
|
<el-input v-model="form.partbTel" disabled></el-input>
|
|
|
</el-form-item>
|
|
|
<el-form-item prop="partbFax" label="售出方传真:">
|
|
|
<el-input v-model="form.partbFax" disabled></el-input>
|
|
|
</el-form-item>
|
|
|
|
|
|
- <el-form-item
|
|
|
- label="售出方Email:"
|
|
|
- prop="partbEmail">
|
|
|
+ <el-form-item label="售出方Email:" prop="partbEmail">
|
|
|
<el-input v-model="form.partbEmail" disabled></el-input>
|
|
|
</el-form-item>
|
|
|
|
|
|
- <el-form-item
|
|
|
- label="售出方地址:"
|
|
|
- prop="partbAddress">
|
|
|
+ <el-form-item label="售出方地址:" prop="partbAddress">
|
|
|
<el-input v-model="form.partbAddress" disabled></el-input>
|
|
|
</el-form-item>
|
|
|
- <!-- <el-form-item
|
|
|
- label="售出方税号"
|
|
|
- prop="contactAddress"
|
|
|
-
|
|
|
- >
|
|
|
- <el-input
|
|
|
- clearable
|
|
|
- v-model="form.contactAddress"
|
|
|
- placeholder="请输入"
|
|
|
- />
|
|
|
- </el-form-item> -->
|
|
|
+
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
</el-form>
|
|
|
|
|
|
- <headerTitle title="物品清单"></headerTitle>
|
|
|
+ <headerTitle title="物品清单" v-if="form.needProduce != 4"></headerTitle>
|
|
|
<inventoryTabledetail
|
|
|
- @toSendTab="toSendTab"
|
|
|
+ v-if="form.needProduce != 4"
|
|
|
ref="inventoryTabledetailRef"
|
|
|
:isCustomerMark="true"
|
|
|
:isDiscountTotalPrice="true"
|
|
|
pageName="send"
|
|
|
></inventoryTabledetail>
|
|
|
+ <headerTitle title="类型清单" v-if="form.needProduce == 4"></headerTitle>
|
|
|
+ <typeList
|
|
|
+ v-if="form.needProduce == 4"
|
|
|
+ ref="typeListRef"
|
|
|
+ type="view"
|
|
|
+ ></typeList>
|
|
|
</div>
|
|
|
- <bpmDetail v-if="activeComp==='bpm'&&form.processInstanceId" :id="form.processInstanceId"></bpmDetail>
|
|
|
+ <bpmDetail
|
|
|
+ v-if="activeComp === 'bpm' && form.processInstanceId"
|
|
|
+ :id="form.processInstanceId"
|
|
|
+ ></bpmDetail>
|
|
|
|
|
|
<div v-if="activeComp == 'invoice'">
|
|
|
<invoiceList :orderId="detailId"></invoiceList>
|
|
|
@@ -268,7 +243,8 @@
|
|
|
import { copyObj } from '@/utils/util';
|
|
|
import bpmDetail from '@/views/bpm/processInstance/detail.vue';
|
|
|
import inventoryTabledetail from '@/BIZComponents/inventoryTableDetails.vue';
|
|
|
- import fileMain from "@/components/addDoc/index.vue";
|
|
|
+ import fileMain from '@/components/addDoc/index.vue';
|
|
|
+ import typeList from './typeList.vue';
|
|
|
|
|
|
export default {
|
|
|
mixins: [dictMixins],
|
|
|
@@ -276,7 +252,10 @@
|
|
|
fileMain,
|
|
|
invoiceList,
|
|
|
returnGoodsList,
|
|
|
- accountstatementList,bpmDetail,inventoryTabledetail
|
|
|
+ accountstatementList,
|
|
|
+ bpmDetail,
|
|
|
+ inventoryTabledetail,
|
|
|
+ typeList
|
|
|
},
|
|
|
data() {
|
|
|
return {
|
|
|
@@ -291,15 +270,9 @@
|
|
|
visible: false,
|
|
|
detailId: '',
|
|
|
title: '详情',
|
|
|
- row: {},
|
|
|
- activeName: 'base',
|
|
|
form: {
|
|
|
- orderFiles: [{ name: '222' }]
|
|
|
+ orderFiles: []
|
|
|
},
|
|
|
- rules: {},
|
|
|
- detailData: {},
|
|
|
-
|
|
|
-
|
|
|
};
|
|
|
},
|
|
|
methods: {
|
|
|
@@ -309,8 +282,8 @@
|
|
|
this.getDetailData(row.id);
|
|
|
this.detailId = row.id;
|
|
|
},
|
|
|
- toSendTab(tabName){
|
|
|
- this.activeComp = tabName
|
|
|
+ toSendTab(tabName) {
|
|
|
+ this.activeComp = tabName;
|
|
|
},
|
|
|
cancel() {
|
|
|
this.$nextTick(() => {
|
|
|
@@ -322,19 +295,18 @@
|
|
|
this.visible = false;
|
|
|
});
|
|
|
},
|
|
|
- downloadFile(file) {
|
|
|
- getFile({ objectName: file.storePath }, file.name);
|
|
|
- },
|
|
|
+
|
|
|
async getDetailData(id) {
|
|
|
this.loading = true;
|
|
|
const data = await getSaleOrderDetail(id);
|
|
|
this.loading = false;
|
|
|
if (data) {
|
|
|
this.form = data;
|
|
|
- this.detailData = data;
|
|
|
this.$nextTick(() => {
|
|
|
this.$refs.inventoryTabledetailRef &&
|
|
|
this.$refs.inventoryTabledetailRef.putTableValue(data);
|
|
|
+ this.$refs.typeListRef &&
|
|
|
+ this.$refs.typeListRef.putTableValue(row.typedetailList);
|
|
|
});
|
|
|
}
|
|
|
}
|