From 182f058933799f296b672a5f86930ed5bea05905 Mon Sep 17 00:00:00 2001
From: liuxy <me_liuxy@163.com>
Date: Mon, 8 Jan 2024 10:14:22 +0800
Subject: [PATCH] up

---
 .../contract/components/addContractLedger.vue |  13 ++-
 src/views/contract/contractLedger.vue         | 102 ++++++++----------
 2 files changed, 51 insertions(+), 64 deletions(-)

diff --git a/src/views/contract/components/addContractLedger.vue b/src/views/contract/components/addContractLedger.vue
index b8794c6..fd98f4d 100644
--- a/src/views/contract/components/addContractLedger.vue
+++ b/src/views/contract/components/addContractLedger.vue
@@ -4,12 +4,12 @@
       ref="dialog"
       :is-show.sync="isShow"
       type="form"
-      :title="type === 'add' ? '新增合同' : '编辑合同'"
+      :title="type === 'add' ? '新增合同事项' : '编辑合同事项'"
       :form="form"
       :rules="rules"
       @submit="submit"
     >
-      <template #extraFormTop>
+      <template #extraFormTop v-if="false">
         <el-form-item size="small">
           <div class="xy-table-item">
             <div class="xy-table-item-label">
@@ -58,7 +58,7 @@
           </div>
         </div>
       </template>
-      <template v-slot:number>
+      <!--<template v-slot:number>
         <div class="xy-table-item">
           <div class="xy-table-item-label">
             <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>合同编号
@@ -67,7 +67,7 @@
             <el-input placeholder="请填写合同编号" v-model="form.number" style="width: 300px;" />
           </div>
         </div>
-      </template>
+      </template>-->
       <template v-slot:supply>
         <div class="xy-table-item">
           <div class="xy-table-item-label">
@@ -88,6 +88,7 @@
           </div>
         </div>
       </template>
+      <!--
       <template v-slot:guarantee_money>
         <div class="xy-table-item">
           <div class="xy-table-item-label">
@@ -141,7 +142,7 @@
             </el-date-picker>
           </div>
         </div>
-      </template>
+      </template>-->
       <template v-slot:is_framework>
         <div class="xy-table-item">
           <div class="xy-table-item-label">
@@ -160,6 +161,7 @@
           </div>
         </div>
       </template>
+      <!--
       <template v-slot:files>
         <div class="xy-table-item">
           <div class="xy-table-item-label">
@@ -200,6 +202,7 @@
           </div>
         </div>
       </template>
+      -->
     </xy-dialog>
   </div>
 </template>
diff --git a/src/views/contract/contractLedger.vue b/src/views/contract/contractLedger.vue
index ac427cd..af7374b 100644
--- a/src/views/contract/contractLedger.vue
+++ b/src/views/contract/contractLedger.vue
@@ -265,8 +265,6 @@
                           ].isShowPaymentRegistration = true)
                       "
                     >
-                      <!--                           paying(scope.row) @click="$refs['paymentRegistration'].getContract(scope.row),$refs['paymentRegistration'].isShowPaymentRegistration = true"-->
-
                       付款登记
                     </Button>
                   </template>
@@ -288,9 +286,9 @@
                   </Button>
                 </template>
               </template>
-
+             <!--合同没有签订，合同审批完成，需要签订合同-->
               <template
-                v-if="(scope.row.status === 1 && scope.row.join_status === 3 && !/contractLedger/g.test($route.path)) || !(!scope.row.is_framework && scope.row.purchase_way && scope.row.purchase_way.value === '网上商城')"
+                v-if="(scope.row.status === 1 && scope.row.join_status === 3&&scope.row.is_contract )"
               >
                 <Button
                   class="slot-btns-item"
@@ -304,40 +302,11 @@
                   签订合同
                 </Button>
               </template>
-              <!--      采购完成        -->
-              <template
-                v-if="
-                  scope.row.invite_status === 1 &&
-                  scope.row.purchase_status === 3 &&
-                  (scope.row.purchase_way
-                    ? scope.row.purchase_way.remark === 'true'
-                    : false) &&
-                  !scope.row.is_substitute
-                "
-              >
-                <Button
-                  class="slot-btns-item"
-                  size="small"
-                  type="primary"
-                  @click="
-                    $refs['biddingUpload'].setId(scope.row.id),
-                      $refs['biddingUpload'].show()
-                  "
-                  >招标审查</Button
-                >
-              </template>
+
 
               <!--不需要走采购流程那么直接就是会签，如果采购方式不需要招标的也是直接会签-->
               <template
-                v-if="
-                  (scope.row.join_status === 1 &&
-                    (scope.row.invite_status === 3 ||
-                      ((scope.row.purchase_way
-                        ? scope.row.purchase_way.remark === 'false'
-                        : false) &&
-                        scope.row.purchase_status === 3))) ||
-                  (scope.row.is_substitute && scope.row.join_status === 1)
-                "
+                v-if="(scope.row.join_status === 1&&scope.row.is_contract)"
               >
                 <Button
                   class="slot-btns-item"
@@ -347,23 +316,7 @@
                   >合同审批
                 </Button>
               </template>
-              <template
-                v-if="
-                  scope.row.is_simple !== 1 &&
-                  scope.row.purchase_status === 1 &&
-                  ((scope.row.req_status === 3 && scope.row.is_plan === 0) ||
-                    scope.row.is_plan === 1) &&
-                  !scope.row.is_substitute
-                "
-              >
-                <Button
-                  class="slot-btns-item"
-                  size="small"
-                  type="primary"
-                  @click="buyProcess(scope.row)"
-                  >采购流程
-                </Button>
-              </template>
+
 
               <Poptip trigger="hover" placement="bottom" transfer>
                 <Button ghost size="small" type="primary">更多</Button>
@@ -1198,7 +1151,8 @@ export default {
         plan_name: "请选择预算计划",
         start_plan_price: undefined,
         end_plan_price: undefined,
-        is_myself: 0
+        is_myself: 0,
+        is_contract:1
       },
       selectCopy: {
         keyword: "",
@@ -1295,7 +1249,41 @@ export default {
               </div>
             );
           },
-        },
+        },{
+              label: "合同审批流程",
+              width: 145,
+              prop: "join_status",
+              customFn:row => {
+                if (row.is_simple || !row.is_contract) {
+                  return (<span>无</span>);
+                }
+                const getDate = (value) => {
+                  switch (value) {
+                    case 1:
+                      return "待申请";
+                      break;
+                    case 2:
+                      return "流转中";
+                      break;
+                    case 3:
+                      return "已办结";
+                      break;
+                    default:
+                      return "异常";
+                      break;
+                  }
+                }
+                return (
+                  <div>
+                    <span>{ getDate(row.join_status) }</span>
+                    <br/>
+                    {
+                      (row.is_simple || row.join_status === 1) ? '' : <a style="color: #333" on={{['click']:()=>this.toOaDetail('hetong',row)}}>查看</a>
+                    }
+                  </div>
+                )
+              }
+            },
         {
           label: "付款计划",
           prop: "sign_plan_count",
@@ -2112,11 +2100,7 @@ export default {
     },
     //获取合同列表
     async getContracts(is_export,noloading=false) {
-      if (/contractLedger/g.test(this.$route.path)) {
-        this.select.is_contract = 1
-      } else {
-        this.select.is_contract = ""
-      }
+
       const res = await getContract({
         page_size: this.select.pageSize,
         page: this.select.pageIndex,