From 09da100729793848bc01b51f7b05ca3f1e7ec64f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 20 六月 2024 14:05:35 +0800
Subject: [PATCH] 提交一把
---
company/src/components/enterprise/factoryChange.vue | 29 +++++++++++++++++++++--------
1 files changed, 21 insertions(+), 8 deletions(-)
diff --git a/company/src/components/enterprise/factoryChange.vue b/company/src/components/enterprise/factoryChange.vue
index 8aabe9c..a294193 100644
--- a/company/src/components/enterprise/factoryChange.vue
+++ b/company/src/components/enterprise/factoryChange.vue
@@ -2,7 +2,7 @@
<GlobalWindow
:title="title"
width="100%"
- text="鎶曚繚鐢宠"
+ text="鎵规敼鐢宠"
:visible.sync="visible"
:confirm-working="isWorking"
@confirm="confirm"
@@ -69,10 +69,11 @@
align="center"
label="鎶曚繚浜烘暟">
</el-table-column>
+ <el-table-column prop="guaranteeNum" align="center" label="鍦ㄤ繚浜烘暟" ></el-table-column>
<el-table-column
prop="serviceDays"
align="center"
- label="鍦ㄤ繚鏃堕暱锛堝ぉ锛�">
+ label="淇濆崟鏃堕暱锛堝ぉ锛�">
</el-table-column>
<el-table-column
prop="currentFee"
@@ -134,6 +135,14 @@
prop="workTypeName"
label="鍙樻洿鍚庢墍灞炲伐绉�">
</el-table-column>
+ <el-table-column
+ prop="remark"
+ align="center"
+ label="澶囨敞">
+ <template slot-scope="{row}">
+ <el-input v-model="row.remark" placeholder="璇疯緭鍏�"></el-input>
+ </template>
+ </el-table-column>
<el-table-column
label="鎿嶄綔">
<template slot-scope="scope">
@@ -142,9 +151,9 @@
</el-table-column>
</el-table>
<div class="info" v-if="item">
- <span v-if="item.specialAgreement">{{item.specialAgreement}}</span>
- <span v-if="item.specialInfo">{{item.specialInfo}}</span>
- <span v-if="item.ortherInfo">{{item.ortherInfo}}</span>
+ <span v-if="item.specialAgreement" v-html="item.specialAgreement"></span>
+ <span v-if="item.specialInfo" v-html="item.specialInfo"> </span>
+ <span v-if="item.ortherInfo" v-html="item.ortherInfo"> </span>
</div>
<!-- 閫夋嫨鍛樺伐 -->
<selectEmployees ref="selectEmployees" @result="getValue1" />
@@ -156,6 +165,8 @@
<confirmJobType ref="confirmJobType" @result="getUser" />
<!-- 璇﹀崟 -->
<ApplyChangeUnitDetails1 ref="ApplyChangeUnitDetails1" @success="success" />
+ <!-- 鏇存柊娲鹃仯鍗曚綅璇︽儏 -->
+ <OperaApplyChangeUnitDetailWindow ref="OperaApplyChangeUnitDetailWindow" />
</GlobalWindow>
</template>
@@ -167,6 +178,7 @@
import importEmployees from '@/components/enterprise/importEmployees'
import confirmJobType from '@/components/enterprise/confirmJobType'
import ApplyChangeUnitDetails1 from '@/components/business/ApplyChangeUnitDetails1'
+ import OperaApplyChangeUnitDetailWindow from '@/components/business/OperaApplyChangeUnitDetailWindow'
import { all } from '@/api/business/solutions'
import { getDetail, findList } from '@/api/business/insuranceApply'
import { create } from '@/api/business/applyChange'
@@ -174,7 +186,7 @@
export default {
name: 'factoryChange',
extends: BaseOpera,
- components: { GlobalWindow, selectEmployees, addEmployee, importEmployees, confirmJobType, ApplyChangeUnitDetails1 },
+ components: { GlobalWindow, OperaApplyChangeUnitDetailWindow, selectEmployees, addEmployee, importEmployees, confirmJobType, ApplyChangeUnitDetails1 },
data () {
return {
form: {
@@ -246,10 +258,11 @@
changeDetailList: this.form.factory,
validTime: this.form.applyStartTime,
type: 1
- }).then(() => {
+ }).then(res => {
this.visible = false
+ this.$refs.OperaApplyChangeUnitDetailWindow.open('鏇存崲娲鹃仯鍗曚綅璇︽儏', { applyId: this.form.id, id: res })
this.$tip.apiSuccess('鎿嶄綔鎴愬姛')
- this.$emit('success')
+ // this.$emit('success')
}).catch(e => {
this.$tip.apiFailed(e)
}).finally(() => {
--
Gitblit v1.9.3