From abf23397c013f835cf081bc97621153f662d4c9c Mon Sep 17 00:00:00 2001
From: xy <271556543@qq.com>
Date: Mon, 11 Dec 2023 10:10:50 +0800
Subject: [PATCH] 2023-12-11

---
 src/components/XyTable/index.vue              |  5 ++
 .../contract/components/printRegistration.vue |  2 +-
 src/views/contract/contractList.vue           | 66 ++++++++---------
 src/views/contract/seeContract.vue            | 71 ++++++++++---------
 .../components/examineRegistration.vue        | 16 ++---
 5 files changed, 83 insertions(+), 77 deletions(-)

diff --git a/src/components/XyTable/index.vue b/src/components/XyTable/index.vue
index 9a391d3..74ef2ab 100644
--- a/src/components/XyTable/index.vue
+++ b/src/components/XyTable/index.vue
@@ -1,6 +1,10 @@
 <script>
 export default {
   props:{
+    stripe: {
+      type: Boolean,
+      default: true
+    },
     highlightCurrentRow: {
       type: Boolean,
       default: false
@@ -177,6 +181,7 @@ export default {
             default-expand-all={defaultExpandAll}
             tree-props={treeProps}
             fit={true}
+            stripe={this.stripe}
             on={{
               ['row-click']: rowClick,
               ['select']: selectClick,
diff --git a/src/views/contract/components/printRegistration.vue b/src/views/contract/components/printRegistration.vue
index cf04a07..0c06836 100644
--- a/src/views/contract/components/printRegistration.vue
+++ b/src/views/contract/components/printRegistration.vue
@@ -1,7 +1,7 @@
 <template>
   <div v-if="registration">
     <xy-dialog title="打印预览" :is-show.sync="isShow" :width="70" @on-ok="print" ok-text="打印">
-      <template v-slot:normalContent>
+      <template>
         <div class="print-table1" id="printtable1" ref="printtable">
           <div class="print-table1-title">苏州市河道管理处资金划拨审批单</div>
 
diff --git a/src/views/contract/contractList.vue b/src/views/contract/contractList.vue
index 5e8e013..96e9763 100644
--- a/src/views/contract/contractList.vue
+++ b/src/views/contract/contractList.vue
@@ -245,24 +245,24 @@
                   </Option>
                 </Select>
               </div>
-              <div>
-            <span style="padding: 0 6px; word-break: keep-all">
-              请示流程状态
-            </span>
-                <Select
-                  v-model="select.req_status"
-                  clearable
-                  placeholder="请选择"
-                  style="width: 100px"
-                >
-                  <Option
-                    v-for="item in options"
-                    :key="item.value"
-                    :value="item.value"
-                  >{{ item.label }}
-                  </Option>
-                </Select>
-              </div>
+<!--              <div>-->
+<!--            <span style="padding: 0 6px; word-break: keep-all">-->
+<!--              请示流程状态-->
+<!--            </span>-->
+<!--                <Select-->
+<!--                  v-model="select.req_status"-->
+<!--                  clearable-->
+<!--                  placeholder="请选择"-->
+<!--                  style="width: 100px"-->
+<!--                >-->
+<!--                  <Option-->
+<!--                    v-for="item in options"-->
+<!--                    :key="item.value"-->
+<!--                    :value="item.value"-->
+<!--                  >{{ item.label }}-->
+<!--                  </Option>-->
+<!--                </Select>-->
+<!--              </div>-->
             </div>
           </xy-selectors>
 
@@ -381,21 +381,21 @@
                 >
               </template>
               <!--              <Button class="slot-btns-item" type="primary" size="small">附件管理</Button>-->
-              <template
-                v-if="
-                  scope.row.req_status === 1 &&
-                  scope.row.is_plan === 0 &&
-                  !scope.row.is_substitute
-                "
-              >
-                <Button
-                  class="slot-btns-item"
-                  size="small"
-                  type="primary"
-                  @click="askProcess(scope.row)"
-                  >请示流程
-                </Button>
-              </template>
+<!--              <template-->
+<!--                v-if="-->
+<!--                  scope.row.req_status === 1 &&-->
+<!--                  scope.row.is_plan === 0 &&-->
+<!--                  !scope.row.is_substitute-->
+<!--                "-->
+<!--              >-->
+<!--                <Button-->
+<!--                  class="slot-btns-item"-->
+<!--                  size="small"-->
+<!--                  type="primary"-->
+<!--                  @click="askProcess(scope.row)"-->
+<!--                  >请示流程-->
+<!--                </Button>-->
+<!--              </template>-->
 
               <!--              中标-->
               <!--              <template v-if="false">-->
diff --git a/src/views/contract/seeContract.vue b/src/views/contract/seeContract.vue
index 8130ed9..7b71c6b 100644
--- a/src/views/contract/seeContract.vue
+++ b/src/views/contract/seeContract.vue
@@ -155,15 +155,15 @@
                   </Option>
                 </Select>
               </div>
-              <div v-if="type!=1">
-            <span style="padding: 0 6px;word-break: keep-all;">
-              请示流程状态
-            </span>
-                <Select v-model="select.req_status" clearable placeholder="请选择" style="width:100px;">
-                  <Option v-for="item in options" :key="item.value" :value="item.value">{{ item.label }}
-                  </Option>
-                </Select>
-              </div>
+<!--              <div v-if="type!=1">-->
+<!--            <span style="padding: 0 6px;word-break: keep-all;">-->
+<!--              请示流程状态-->
+<!--            </span>-->
+<!--                <Select v-model="select.req_status" clearable placeholder="请选择" style="width:100px;">-->
+<!--                  <Option v-for="item in options" :key="item.value" :value="item.value">{{ item.label }}-->
+<!--                  </Option>-->
+<!--                </Select>-->
+<!--              </div>-->
             </div>
           </xy-selectors>
 
@@ -313,7 +313,7 @@
 
     <!--  搜索使用 预算计划  -->
     <xy-dialog :is-show.sync="isShowPlanForSearch" title="预算计划" :width="720" @on-ok="planSelectForSearch">
-      <template v-slot:normalContent>
+      <template>
         <Input v-model="planSearch.name" search enter-button="搜 索" placeholder="搜索预算计划.." @on-search="getBudgets" />
         <div style="margin: 10px 0;display: flex;justify-content: space-between;
     align-items: center;">
@@ -340,7 +340,7 @@
 
     <!--  新增表 预算计划  -->
     <xy-dialog :is-show.sync="isShowPlan" :width="720" title="预算计划" @on-ok="planSelect">
-      <template v-slot:normalContent>
+      <template>
         <div style="display: flex;">
           <el-select placeholder="科室选择" clearable size="small" v-model="planSearch.plan_department_id"
             style="width: 160px;">
@@ -568,30 +568,31 @@
           },
           {
             label: "采购流程",
-            multiHd: [{
-                label: "请示流程",
-                width: 140,
-                prop: 'req_status',
-                formatter: (cell, data, value) => {
-                  if (cell.is_plan === 1) {
-                    return '无'
-                  }
-                  switch (value) {
-                    case 1:
-                      return "待申请"
-                      break;
-                    case 2:
-                      return "流转中"
-                      break;
-                    case 3:
-                      return "已办结"
-                      break;
-                    default:
-                      return "异常"
-                      break;
-                  }
-                }
-              },
+            multiHd: [
+              // {
+              //   label: "请示流程",
+              //   width: 140,
+              //   prop: 'req_status',
+              //   formatter: (cell, data, value) => {
+              //     if (cell.is_plan === 1) {
+              //       return '无'
+              //     }
+              //     switch (value) {
+              //       case 1:
+              //         return "待申请"
+              //         break;
+              //       case 2:
+              //         return "流转中"
+              //         break;
+              //       case 3:
+              //         return "已办结"
+              //         break;
+              //       default:
+              //         return "异常"
+              //         break;
+              //     }
+              //   }
+              // },
               {
                 label: "采购业务审批流程",
                 width: 158,
diff --git a/src/views/finance/components/examineRegistration.vue b/src/views/finance/components/examineRegistration.vue
index e62d4df..9660bb0 100644
--- a/src/views/finance/components/examineRegistration.vue
+++ b/src/views/finance/components/examineRegistration.vue
@@ -12,7 +12,7 @@
           <div class="payment-registration-row-title">合同名称</div>
           <div class="payment-registration-row-content">{{contract.name}}</div>
         </div>
-        
+
         <div class="payment-registration-row">
           <div class="payment-registration-row-title">合同金额</div>
           <div class="payment-registration-row-content">{{moneyFormat(contract.money)}} （元）</div>
@@ -493,13 +493,13 @@
           total += Number(item.use_money)
         })
         console.log(Number(this.paymentRegistrationForm.actMoney).toFixed(2), total.toFixed(2))
-        if (Number(this.paymentRegistrationForm.actMoney).toFixed(2) !== total.toFixed(2)) {
-          Message({
-            type: 'warning',
-            message: '实际付款金额与计划总金额不符'
-          })
-          return
-        }
+        // if (Number(this.paymentRegistrationForm.actMoney).toFixed(2) !== total.toFixed(2)) {
+        //   Message({
+        //     type: 'warning',
+        //     message: '实际付款金额与计划总金额不符'
+        //   })
+        //   return
+        // }
         console.log({
           id: this.registrationId,
           contract_id: this.contract.id,