Merge branch 'dev0.3' into stage

src/components/process/ContractAlteration.vue

@@ -1092,7 +1092,7 @@ const getDecisionAids = () => {
           </tr>
         </thead>
         <tbody>`;
-      formData.data.contractProductList.forEach((item) => {
+      res.contractProductList.forEach((item) => {
         tableHtml += `<tr>
           <td>${item.productCnName}</td >
           <td>${item.productName}</td>

src/views/process/dealWith/backlog.vue

@@ -255,9 +255,13 @@ const getUrlObj = {
 }
 const getList = async (req) => {
 	sourceList.value.pagination = { ...sourceList.value.pagination, ...req }
+	let reqData = {
+		...sourceList.value.pagination,
+	}
+	reqData.status = ''
 	loading.value = true
 	proxy
-		.post( getUrlObj[sourceList.value.pagination.status], sourceList.value.pagination)
+		.post( getUrlObj[sourceList.value.pagination.status], reqData)
 		.then((message) => {
 			console.log(message)
 			sourceList.value.data = message.rows

src/views/process/dealWith/index.vue

@@ -152,7 +152,7 @@ const config = computed(() => {
 				return [
 					{
                         attrs: {
-                            label: row.status == 0 || row.status == 1 ? '办理' : '查看',
+                            label: row.status == 0 || row.status == 1 ? '查看' : '查看',
                             type: 'primary',
                             text: true,
                             bg: true,
@@ -160,17 +160,18 @@ const config = computed(() => {
                         },
                         el: 'button',
                         click() {
+							proxy.$router.push({
+								path: "/platform_manage/process/processApproval",
+								query: {
+									flowKey: row.flowKey,
+									id: row.id,
+									processType:20,
+									version:row.version
+								},
+							});
+							return
 							if(row.status != 1 && row.status != 0) {
-								proxy.$router.push({
-									path: "/platform_manage/process/processApproval",
-									query: {
-										flowKey: row.flowKey,
-										id: row.id,
-										processType:20,
-										version:row.version
-									},
-								});
-								return
+								
 							}
 							proxy.post('flowExample/getApprovalRecord',{id:row.id}).then(res=>{
 								if(res.recordList.length > 0) {
@@ -268,8 +269,12 @@ const getUrlObj = {
 const getList = async (req) => {
 	sourceList.value.pagination = { ...sourceList.value.pagination, ...req }
 	loading.value = true
+	let reqData = {
+		...sourceList.value.pagination,
+	}
+	reqData.status = ''
 	proxy
-		.post( getUrlObj[sourceList.value.pagination.status], sourceList.value.pagination)
+		.post( getUrlObj[sourceList.value.pagination.status], reqData)
 		.then((message) => {
 			console.log(message)
 			sourceList.value.data = message.rows

src/views/process/processApproval/index.vue

@@ -160,8 +160,10 @@
       </div>
     </div>
     <div class="right-card">
+      
       <el-tabs v-model="activeName" class="demo-tabs">
         <el-tab-pane label="审批记录" name="first">
+          
           <ul class="flow-chart">
             <li
               v-for="item in recordList"
@@ -207,7 +209,18 @@
               </div>
               <div class="line"></div>
             </li>
+            
           </ul>
+          <div>
+            <el-button
+              type="primary"
+              :loading="btnLoading"
+              style="margin: 20px 150px;"
+              v-if="isRevocation"
+              @click="handleSubmit(3)"
+              >撤回</el-button
+            >
+          </div>
         </el-tab-pane>
         <el-tab-pane
           label="决策辅助"
@@ -718,6 +731,7 @@ const fileObj = ref({});
 const approvalRecordData = ref({
   buttonInfoList: [],
 });
+let isRevocation = ref(false);
 const getRecords = (_id) => {
   if (_id) {
     proxy
@@ -731,6 +745,16 @@ const getRecords = (_id) => {
         fileIds.value = res.recordList.map((item) => {
           return item.flowExampleDetailId;
         });
+        for (let i = 0; i < res.recordList.length; i++) {
+          const element = res.recordList[i];
+          if(element.status == 2) {
+            // 2为审批中
+            if(element.processedUser === res.recordList[i - 1].processedUser) {
+              // 当前审批人和上一条审批人相同，开启撤回开关
+              isRevocation.value = true;
+            }
+          }
+        }
         proxy
           .post("fileInfo/getList", { businessIdList: fileIds.value })
           .then((res2) => {
@@ -821,9 +845,11 @@ onMounted(async () => {
     padding: 0 20px 20px;
     width: 400px;
     box-sizing: border-box;
+    height: calc(100vh - 130px);
+    overflow: auto;
     .flow-chart {
       overflow: auto;
-      height: calc(100vh - 200px);
+      //height: calc(100vh - 200px);
       padding: 0;
       margin: 0;
       li {