|
|
@@ -36,6 +36,19 @@
|
|
|
<template slot="prepend">{{ form.typeName }}</template>
|
|
|
</el-input>
|
|
|
</el-form-item>
|
|
|
+
|
|
|
+ <el-form-item label="来源类型" v-if="form.type">
|
|
|
+ <el-select v-model="form.sourceType" style="width: 100%" disabled placeholder=" ">
|
|
|
+ <el-option
|
|
|
+ v-if="item.parentId == form.type"
|
|
|
+ v-for="item in sourceTypeList"
|
|
|
+ :key="item.code"
|
|
|
+ :label="item.name"
|
|
|
+ :value="item.code"
|
|
|
+ >
|
|
|
+ </el-option>
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
<el-form-item
|
|
|
label="核价单："
|
|
|
prop="sourceName"
|
|
|
@@ -67,10 +80,21 @@
|
|
|
<el-form-item label="合同名称：" prop="contractName">
|
|
|
<el-input v-model="form.contractName" disabled></el-input>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="需求类型：" v-if="form.type==2" prop="requireSourceTypeName">
|
|
|
- <el-input v-model="form.requireSourceTypeName" disabled></el-input>
|
|
|
+ <el-form-item
|
|
|
+ label="需求类型："
|
|
|
+ v-if="form.type == 2"
|
|
|
+ prop="requireSourceTypeName"
|
|
|
+ >
|
|
|
+ <el-input
|
|
|
+ v-model="form.requireSourceTypeName"
|
|
|
+ disabled
|
|
|
+ ></el-input>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="需求部门：" v-if="form.type==2" prop="requireDeptName">
|
|
|
+ <el-form-item
|
|
|
+ label="需求部门："
|
|
|
+ v-if="form.type == 2"
|
|
|
+ prop="requireDeptName"
|
|
|
+ >
|
|
|
<el-input v-model="form.requireDeptName" disabled></el-input>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="编码：" prop="contractNo">
|
|
|
@@ -84,21 +108,19 @@
|
|
|
<el-form-item label="签订日期：" prop="contractStartDate">
|
|
|
<el-input v-model="form.contractStartDate" disabled></el-input>
|
|
|
</el-form-item>
|
|
|
-
|
|
|
-
|
|
|
+
|
|
|
<el-form-item label="结束日期：" prop="contractEndDate">
|
|
|
<el-input v-model="form.contractEndDate" disabled></el-input>
|
|
|
</el-form-item>
|
|
|
- <!-- <el-form-item label="计价方式：" prop="payWay">
|
|
|
- <el-select v-model="form.pricingWay" disabled style="width: 100%">
|
|
|
- <el-option :value="1" label="按数量计费"></el-option>
|
|
|
- <el-option :value="2" label="按重量计费"></el-option>
|
|
|
- </el-select>
|
|
|
- </el-form-item> -->
|
|
|
+
|
|
|
<el-form-item label="结算方式：" prop="payWay">
|
|
|
<el-input v-model="form.settlementModeName" disabled></el-input>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="需求人：" prop="requireUserId" v-if="form.type == 2">
|
|
|
+ <el-form-item
|
|
|
+ label="需求人："
|
|
|
+ prop="requireUserId"
|
|
|
+ v-if="form.type == 2"
|
|
|
+ >
|
|
|
<el-input v-model="form.requireUserName" disabled></el-input>
|
|
|
</el-form-item>
|
|
|
<el-form-item prop="contractFile" label="合同附件：">
|
|
|
@@ -137,17 +159,6 @@
|
|
|
<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">
|
|
|
@@ -181,17 +192,6 @@
|
|
|
<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>
|
|
|
@@ -207,14 +207,22 @@
|
|
|
:cacheKeyUrl="cacheKeyUrl"
|
|
|
></inventoryTabledetail>
|
|
|
</el-tab-pane>
|
|
|
- <el-tab-pane label="带料清单" name="2" v-if="form.categoryId == '1752993827954225153'">
|
|
|
+ <el-tab-pane
|
|
|
+ label="带料清单"
|
|
|
+ name="2"
|
|
|
+ v-if="form.categoryId == '1752993827954225153'"
|
|
|
+ >
|
|
|
<inventoryTabledetail
|
|
|
ref="rawDetailListRef"
|
|
|
:isCustomerMark="true"
|
|
|
:contractBookType="form.type"
|
|
|
></inventoryTabledetail>
|
|
|
</el-tab-pane>
|
|
|
- <el-tab-pane label="产出清单" name="3" v-if="form.categoryId == '1752993827954225153'">
|
|
|
+ <el-tab-pane
|
|
|
+ label="产出清单"
|
|
|
+ name="3"
|
|
|
+ v-if="form.categoryId == '1752993827954225153'"
|
|
|
+ >
|
|
|
<inventoryTabledetail
|
|
|
ref="outputDetailListRef"
|
|
|
:isCustomerMark="true"
|
|
|
@@ -222,23 +230,12 @@
|
|
|
></inventoryTabledetail>
|
|
|
</el-tab-pane>
|
|
|
</el-tabs>
|
|
|
- <!-- <headerTitle title="产品清单"></headerTitle> -->
|
|
|
|
|
|
<headerTitle
|
|
|
:title="form.type == '2' ? '付款方式' : '收款方式'"
|
|
|
style="margin-top: 30px"
|
|
|
></headerTitle>
|
|
|
<paymentList ref="paymentListTable" type="view" />
|
|
|
-
|
|
|
- <!-- <ele-pro-table
|
|
|
- ref="table"
|
|
|
- :needPage="false"
|
|
|
- :columns="receiptPaymentListcolumns"
|
|
|
- :toolkit="[]"
|
|
|
- :datasource="detailData.receiptPaymentList"
|
|
|
- row-key="id"
|
|
|
- >
|
|
|
- </ele-pro-table> -->
|
|
|
</div>
|
|
|
<bpmDetail
|
|
|
v-if="activeComp === 'bpm' && form.processInstanceId"
|
|
|
@@ -261,7 +258,6 @@
|
|
|
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';
|
|
|
import changeList from './changeList.vue';
|
|
|
import paymentList from './paymentList.vue';
|
|
|
|
|
|
@@ -270,8 +266,8 @@
|
|
|
components: {
|
|
|
inventoryTabledetail,
|
|
|
bpmDetail,
|
|
|
- // fileMain,
|
|
|
- changeList,paymentList
|
|
|
+ changeList,
|
|
|
+ paymentList
|
|
|
},
|
|
|
data() {
|
|
|
return {
|
|
|
@@ -282,7 +278,7 @@
|
|
|
tabOptions: [
|
|
|
{ key: 'main', name: '合同详情' },
|
|
|
{ key: 'bpm', name: '流程详情' },
|
|
|
- { key: 'changeList', name: '历史版本' },
|
|
|
+ { key: 'changeList', name: '历史版本' }
|
|
|
// { key: 'oldMain', name: '变更记录' },
|
|
|
],
|
|
|
visible: false,
|
|
|
@@ -292,7 +288,38 @@
|
|
|
form: {},
|
|
|
rules: {},
|
|
|
detailData: {},
|
|
|
-
|
|
|
+ sourceTypeList: [
|
|
|
+ {
|
|
|
+ code: 1,
|
|
|
+ name: '报价单',
|
|
|
+ parentId: '1'
|
|
|
+ },
|
|
|
+ {
|
|
|
+ code: 2,
|
|
|
+ name: '核价单',
|
|
|
+ parentId: '2'
|
|
|
+ },
|
|
|
+ {
|
|
|
+ code: 3,
|
|
|
+ name: '采购计划',
|
|
|
+ parentId: '2'
|
|
|
+ },
|
|
|
+ {
|
|
|
+ code: 4,
|
|
|
+ name: '商机',
|
|
|
+ parentId: '1'
|
|
|
+ },
|
|
|
+ {
|
|
|
+ code: 5,
|
|
|
+ name: '退货单',
|
|
|
+ parentId: '1'
|
|
|
+ },
|
|
|
+ {
|
|
|
+ code: 6,
|
|
|
+ name: '客户',
|
|
|
+ parentId: '1'
|
|
|
+ }
|
|
|
+ ],
|
|
|
};
|
|
|
},
|
|
|
methods: {
|
|
|
@@ -303,7 +330,7 @@
|
|
|
},
|
|
|
async open(row) {
|
|
|
this.form = row;
|
|
|
- this.activeComp='main'
|
|
|
+ this.activeComp = 'main';
|
|
|
this.visible = true;
|
|
|
this.activeName = '1';
|
|
|
this.getDetailData(row.id);
|
|
|
@@ -328,7 +355,7 @@
|
|
|
}
|
|
|
if (key == 'changeList') {
|
|
|
this.$nextTick(() => {
|
|
|
- this.$refs.changeList.init(this.form.id)
|
|
|
+ this.$refs.changeList.init(this.form.id);
|
|
|
});
|
|
|
}
|
|
|
},
|
|
|
@@ -356,9 +383,7 @@
|
|
|
this.detailData = data;
|
|
|
this.form = data.contractVO;
|
|
|
this.$refs.paymentListTable &&
|
|
|
- this.$refs.paymentListTable.putTableValue(
|
|
|
- data.receiptPaymentList
|
|
|
- );
|
|
|
+ this.$refs.paymentListTable.putTableValue(data.receiptPaymentList);
|
|
|
this.$nextTick(() => {
|
|
|
this.$refs.inventoryTabledetailRef &&
|
|
|
this.$refs.inventoryTabledetailRef.putTableValue({
|
