Commit d65beb90 authored by 张伯涛's avatar 张伯涛

合同修改

parent d347def5
...@@ -66,12 +66,6 @@ export const constantRoutes = [ ...@@ -66,12 +66,6 @@ export const constantRoutes = [
component: () => import('@/views/list/index'), component: () => import('@/views/list/index'),
meta: { title: '合同管理' } meta: { title: '合同管理' }
}, },
{
path: '/contract/manage/:type',
name: 'contractManage'.toLocaleUpperCase(),
component: () => import('@/views/list/detail'),
meta: { title: '修改合同信息' }
},
{ {
path: '/contract/manage1/add', path: '/contract/manage1/add',
name: 'contractManage'.toLocaleUpperCase(), name: 'contractManage'.toLocaleUpperCase(),
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
<el-tab-pane v-if="$route.query.number === '2' || $route.query.number === '3' || $route.query.number === '4' " name="guarantee" label="担保信息" /> <el-tab-pane v-if="$route.query.number === '2' || $route.query.number === '3' || $route.query.number === '4' " name="guarantee" label="担保信息" />
<el-tab-pane name="approve" label="审批信息" /> <el-tab-pane name="approve" label="审批信息" />
<el-tab-pane name="file" label="附件信息" /> <el-tab-pane name="file" label="附件信息" />
<el-tab-pane name="examine" label="审核信息" /> <el-tab-pane v-if="formType ==='examine'" name="examine" label="审核信息" />
</el-tabs> </el-tabs>
</div> </div>
<div style="height: 100%;flex:1"> <div style="height: 100%;flex:1">
...@@ -1559,7 +1559,7 @@ ...@@ -1559,7 +1559,7 @@
</div> </div>
</div> </div>
<div class="step-form"> <div class="step-form">
<div id="examine" class="step-header"> <div v-if="formType ==='examine'" id="examine" class="step-header">
<div class="step-label">审核信息</div> <div class="step-label">审核信息</div>
<div class="step-header--right" /> <div class="step-header--right" />
</div> </div>
......
...@@ -39,32 +39,18 @@ ...@@ -39,32 +39,18 @@
<div class="title">合同列表</div> <div class="title">合同列表</div>
<el-table :row-style="tableRowStyle" :data="data" border> <el-table :row-style="tableRowStyle" :data="data" border>
<el-table-column label="序号" type="index" width="55" /> <el-table-column label="序号" type="index" width="55" />
<el-table-column label="原合同ID" prop="FROMID" :show-overflow-tooltip="true" /> <el-table-column label="原合同ID" prop="FROMID" width="300" :show-overflow-tooltip="true" />
<el-table-column label="合同中文名称" prop="CONNAMECN" :show-overflow-tooltip="true" /> <el-table-column label="人员ID" prop="perCard" width="180" :show-overflow-tooltip="true" />
<el-table-column label="合同编码" prop="CONCODE" :show-overflow-tooltip="true" /> <el-table-column label="合同中文名称" prop="CONNAMECN" width="180" :show-overflow-tooltip="true" />
<el-table-column label="项目编码" prop="PROJNUMBER" :show-overflow-tooltip="true" /> <el-table-column label="合同编码" prop="CONCODE" width="180" :show-overflow-tooltip="true" />
<el-table-column label="项目名称" prop="PROJNAME" :show-overflow-tooltip="true" /> <el-table-column label="合同审批状态" prop="Type" width="180" :show-overflow-tooltip="true" />
<el-table-column label="合同业务类型" prop="BUSINESSTYPE" /> <el-table-column label="项目编码" prop="PROJNUMBER" width="180" :show-overflow-tooltip="true" />
<el-table-column label="签约日期" prop="SIGNDATE" /> <el-table-column label="项目名称" prop="PROJNAME" width="180" :show-overflow-tooltip="true" />
<!-- <el-table-column label="同步状态" prop="synchronization"> <el-table-column label="合同业务类型" prop="BUSINESSTYPE" width="180" />
<el-table-column label="签约日期" prop="SIGNDATE" width="180" />
<el-table-column label="合同状态" prop="CONSTATUSNAME" width="180" />
<el-table-column label="是否需要同步" prop="SYNCHRONIZATIONSTATUS" width="180">
<template slot-scope="{ row }"> <template slot-scope="{ row }">
{{ { '0': '未同步', '1': '已同步' }[row.synchronization] }}
</template>
</el-table-column> -->
<el-table-column label="合同状态" prop="CONSTATUSNAME" />
<el-table-column label="是否需要同步" prop="SYNCHRONIZATIONSTATUS">
<template slot-scope="{ row }">
<!-- <template v-if="['2',2,3,'3'].includes(row.CONSTATUS)">
{{ statusEnum[row.CONSTATUS] }}
</template>
<template v-else>
<el-switch
v-model="row.CONSTATUS"
active-value="1"
inactive-value="0"
@click="mergeSyn(row)"
/>
</template>-->
<el-switch <el-switch
v-model="row.SYNCHRONIZATIONSTATUS" v-model="row.SYNCHRONIZATIONSTATUS"
active-value="1" active-value="1"
...@@ -73,8 +59,8 @@ ...@@ -73,8 +59,8 @@
/> />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="上一次同步时间" prop="SYNCHRONIZATIONDATE" /> <el-table-column label="上一次同步时间" prop="SYNCHRONIZATIONDATE" width="180" />
<el-table-column width="180px" label="操作"> <el-table-column label="操作" fixed="right" width="180">
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<el-link :underline="false" type="primary" @click.stop="update(row)">修改</el-link> <el-link :underline="false" type="primary" @click.stop="update(row)">修改</el-link>
<el-link :underline="false" type="success" style="margin-left: 10px" @click.stop="pushInfo(row)">推送</el-link> <el-link :underline="false" type="success" style="margin-left: 10px" @click.stop="pushInfo(row)">推送</el-link>
...@@ -87,32 +73,18 @@ ...@@ -87,32 +73,18 @@
<div class="title">合同列表</div> <div class="title">合同列表</div>
<el-table :row-style="tableRowStyle" :data="data" border> <el-table :row-style="tableRowStyle" :data="data" border>
<el-table-column label="序号" type="index" width="55" /> <el-table-column label="序号" type="index" width="55" />
<el-table-column label="原合同ID" prop="FROMID" :show-overflow-tooltip="true" /> <el-table-column label="原合同ID" prop="FROMID" width="300" :show-overflow-tooltip="true" />
<el-table-column label="合同中文名称" prop="CONNAMECN" :show-overflow-tooltip="true" /> <el-table-column label="部门名称" prop="deptName" width="180" :show-overflow-tooltip="true" />
<el-table-column label="合同编码" prop="CONCODE" :show-overflow-tooltip="true" /> <el-table-column label="合同中文名称" prop="CONNAMECN" width="180" :show-overflow-tooltip="true" />
<el-table-column label="项目编码" prop="PROJNUMBER" :show-overflow-tooltip="true" /> <el-table-column label="合同编码" prop="CONCODE" width="180" :show-overflow-tooltip="true" />
<el-table-column label="项目名称" prop="PROJNAME" :show-overflow-tooltip="true" /> <el-table-column label="合同审批状态" prop="Type" width="180" :show-overflow-tooltip="true" />
<el-table-column label="合同业务类型" prop="BUSINESSTYPE" /> <el-table-column label="项目编码" prop="PROJNUMBER" width="180" :show-overflow-tooltip="true" />
<el-table-column label="签约日期" prop="SIGNDATE" /> <el-table-column label="项目名称" prop="PROJNAME" width="180" :show-overflow-tooltip="true" />
<!-- <el-table-column label="同步状态" prop="synchronization"> <el-table-column label="合同业务类型" prop="BUSINESSTYPE" width="180" />
<template slot-scope="{ row }"> <el-table-column label="签约日期" prop="SIGNDATE" width="180" />
{{ { '0': '未同步', '1': '已同步' }[row.synchronization] }} <el-table-column label="合同状态" prop="CONSTATUSNAME" width="180" />
</template> <el-table-column label="是否需要同步" prop="SYNCHRONIZATIONSTATUS" width="180">
</el-table-column> -->
<el-table-column label="合同状态" prop="CONSTATUSNAME" />
<el-table-column label="是否需要同步" prop="SYNCHRONIZATIONSTATUS">
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<!-- <template v-if="['2',2,3,'3'].includes(row.CONSTATUS)">
{{ statusEnum[row.CONSTATUS] }}
</template>
<template v-else>
<el-switch
v-model="row.CONSTATUS"
active-value="1"
inactive-value="0"
@click="mergeSyn(row)"
/>
</template>-->
<el-switch <el-switch
v-model="row.SYNCHRONIZATIONSTATUS" v-model="row.SYNCHRONIZATIONSTATUS"
active-value="1" active-value="1"
...@@ -121,8 +93,8 @@ ...@@ -121,8 +93,8 @@
/> />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="上一次同步时间" prop="SYNCHRONIZATIONDATE" /> <el-table-column label="上一次同步时间" prop="SYNCHRONIZATIONDATE" width="180" />
<el-table-column width="180px" label="操作"> <el-table-column label="操作" fixed="right" width="180">
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<el-link :underline="false" type="primary" @click.stop="update(row)">修改</el-link> <el-link :underline="false" type="primary" @click.stop="update(row)">修改</el-link>
<el-link :underline="false" type="success" style="margin-left: 10px" @click.stop="pushInfo(row)">推送</el-link> <el-link :underline="false" type="success" style="margin-left: 10px" @click.stop="pushInfo(row)">推送</el-link>
...@@ -136,32 +108,19 @@ ...@@ -136,32 +108,19 @@
<div class="title">合同列表</div> <div class="title">合同列表</div>
<el-table :row-style="tableRowStyle" :data="data" border> <el-table :row-style="tableRowStyle" :data="data" border>
<el-table-column label="序号" type="index" width="55" /> <el-table-column label="序号" type="index" width="55" />
<el-table-column label="原合同ID" prop="FROMID" :show-overflow-tooltip="true" /> <el-table-column label="原合同ID" prop="FROMID" width="300" :show-overflow-tooltip="true" />
<el-table-column label="合同中文名称" prop="CONNAMECN" :show-overflow-tooltip="true" /> <el-table-column label="人员ID" prop="perCard" width="180" :show-overflow-tooltip="true" />
<el-table-column label="合同编码" prop="CONCODE" :show-overflow-tooltip="true" /> <el-table-column label="部门名称" prop="deptName" width="180" :show-overflow-tooltip="true" />
<el-table-column label="项目编码" prop="PROJNUMBER" :show-overflow-tooltip="true" /> <el-table-column label="合同中文名称" prop="CONNAMECN" width="180" :show-overflow-tooltip="true" />
<el-table-column label="项目名称" prop="PROJNAME" :show-overflow-tooltip="true" /> <el-table-column label="合同编码" prop="CONCODE" width="180" :show-overflow-tooltip="true" />
<el-table-column label="合同业务类型" prop="BUSINESSTYPE" /> <el-table-column label="合同审批状态" prop="Type" width="180" :show-overflow-tooltip="true" />
<el-table-column label="签约日期" prop="SIGNDATE" /> <el-table-column label="项目编码" prop="PROJNUMBER" width="180" :show-overflow-tooltip="true" />
<!-- <el-table-column label="同步状态" prop="synchronization"> <el-table-column label="项目名称" prop="PROJNAME" width="180" :show-overflow-tooltip="true" />
<template slot-scope="{ row }"> <el-table-column label="合同业务类型" prop="BUSINESSTYPE" width="180" />
{{ { '0': '未同步', '1': '已同步' }[row.synchronization] }} <el-table-column label="签约日期" prop="SIGNDATE" width="180" />
</template> <el-table-column label="合同状态" prop="CONSTATUSNAME" width="180" />
</el-table-column> --> <el-table-column label="是否需要同步" prop="SYNCHRONIZATIONSTATUS" width="180">
<el-table-column label="合同状态" prop="CONSTATUSNAME" />
<el-table-column label="是否需要同步" prop="SYNCHRONIZATIONSTATUS">
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<!-- <template v-if="['2',2,3,'3'].includes(row.CONSTATUS)">
{{ statusEnum[row.CONSTATUS] }}
</template>
<template v-else>
<el-switch
v-model="row.CONSTATUS"
active-value="1"
inactive-value="0"
@click="mergeSyn(row)"
/>
</template>-->
<el-switch <el-switch
v-model="row.SYNCHRONIZATIONSTATUS" v-model="row.SYNCHRONIZATIONSTATUS"
active-value="1" active-value="1"
...@@ -170,8 +129,8 @@ ...@@ -170,8 +129,8 @@
/> />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="上一次同步时间" prop="SYNCHRONIZATIONDATE" /> <el-table-column label="上一次同步时间" prop="SYNCHRONIZATIONDATE" width="180" />
<el-table-column width="180px" label="操作"> <el-table-column label="操作" fixed="right" width="180">
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<el-link :underline="false" type="primary" @click.stop="update(row)">修改</el-link> <el-link :underline="false" type="primary" @click.stop="update(row)">修改</el-link>
<el-link :underline="false" type="success" style="margin-left: 10px" @click.stop="pushInfo(row)">推送</el-link> <el-link :underline="false" type="success" style="margin-left: 10px" @click.stop="pushInfo(row)">推送</el-link>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment