|
@@ -90,7 +90,7 @@
|
|
|
:contractFeedbackInfo="contractFeedbackInfo"
|
|
|
></EditContractInfo>
|
|
|
</Dialog>
|
|
|
- <newDetailModel :orderDetail="orderDetail?.orderData" ref="detailModelContract"></newDetailModel>
|
|
|
+ <new-d-model :data="orderDetail" ref="detailModelContract" @refresh="doRefresh"></new-d-model>
|
|
|
</div>
|
|
|
</template>
|
|
|
|
|
@@ -99,19 +99,18 @@ import InfoCard from '../../ui/InfoCard.vue';
|
|
|
import { signUnitOptions } from '@/views/create-order/data/index.js'
|
|
|
import EditContractInfo from './EditContractInfo.vue';
|
|
|
import Dialog from '@/components/Dialog.vue';
|
|
|
-import newDetailModel from '../newDetailModel.vue';
|
|
|
import { sortOrderInfo } from '@/views/create-order/components/schema-form/resort/'
|
|
|
import { dateFormatter } from '@/assets/js/date'
|
|
|
import { calcShowOnlineContractForm } from "@/views/create-order/hooks/utils"
|
|
|
import { ajaxEditOrderContract } from '@/api/modules/'
|
|
|
+import NewDModel from "@/views/order/components/new-detailModel.vue";
|
|
|
export default {
|
|
|
name: 'ContractInfo',
|
|
|
components: {
|
|
|
+ NewDModel,
|
|
|
InfoCard,
|
|
|
- newDetailModel,
|
|
|
EditContractInfo,
|
|
|
Dialog,
|
|
|
-
|
|
|
},
|
|
|
props: {
|
|
|
orderDetail: {
|
|
@@ -134,23 +133,28 @@ export default {
|
|
|
},
|
|
|
isUpEntRed() {
|
|
|
return this.orderDetail?.redPunchData?.isUpEnt || false;
|
|
|
+ },
|
|
|
+ contractRes () {
|
|
|
+ return this.orderDetail?.contractRes || {}
|
|
|
}
|
|
|
},
|
|
|
data() {
|
|
|
return {
|
|
|
editContractArchiveDialogVisible: false,
|
|
|
protocolArchivingDialogVisible: false,
|
|
|
- contractRes: this.orderDetail?.contractRes || {},
|
|
|
contractFeedbackInfo: {},
|
|
|
showContract: false,
|
|
|
}
|
|
|
},
|
|
|
mounted() {
|
|
|
this.contractFeedbackInfo = sortOrderInfo(this.orderDetail)
|
|
|
- const res = this.getOnlineContractFormShow(this.contractFeedbackInfo.pageFormValue, this.contractFeedbackInfo.productArr)
|
|
|
+ const res = this.getOnlineContractFormShow(this.contractFeedbackInfo.pageFormValue, this.contractFeedbackInfo.productArr)
|
|
|
this.showContract = res || false
|
|
|
},
|
|
|
methods: {
|
|
|
+ doRefresh (type = '') {
|
|
|
+ this.$emit('refresh', type)
|
|
|
+ },
|
|
|
// 是否显示电子协议订单
|
|
|
getOnlineContractFormShow(pageForm, pList) {
|
|
|
return calcShowOnlineContractForm(pageForm, pList)
|
|
@@ -210,7 +214,7 @@ export default {
|
|
|
}
|
|
|
},
|
|
|
// 设置红冲标识显示字段
|
|
|
- setRedPunchDisplay(product) {
|
|
|
+ setRedPunchDisplay(product) {
|
|
|
const { isUpCommission, isUpEnt, isUpCash } = this.orderDetail?.redPunchData || {};
|
|
|
const RETURN_BOOL = {
|
|
|
'合同金额': isUpCash,
|
|
@@ -288,7 +292,7 @@ export default {
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
}
|
|
|
.column-cell {
|
|
|
color: $color_main;
|