终止修改

src/views/assets/allList.vue

@@ -282,16 +282,16 @@ export default {
     },
     // 终止流程
     terminate(currentNodeId, statementNo, reportNo) {
-      this.$confirm('该操作将终止流程, 是否继续?', '提示', {
+      this.$prompt('请填写终止原因。', '终止', {
         confirmButtonText: '终止',
         cancelButtonText: '取消',
         type: 'warning',
       })
-        .then(() => {
+        .then(({value}) => {
           let commit = new Object()
           commit.instanceNodeId = currentNodeId
           commit.state = 'TERMINATE'
-          commit.comments = '超级管理员终止流程'
+          commit.comments = value
           commit.businessSubId = statementNo
           commit.businessMinId = reportNo
           commit.ifCheckTask = false

src/views/assets/terminateList.vue

@@ -56,6 +56,11 @@
                         <span>{{ row.reportNo == null ? '-' : row.reportNo }}</span>
                     </template>
                 </el-table-column>
+                <el-table-column label="终止原因" align="center" width="250">
+                    <template slot-scope="{row}">
+                        <span style="color: red;">{{ row.comment}}</span>
+                    </template>
+                </el-table-column>
                 <el-table-column label="业务类型" align="center" width="150">
                     <template slot-scope="{row}">
                         <span>{{ row.assetsBusinessGener }}</span>

src/views/finance/settleMajor.vue

@@ -104,11 +104,11 @@
                 <span>{{ row.principal }}</span>
               </template>
             </el-table-column>
-            <!-- <el-table-column label="参与人"  align="center">
+            <el-table-column label="参与人"  align="center">
                 <template slot-scope="{row}">
-                  <span>{{ row.principal }}</span>
+                  <span>{{ row.joiner }}</span>
                 </template>
-              </el-table-column> -->
+              </el-table-column>
             <el-table-column label="结算金额(元)" align="center">
               <template slot-scope="{row}">
                 <span style="color:red;font-weight: bold;">{{ row.claimAmount }}</span>
@@ -237,11 +237,11 @@
                 <span>{{ row.principal }}</span>
               </template>
             </el-table-column>
-            <!-- <el-table-column label="参与人"  align="center">
+            <el-table-column label="参与人"  align="center">
                 <template slot-scope="{row}">
-                  <span>{{ row.principal }}</span>
+                  <span>{{ row.joiner }}</span>
                 </template>
-              </el-table-column> -->
+              </el-table-column>
             <el-table-column label="结算金额(元)" align="center">
               <template slot-scope="{row}">
                 <span style="color:red;font-weight: bold;">{{ row.claimAmount }}</span>

src/views/major/list.vue

@@ -239,16 +239,16 @@ export default {
     },
     // 终止流程
     terminate(currentNodeId, statementNo, reportNo) {
-      this.$confirm('该操作将终止流程, 是否继续?', '提示', {
+      this.$prompt('请填写终止原因。', '终止', {
         confirmButtonText: '终止',
         cancelButtonText: '取消',
         type: 'warning',
       })
-        .then(() => {
+        .then(({value}) => {
           let commit = new Object()
           commit.instanceNodeId = currentNodeId;
           commit.state = 'TERMINATE';
-          commit.comments = '超级管理员终止流程';
+          commit.comments = value;
           commit.businessSubId = statementNo;
           commit.businessMinId = reportNo;
           commit.ifCheckTask = false;

src/views/major/terminateList.vue

@@ -12,116 +12,41 @@
         </MoreSearchBar>
       </template>
       <parentTable ref="table" v-loading="listLoading" :data="pageData.records" slot="table" style="width: 100%;" @sortTable="sortTable" @headerClick="switchHeader">
-        <el-table-column label="项目名称" align="center" width="250" v-if="!hiddenLabels.includes('productionName')" prop="productionName" show-overflow-tooltip>
+        <el-table-column label="项目名称" align="center"  v-if="!hiddenLabels.includes('productionName')" prop="productionName" show-overflow-tooltip>
           <template slot-scope="{row}">
             <span class = "enableClick" @click="orderDetail(row)">{{ row.productionName==null?row.name: row.productionName }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="订单号" align="center" width="150" v-if="!hiddenLabels.includes('orderId')" prop="orderId">
+        <el-table-column label="订单号" align="center"  v-if="!hiddenLabels.includes('orderId')" prop="orderId">
           <template slot-scope="{row}">
             <span class = "enableClick" @click="orderDetail(row)" @contextmenu.prevent="$doCopy(row.orderId)">{{ row.orderId }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="价值意见书号" align="center" width="200" v-if="!hiddenLabels.includes('statementNo')" prop="statementNo" sortable >
+        <el-table-column label="价值意见书号" align="center"  v-if="!hiddenLabels.includes('statementNo')" prop="statementNo" sortable >
           <template slot-scope="{row}">
             <span @contextmenu.prevent="$doCopy(row.statementNo)">{{ row.statementNo==null?'-': row.statementNo }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="报告号/复评函号" align="center" width="200" v-if="!hiddenLabels.includes('reportNo')" prop="reportNo" sortable>
+        <el-table-column label="报告号/复评函号" align="center"  v-if="!hiddenLabels.includes('reportNo')" prop="reportNo" sortable>
           <template slot-scope="{row}">
             <span @contextmenu.prevent="$doCopy(row.reportNo)">{{ row.reportNo==null?'-': row.reportNo }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="当前节点" align="center" width="130" v-if="!hiddenLabels.includes('nodeName')" prop="nodeName" sortable>
+        <el-table-column label="终止原因" align="center"  prop="comment">
           <template slot-scope="{row}">
-            <span>{{ row.nodeName }}</span>
+            <span style="color: red;">{{ row.comment }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="待办人" align="center" width="130" v-if="!hiddenLabels.includes('handler')" prop="handler">
-          <template slot-scope="{row}">
-            <span>{{ row.handler }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="委托人" align="center" width="130" v-if="!hiddenLabels.includes('clientName')" prop="clientName">
-          <template slot-scope="{row}">
-            <span>{{ row.clientName==null?'-': row.clientName }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="委托人电话" align="center" width="130" v-if="!hiddenLabels.includes('clientTel')" prop="clientTel">
-          <template slot-scope="{row}">
-            <span>{{ row.clientTel==null?'-': row.clientTel }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="产权人" align="center" width="130" v-if="!hiddenLabels.includes('owner')" prop="owner">
-          <template slot-scope="{row}">
-            <span>{{ row.owner==null?'-': row.owner }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="评估总价" align="center" width="130" v-if="!hiddenLabels.includes('evaluateAmount')" prop="evaluateAmount">
-          <template slot-scope="{row}">
-            <span>{{ row.evaluateAmount==null?'-': row.evaluateAmount/10000 +'万'}}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="金融类型" align="center" width="130" v-if="!hiddenLabels.includes('financial')" prop="financial">
-          <template slot-scope="{row}">
-            <span>{{ row.financial?'金融':'非金融' }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="分单类型" align="center" v-if="!hiddenLabels.includes('allotType')" prop="allotType">
-          <template slot-scope="{row}">
-            <span>{{ row.allotType }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="客户经理" align="center" v-if="!hiddenLabels.includes('clientManager')" prop="clientManager">
+        <el-table-column label="客户经理" align="center"  v-if="!hiddenLabels.includes('clientManager')" prop="clientManager">
           <template slot-scope="{row}">
             <span>{{ row.clientManager }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="负责人" align="center" v-if="!hiddenLabels.includes('principal')" prop="principal">
+        <el-table-column label="负责人" align="center"  v-if="!hiddenLabels.includes('principal')" prop="principal">
           <template slot-scope="{row}">
             <span>{{ row.principal==null?'-': row.principal }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="接单部门" align="center" width="130" v-if="!hiddenLabels.includes('department')" prop="department">
-          <template slot-scope="{row}">
-            <span>{{ row.department }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="评估对象类型" align="center" width="130" v-if="!hiddenLabels.includes('businessObjectType')" prop="businessObjectType">
-          <template slot-scope="{row}">
-            <span>{{ row.businessObjectType }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="客户名称" align="center" width="130" v-if="!hiddenLabels.includes('cclienteleName')" prop="cclienteleName">
-          <template slot-scope="{row}">
-            <span>{{ row.cclienteleName }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="业务来源" align="center" width="130" v-if="!hiddenLabels.includes('cclienteleSubName')" prop="cclienteleSubName">
-          <template slot-scope="{row}">
-            <span>{{ row.cclienteleSubName }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="客户联系人" align="center" width="130" v-if="!hiddenLabels.includes('cclienteleContactName')" prop="cclienteleContactName">
-          <template slot-scope="{row}">
-            <span>{{ row.cclienteleContactName }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="客户联系人电话" align="center" width="130" v-if="!hiddenLabels.includes('cmobile')" prop="cmobile">
-          <template slot-scope="{row}">
-            {{ row.cmobile }}
-          </template>
-        </el-table-column>
-        <el-table-column label="下单时间" align="center" width="110" v-if="!hiddenLabels.includes('created')" prop="created" sortable>
-          <template slot-scope="{row}">
-            {{ row.created }}
-          </template>
-        </el-table-column>
-        <el-table-column label="操作" align="center" width="80" fixed="right">
-          <template slot-scope="{row}">
-            <el-button type="text" @click="orderDetail(row)">详情</el-button>
-          </template>
-        </el-table-column>
       </parentTable>
     </y-page-list-layout>
   </div>

src/views/personal/pendingList.vue

@@ -231,16 +231,16 @@ export default {
     },
     // 终止流程
     terminate(currentNodeId, orderId) {
-      this.$confirm('该操作将终止流程, 是否继续?', '提示', {
+      this.$prompt('请填写终止原因。', '终止', {
         confirmButtonText: '终止',
         cancelButtonText: '取消',
         type: 'warning',
       })
-        .then(() => {
+        .then(({value}) => {
           let commit = new Object()
           commit.instanceNodeId = currentNodeId;
           commit.state = 'TERMINATE';
-          commit.comments = '超级管理员终止流程';
+          commit.comments = value;
           commit.businessSubId = orderId;
           commit.ifCheckTask = false;
           this.$api.workflow.commit(commit).then((res) => {

src/views/personal/terminateList.vue

@@ -23,16 +23,6 @@
             <span class="enableClick" @click="orderDetail(row)">{{ row.location }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="当前节点" align="center" width="130"  v-if="!hiddenLabels.includes('currentNodeName')" prop="currentNodeName">
-          <template slot-scope="{row}">
-            <span>{{ row.currentNodeName }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="处理人" align="center" width="130" v-if="!hiddenLabels.includes('handlerName')" prop="handlerName">
-          <template slot-scope="{row}">
-            <span>{{ row.handlerName }}</span>
-          </template>
-        </el-table-column>
         <el-table-column label="面积" align="center" width="130" v-if="!hiddenLabels.includes('acreage')" prop="acreage">
           <template slot-scope="{row}">
             <span>{{ row.acreage? row.acreage+'平': '-' }}</span>
@@ -48,6 +38,11 @@
             <span>{{ row.amount? (row.amount/10000).toFixed(2)+'万': '-' }}</span>
           </template>
         </el-table-column>
+        <el-table-column label="终止原因" align="center" width="130"  prop="comments">
+          <template slot-scope="{row}">
+            <span style="color: red;">{{ row.comments}}</span>
+          </template>
+        </el-table-column>
         <el-table-column label="客户名称" align="center" width="130" v-if="!hiddenLabels.includes('clientName')" prop="clientName">
           <template slot-scope="{row}">
             <span>{{ row.clientName?row.clientName:'-' }}</span>