From 43f887fcfdd6311904b5874b09613ff9c1502596 Mon Sep 17 00:00:00 2001
From: xy <271556543@qq.com>
Date: Thu, 21 Mar 2024 17:35:53 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=90=88=E5=90=8C=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                    |   13 +
 .env.production                     |   22 +
 .env.staging                        |   10 +-
 package.json                        |    1 +
 src/api/contract/contract.js        |    8 +-
 src/api/oatoken/index.js            |    3 +-
 src/api/user.js                     |    6 +-
 src/assets/css/common.less          |   17 +-
 src/components/XyDialog/index.vue   |  146 +-
 src/layout/index.vue                |    6 -
 src/layout/noLayout.vue             |    6 -
 src/permission.js                   |    3 +
 src/views/contract/contractEdit.vue | 2112 +++++++++++++++++----------
 src/views/contract/contractList.vue |  429 +++---
 vue.config.js                       |   12 +-
 15 files changed, 1736 insertions(+), 1058 deletions(-)
 create mode 100644 .env.development
 create mode 100644 .env.production

diff --git a/.env.development b/.env.development
new file mode 100644
index 0000000..a68c83c
--- /dev/null
+++ b/.env.development
@@ -0,0 +1,13 @@
+# just a flag
+ENV = 'development'
+
+# base api
+VUE_APP_DOMIAN = http://hjjc-hdcontract-test.ali251.langye.net
+VUE_APP_UPLOAD_API = http://hjjc-hdcontract-test.ali251.langye.net/api/admin/upload-file
+VUE_APP_BASE_API =
+VUE_APP_OUT_Book = http://hjjc-book-service-test.ali251.langye.net
+VUE_APP_OUT_GDZC = http://hjjc-szemcgdzc.ali251.langye.net
+VUE_APP_OUT_OLD = http://hjjc-szemcold-test.ali251.langye.net
+VUE_APP_OUT_URL = http://192.168.60.18:2021
+VUE_APP_OUT_GOODS = http://hjjc-szemc_goods-test.ali251.langye.net
+VUE_APP_OLD_OA = http://192.168.0.66:16667
diff --git a/.env.production b/.env.production
new file mode 100644
index 0000000..5c9db49
--- /dev/null
+++ b/.env.production
@@ -0,0 +1,22 @@
+# just a flag
+ENV = 'production'
+
+# base api
+VUE_APP_DOMIAN=http://192.168.0.66:9001/
+VUE_APP_UPLOAD_API = http://192.168.00.66:9001/api/admin/upload-file
+VUE_APP_BASE_API = ''
+VUE_APP_OUT_Book = http://192.168.0.66:9002/
+VUE_APP_OUT_GDZC = http://192.168.0.66:17777
+VUE_APP_OUT_OLD = http://192.168.0.66
+VUE_APP_OUT_URL = http://192.168.60.18:2021
+VUE_APP_OLD_OA = http://192.168.0.66:16667
+VUE_APP_OUT_GOODS = http://hjjc-szemc_goods-test.ali251.langye.net
+
+#
+#VUE_APP_DOMIAN = http://hjjc-hdcontract-test.ali251.langye.net
+#VUE_APP_UPLOAD_API = http://hjjc-hdcontract-test.ali251.langye.net/api/admin/upload-file
+#VUE_APP_BASE_API =
+#VUE_APP_OUT_Book = http://hjjc-book-service-test.ali251.langye.net
+#VUE_APP_OUT_GDZC = http://hjjc-szemcgdzc.ali251.langye.net
+#VUE_APP_OUT_OLD = http://hjjc-szemcold-test.ali251.langye.net
+#VUE_APP_OUT_GOODS = http://hjjc-szemc_goods-test.ali251.langye.net
diff --git a/.env.staging b/.env.staging
index a8793a0..9015676 100644
--- a/.env.staging
+++ b/.env.staging
@@ -4,5 +4,13 @@ NODE_ENV = production
 ENV = 'staging'
 
 # base api
-VUE_APP_BASE_API = '/stage-api'
+VUE_APP_DOMIAN = http://hjjc-hdcontract-test.ali251.langye.net
+VUE_APP_UPLOAD_API = http://hjjc-hdcontract-test.ali251.langye.net/api/admin/upload-file
+VUE_APP_BASE_API =
+VUE_APP_OUT_Book = http://hjjc-book-service-test.ali251.langye.net
+VUE_APP_OUT_GDZC = http://hjjc-szemcgdzc.ali251.langye.net
+VUE_APP_OUT_OLD = http://hjjc-szemcold-test.ali251.langye.net
+VUE_APP_OUT_URL = http://192.168.60.18:2021
+VUE_APP_OUT_GOODS = http://hjjc-szemc_goods-test.ali251.langye.net
+VUE_APP_OLD_OA = http://192.168.0.66:16667
 
diff --git a/package.json b/package.json
index 3e47794..05104da 100644
--- a/package.json
+++ b/package.json
@@ -5,6 +5,7 @@
   "author": "Pan <panfree23@gmail.com>",
   "scripts": {
     "dev": "vue-cli-service serve",
+    "dev:prod": "vue-cli-service serve --mode production",
     "build:prod": "vue-cli-service build",
     "build:stage": "vue-cli-service build --mode staging",
     "preview": "node build/index.js --preview",
diff --git a/src/api/contract/contract.js b/src/api/contract/contract.js
index 52e946b..61419e6 100644
--- a/src/api/contract/contract.js
+++ b/src/api/contract/contract.js
@@ -9,11 +9,12 @@ export function getContract(params,noloading = false){
   })
 }
 
-export function addContrant(data){
+export function addContrant(data,noloading=false){
   return request({
     method:"post",
     url:'/api/admin/contract/store',
-    data
+    data,
+    noloading
   })
 }
 
@@ -45,7 +46,8 @@ export function checkContractName(params){
   return request({
     method:'get',
     url:'/api/admin/contract/check-name',
-    params
+    params,
+    noloading: true
   })
 }
 
diff --git a/src/api/oatoken/index.js b/src/api/oatoken/index.js
index 5b4c8bd..73a52b5 100644
--- a/src/api/oatoken/index.js
+++ b/src/api/oatoken/index.js
@@ -4,6 +4,7 @@ export function getOatoken(params){
   return request({
     method:'get',
     url:'/api/admin/oa/get-oa-token',
-    params
+    params,
+    noloading: true
   })
 }
diff --git a/src/api/user.js b/src/api/user.js
index e3cea54..9053edb 100644
--- a/src/api/user.js
+++ b/src/api/user.js
@@ -30,7 +30,8 @@ export function getInfo(token) {
   return request({
     url: '/api/admin/auth/me',
     method: 'post',
-    params: { token }
+    params: { token },
+    noloading: true
   })
 }
 
@@ -45,6 +46,7 @@ export function getAuthMenu(token) {
   return request({
     url: '/api/admin/auth/permissions',
     method: 'get',
-    params: { token }
+    params: { token },
+    noloading: true
   })
 }
diff --git a/src/assets/css/common.less b/src/assets/css/common.less
index ac7a179..9546ffb 100644
--- a/src/assets/css/common.less
+++ b/src/assets/css/common.less
@@ -3,6 +3,7 @@
     -moz-box-sizing:border-box; /* Firefox */
     -webkit-box-sizing:border-box; /* Safari */
 }
+@primary-color: #338de3;
 .el-pager li{
     font-weight: 100;
     margin-right: 9px;
@@ -11,7 +12,7 @@
     min-width: 28px;
 }
 .el-pager li.active,.el-pager li:hover{
-    background: #ed4014;
+    background: #338de3;
     color: white;
 }
 .el-pagination__editor.el-input .el-input__inner{
@@ -25,7 +26,7 @@
     -webkit-animation-fill-mode: both;
     animation-fill-mode: both;
   }
-  
+
   @media (print), (prefers-reduced-motion) {
     .animated {
       -webkit-animation: unset !important;
@@ -34,35 +35,35 @@
       transition: none !important;
     }
   }
-  
+
   @-webkit-keyframes fadeInDown {
     from {
       opacity: 1;
       -webkit-transform: translate3d(0, -100%, 0);
       transform: translate3d(0, -100%, 0);
     }
-  
+
     to {
       opacity: 1;
       -webkit-transform: translate3d(0, 0, 0);
       transform: translate3d(0, 0, 0);
     }
   }
-  
+
   @keyframes fadeInDown {
     from {
       opacity: 0;
       -webkit-transform: translate3d(0, -100%, 0);
       transform: translate3d(0, -100%, 0);
     }
-  
+
     to {
       opacity: 1;
       -webkit-transform: translate3d(0, 0, 0);
       transform: translate3d(0, 0, 0);
     }
   }
-  
+
   .fadeInDown {
     -webkit-animation-name: fadeInDown;
     animation-name: fadeInDown;
@@ -72,4 +73,4 @@
   }
   .ivu-form-item-content{
     text-align: left;
-  }
\ No newline at end of file
+  }
diff --git a/src/components/XyDialog/index.vue b/src/components/XyDialog/index.vue
index 2a0f5b0..f83fe1a 100644
--- a/src/components/XyDialog/index.vue
+++ b/src/components/XyDialog/index.vue
@@ -148,6 +148,7 @@ export default {
               }
               return (
                 <el-form
+                  class="xy-dialog-form"
                   style={title.length === 0 ? {'margin-top':'32px'} : {}}
                   ref="elForm"
                   props={{
@@ -207,67 +208,6 @@ export default {
   width: 140px;
   text-align: right;
 }
-.xy-table-item-min{
-  position: relative;
-  &::after{
-    z-index: 1;
-    position: absolute;
-    right: 0;
-    top: 0;
-    content:'（分钟）'
-  }
-  ::v-deep .el-input__clear{
-    position: relative;
-    right: 46px;
-    z-index: 2;
-  }
-}
-.xy-table-item-price{
-  position: relative;
-  &::after{
-    z-index: 1;
-    position: absolute;
-    right: 0;
-    top: 0;
-    content:'（元）'
-  }
-  ::v-deep .el-input__clear{
-    padding: 0 6px;
-    position: relative;
-    right: 30px;
-    z-index: 2;
-  }
-}
-.xy-table-item-price-wan{
-  position: relative;
-  &::after{
-    padding: 0 6px;
-    position: absolute;
-    right: 0;
-    top: 0;
-    content:'（万元）'
-  }
-  ::v-deep .el-input__clear{
-    position: relative;
-    right: 46px;
-    z-index: 2;
-  }
-}
-.xy-table-item-price-percent{
-  position: relative;
-  &::after{
-    padding: 0 6px;
-    position: absolute;
-    right: 0;
-    top: 0;
-    content:'%'
-  }
-  ::v-deep .el-input__clear{
-    position: relative;
-    right: 46px;
-    z-index: 2;
-  }
-}
 
 .vertical-center-modal{
   display: flex;
@@ -297,16 +237,80 @@ export default {
 
   }
 }
-.el-form-item{
-  flex-shrink: 0;
-  flex-basis: 50%;
-}
-.el-form-item__error{
-  white-space: nowrap;
-  word-break: keep-all !important;
-  top: 100% !important;
-  left: calc(100% - 80px) !important;
-  transform: translateX(-100%);
+.xy-dialog-form {
+  .el-form-item{
+    flex-shrink: 0;
+    flex-basis: 50%;
+  }
+  .el-form-item__error{
+    white-space: nowrap;
+    word-break: keep-all !important;
+    top: 100% !important;
+    left: calc(100% - 80px) !important;
+    transform: translateX(-100%);
+  }
+  .xy-table-item-price-wan{
+    position: relative;
+    &::after{
+      padding: 0 6px;
+      position: absolute;
+      right: 0;
+      top: 0;
+      content:'（万元）'
+    }
+    ::v-deep .el-input__clear{
+      position: relative;
+      right: 46px;
+      z-index: 2;
+    }
+  }
+  .xy-table-item-price-percent{
+    position: relative;
+    &::after{
+      padding: 0 6px;
+      position: absolute;
+      right: 0;
+      top: 0;
+      content:'%'
+    }
+    ::v-deep .el-input__clear{
+      position: relative;
+      right: 46px;
+      z-index: 2;
+    }
+  }
+  .xy-table-item-price{
+    position: relative;
+    &::after{
+      z-index: 1;
+      position: absolute;
+      right: 0;
+      top: 0;
+      content:'（元）'
+    }
+    ::v-deep .el-input__clear{
+      padding: 0 6px;
+      position: relative;
+      right: 30px;
+      z-index: 2;
+    }
+  }
+  .xy-table-item-min{
+    position: relative;
+    &::after{
+      z-index: 1;
+      position: absolute;
+      right: 0;
+      top: 0;
+      content:'（分钟）'
+    }
+    ::v-deep .el-input__clear{
+      position: relative;
+      right: 46px;
+      z-index: 2;
+    }
+  }
 }
+
 </style>
 
diff --git a/src/layout/index.vue b/src/layout/index.vue
index 89a4b85..33eaa7a 100644
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -209,12 +209,6 @@ export default {
       immediate: true,
     },
   },
-  beforeRouteEnter(to,from,next){
-    document.getElementsByTagName('iframe').forEach(dom => {
-      dom.onload = null;
-    })
-    next()
-  },
   created() {
     let gdzcIframe = document.createElement('iframe');
     gdzcIframe.src = `${process.env.VUE_APP_OUT_GDZC}/member/oss_login?id=${this.$store.state.user.userId}&username=${this.$store.state.user.username}`
diff --git a/src/layout/noLayout.vue b/src/layout/noLayout.vue
index 23c4dd9..13ffbca 100644
--- a/src/layout/noLayout.vue
+++ b/src/layout/noLayout.vue
@@ -132,12 +132,6 @@ export default {
       immediate: true,
     },
   },
-  beforeRouteEnter(to,from,next){
-    document.getElementsByTagName('iframe').forEach(dom => {
-      dom.onload = null;
-    })
-    next()
-  }
 };
 </script>
 
diff --git a/src/permission.js b/src/permission.js
index 216913e..e0d29de 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -26,6 +26,9 @@ router.beforeEach(async (to, from, next) => {
   document.title = getPageTitle(to.meta.title)
 
   if (to.query.code) {
+    // let hash = window.location.hash
+    // let query = hash.split('?')[1]?.split('&')
+    // let code = query?.find(i => /^code/.test(i))?.split('=')[1]
     removeToken()
     const res = await loginOssV2({
       code: to.query.code
diff --git a/src/views/contract/contractEdit.vue b/src/views/contract/contractEdit.vue
index bc7a113..ca8a990 100644
--- a/src/views/contract/contractEdit.vue
+++ b/src/views/contract/contractEdit.vue
@@ -1,747 +1,1367 @@
-<template>
-  <div>
-    <el-steps :active="step" align-center>
-      <el-step title="选择预算计划">
-      </el-step>
-      <el-step title="新增预算支出事项">
-      </el-step>
-      <el-step title="新增成功">
-      </el-step>
-    </el-steps>
-
-    <div style="margin: 20px;" v-if="step==1">
-      <Input v-model="planSearch" search enter-button="搜 索" placeholder="搜索预算计划.." @on-search="getBudgets" />
-
-      <xy-table :list="plans" :show-index="false" :table-item="planTable" :height="boxheight" style="margin-top: 10px;"
-        ref="editorPlanTable" row-key="id" border default-expand-all
-        :tree-props="{ children: 'notChildren', hasChildren: 'hasChildren' }" @select="selectPlan">
-        <template v-slot:btns>
-          <el-table-column label="使用金额（元）" header-align="center" width="130">
-            <template slot-scope="scope" v-if="scope.row.pid === 0">
-              <Input :value="scope.row.useMoney" @input="planInput($event,scope.row)" />
-            </template>
-          </el-table-column>
-        </template>
-      </xy-table>
-      <div style="display: flex;justify-content: flex-end;">
-        <Page :total="planTotal" show-elevator @on-change="planPageChange" />
-      </div>
-      <div style="text-align: center;">
-        <el-button style="margin-top: 12px;" @click="nextStep">下一步</el-button>
-      </div>
-    </div>
-    <div style="padding: 20px; margin: 20px;background-color: #fff;" v-if="step==2">
-
-      <el-form ref="form" :model="detail" label-width="180px">
-        <el-form-item label="项目名称">
-          <el-input clearable placeholder="请填写项目名称" @change="checkName" v-model="detail.name" style="width: 300px;" />
-        </el-form-item>
-
-
-        <el-form-item label="是否需要签订合同">
-          <el-switch v-model="detail.is_contract" active-text="是" inactive-text="否" :active-value="1"
-            :inactive-value="0" />
-        </el-form-item>
-
-
-        <el-form-item label="是否为简易流程">
-          <el-switch v-model="detail.is_simple" active-text="是" inactive-text="否" :active-value="1"
-            :inactive-value="0" />
-          <span style="flex: 1;text-align: right;">（水电煤等费用付款）</span>
-        </el-form-item>
-
-        <el-form-item label="承包商/供货商" v-if="detail.is_simple">
-          <el-input v-model="detail.supply" placeholder="请填写承包商/供货商" style="width: 300px;" />
-        </el-form-item>
-
-
-        <el-form-item label="项目类型" v-if="!detail.is_simple">
-          <el-select clearable placeholder="请选择项目类型" v-model="detail.type" style="width: 300px;">
-            <el-option v-for="item in [{label:'服务',value:1},{label:'货物',value:2},{label:'工程',value:3}]"
-              :label="item.label" :value="item.value"></el-option>
-          </el-select>
-        </el-form-item>
-
-
-        <el-form-item label="采购形式" v-if="!detail.is_simple">
-
-          <el-select clearable placeholder="请选择采购形式" v-model="detail.methods" style="width: 300px;">
-            <el-option v-for="item in purchaseType" :label="item.value" :value="item.id"></el-option>
-          </el-select>
-        </el-form-item>
-
-
-        <el-form-item label="采购方式" v-if="!detail.is_simple">
-          <el-select clearable placeholder="请选择采购方式" v-model="detail.modality" style="width: 300px;">
-            <el-option v-for="item in purchaseWay" :label="item.value" :value="item.id"></el-option>
-          </el-select>
-        </el-form-item>
-
-        <el-form-item label="采购预算价" v-if="!detail.is_simple">
-          <el-input clearable placeholder="请填写采购预算价" v-model="detail.price" style="width: 300px;" />
-        </el-form-item>
-
-
-        <el-form-item label="资金渠道" v-if="!detail.is_simple">
-          <el-select multiple clearable placeholder="请选择资金渠道" v-model="detail.fundingChannels" style="width: 300px;">
-            <el-option v-for="item in moneyWay" :value="item.id" :label="item.value"></el-option>
-          </el-select>
-        </el-form-item>
-
-
-
-
-
-      </el-form>
-
-
-      <div style="text-align: center;">
-        <el-button style="margin-top: 12px;" @click="nextStep">上一步</el-button>
-        <el-button style="margin-top: 12px;" @click="nextStep">提交</el-button>
-      </div>
-    </div>
-
-
-  </div>
-</template>
-
-<script>
-  import {
-    getparameter
-  } from "@/api/system/dictionary";
-  import {
-    editorContract,
-    detailContract,
-    checkContractName,
-    getContract
-  } from '@/api/contract/contract'
-  import {
-    getBudget
-  } from "@/api/budget/budget";
-
-  import {
-    getInfo
-  } from '@/api/user.js'
-  import {
-    Message
-  } from 'element-ui'
-  import {
-    resetSelect
-  } from '@/utils'
-  export default {
-
-    data() {
-      var planPass = (rule, value, callback) => {
-        if (this.detail.isBudget) {
-          if (this.detail.plan.length === 0) {
-            return callback(new Error('必选'))
-          } else {
-            callback()
-          }
-        } else {
-          callback()
-        }
-      }
-      var supplyPass = (rule, value, callback) => {
-        if (this.detail.is_simple) {
-          if (value === '') {
-            callback(new Error('必填'))
-          } else {
-            callback()
-          }
-        } else {
-          callback()
-        }
-      }
-      var typePass = (rule, value, callback) => {
-        if (!this.detail.is_simple) {
-          if (value === '') {
-            callback(new Error('必填'))
-          } else {
-            callback()
-          }
-        } else {
-          callback()
-        }
-      }
-      var methodsPass = (rule, value, callback) => {
-        if (!this.detail.is_simple) {
-          if (value === '') {
-            callback(new Error('必填'))
-          } else {
-            callback()
-          }
-        } else {
-          callback()
-        }
-      }
-      var modalityPass = (rule, value, callback) => {
-        if (!this.detail.is_simple) {
-          if (value === '') {
-            callback(new Error('必填'))
-          } else {
-            callback()
-          }
-        } else {
-          callback()
-        }
-      }
-      var pricePass = (rule, value, callback) => {
-        if (!this.detail.is_simple) {
-          if (value === '') {
-            callback(new Error('必填'))
-          } else {
-            if (/^\d+(\.\d+)?$/.test(value)) {
-              callback()
-            } else {
-              callback(new Error('必须为数字'))
-            }
-          }
-        } else {
-          callback()
-        }
-      }
-      return {
-        purchaseType: [],
-        moneyWay: [],
-        purchaseWay: [],
-        userList: ["ma_sm", "admin", "yu_l", "wang_yx", "li_f", "chen_y"],
-        boxheight: 300,
-        step: 1,
-        user: null,
-        adminEdit: false,
-        isFocus: false,
-        contrantId: '',
-        isShowEditor: false,
-        isShowPlan: false,
-        detail: {},
-        plan: [],
-        options: [{
-          value: 1,
-          label: '待申请'
-        }, {
-          value: 2,
-          label: '流转中'
-        }, {
-          value: 3,
-          label: '已办结'
-        }],
-        rules: {
-          name: [{
-            required: true,
-            message: "必填"
-          }],
-          supply: [{
-            validator: supplyPass,
-            trigger: 'change'
-          }],
-          type: [{
-            validator: typePass,
-            trigger: 'change'
-          }],
-          methods: [{
-            validator: methodsPass,
-            trigger: 'change'
-          }],
-          modality: [{
-            validator: modalityPass,
-            trigger: 'change'
-          }],
-          price: [{
-            validator: pricePass,
-            trigger: 'change'
-          }],
-
-          fundingChannels: [{
-            required: true,
-            message: "必填"
-          }],
-          plan: [{
-            validator: planPass,
-            trigger: 'change'
-          }]
-        },
-        plans: [],
-        planSearch: '',
-        planTable: [{
-            sortable: false,
-            width: 44,
-            type: "selection",
-            selectable: (row, index) => {
-              return row.pid === 0
-            }
-          },
-          {
-            label: "科室",
-            prop: 'plan_department.name',
-            width: 100,
-            align: 'center'
-          },
-          {
-            label: "年份",
-            prop: 'year',
-            width: 80,
-            align: 'center'
-          },
-          {
-            label: "分类",
-            prop: 'type_detail.value',
-            width: 120,
-          },
-          {
-            label: "名称",
-            prop: 'name',
-            align: 'left'
-          },
-          {
-            label: "计划金额",
-            prop: 'money',
-            align: 'right',
-            width: 120,
-          },
-          {
-            label: "实付金额",
-            prop: 'use_money_total',
-            width: 120,
-            align: 'right'
-          },
-          {
-            label: '已用金额',
-            prop: 'has_money_total',
-            width: 120,
-            align: 'right'
-          }
-        ],
-        planTotal: 0,
-
-
-        selections: [],
-        contractSelect: {
-          page: 1,
-          page_size: 10,
-          is_framework: 1
-        },
-        contractList: [],
-        loading: false,
-        contractTable: [{
-            type: "selection",
-            width: 56,
-            align: "center",
-          },
-          {
-            title: "项目名称",
-            key: "name",
-            minWidth: 180,
-            align: "left",
-          },
-          {
-            title: "采购形势",
-            width: 120,
-            render: (h, {
-              row
-            }) => {
-              return h('span', {}, row.purchase_type?.value || "无")
-            }
-          },
-          {
-            title: "项目类型",
-            width: 120,
-            render: (h, {
-              row
-            }) => {
-              let map = new Map([
-                [1, "服务"],
-                [2, "货物"],
-                [3, "工程"]
-              ])
-              return h('span', {}, map.get(row.type))
-            }
-          },
-          {
-            title: "采购方式",
-            width: 120,
-            render: (h, {
-              row
-            }) => {
-              return h('span', {}, row.purchase_way?.value || "无")
-            }
-          }
-        ],
-        contractTotal: 0,
-        isShowContractToContracts: false
-      }
-    },
-    methods: {
-      //获取资金渠道
-      async getMoneyWay() {
-        this.moneyWay = (
-          await getparameter({
-            number: "money_way",
-          })
-        ).detail;
-      },
-      //获取购买方式
-      async getPurchaseWay() {
-        this.purchaseWay = (
-          await getparameter({
-            number: "purchase_way",
-          })
-        ).detail;
-      },
-      //获取购买形式列表
-      async getPurchaseType() {
-        this.purchaseType = (
-          await getparameter({
-            number: "purchase_type",
-          })
-        ).detail;
-      },
-      nextStep() {
-        if (this.step == 1) {
-          this.step = 2;
-        }
-      },
-      //预算计划金额输入
-      planInput(e, row) {
-        if (!/^[0-9]+.?[0-9]*$/.test(e) && e) {
-          Message({
-            type: 'warning',
-            message: '金额格式错误'
-          })
-          row.useMoney = 0
-          return
-        }
-        if (e <= (Number(row.money) - Number(row.use_money_total))) {
-          row.useMoney = e
-          this.plan.forEach(item => {
-            if (item.value.plan_id == row.id) {
-              item.value.use_money = e
-            }
-          })
-          return
-        }
-        Message({
-          type: 'warning',
-          message: '使用金额大于剩余预算'
-        })
-        row.useMoney = 0
-      },
-      //确认计划选择
-      planSelect() {
-        if (this.plan.length === 0) {
-          Message({
-            type: 'warning',
-            message: '选择计划不能为空'
-          })
-          return
-        }
-        for (let item of this.plan) {
-          console.log(item)
-          if (!item.value.use_money) {
-            Message({
-              type: 'warning',
-              message: '金额不能为空'
-            })
-            return
-          }
-        }
-        this.detail.plan = this.plan
-        this.isShowPlan = false
-      },
-      //选择计划
-      selectPlan(sel, row) {
-
-        if (sel) {
-
-          let select = sel.map(item => {
-            return {
-              label: item.name,
-              value: {
-                plan_id: item.id,
-                use_money: item.useMoney,
-                new_money: item.money
-              }
-            }
-          })
-
-          this.plan = [...this.detail.plan, ...select]
-        } else {
-          this.plan = this.detail.plan;
-        }
-      },
-      delPlan(val) {
-        this.detail.plan.map((item, index) => {
-          if (item.value.plan_id === val.value.plan_id) {
-            this.detail.plan.splice(index, 1)
-          }
-        })
-      },
-      //获取预算计划
-      async getBudgets() {
-        let res = await getBudget({
-          name: this.planSearch,
-          page_size: 10,
-          page: this.plansPageIndex,
-          is_tree: 1
-        })
-        this.plans = res.list;
-        this.planTotal = res.list.total || 0;
-
-        var selPlans = [...this.detail.plan, ...this.plan]
-        //let selPlans = this.detail.plan.contact([]);
-
-        console.log(selPlans)
-        this.toggleSelection(selPlans.map(item => {
-          return item.value.plan_id
-        }))
-      },
-      planPageChange(e) {
-        this.plansPageIndex = e
-        this.getBudgets()
-      },
-      //默认选择计划
-      toggleSelection(plans) {
-        var selPlans = [...this.detail.plan, ...this.plan]
-        if (plans) {
-          this.plans.forEach(plan => {
-            if (plans.includes(plan.id)) {
-              plan.useMoney = selPlans[plans.indexOf(plan.id)].value.use_money
-              this.$refs.editorPlanTable.toggleRowSelection(plan)
-            }
-            if (plan.children?.length > 0) {
-              plan.children.forEach(cplan => {
-                if (plans.includes(cplan.id)) {
-                  cplan.useMoney = selPlans[plans.indexOf(cplan.id)].value.use_money
-                  this.$refs.editorPlanTable.toggleRowSelection(cplan)
-                }
-              })
-            }
-          })
-          // this.plans.filter(plan => {
-          //   if (plans.includes(plan.id)) {
-          //     plan.useMoney = selPlans[plans.indexOf(plan.id)].value.use_money
-          //     return true
-          //   }
-          // }).map(row => {
-          //   this.$refs.editorPlanTable.toggleRowSelection(row)
-          // })
-        } else {
-          this.$refs.editorPlanTable.clearSelection()
-        }
-      },
-      async getDetail(id) {
-        let res = await detailContract({
-          id: id
-        })
-        this.contrantId = res.id
-        this.selections = []
-        this.detail = {
-          name: res.name,
-          is_contract: res.is_contract,
-          content: res.content,
-          is_simple: res?.is_simple,
-          date: res.date,
-          req_status: res.req_status,
-          purchase_status: res.purchase_status,
-          join_status: res.join_status,
-          invite_status: res.invite_status,
-          supply: res?.supply,
-          type: res.type,
-          methods: res.purchase_type_id,
-          modality: res.purchase_way_id,
-          fundingChannels: res.money_way_id?.split(',')?.map(item => {
-            return Number(item)
-          }),
-          price: res.plan_price,
-          isBudget: res.is_plan === 1 ? true : false,
-          is_framework: res.is_framework,
-          use_framework_buy: res.use_framework_buy,
-          contract_to_contracts: res.contract_to_contracts,
-          plan: res.plans.map(item => {
-            return {
-              label: item.name,
-              value: {
-                plan_id: item.id,
-                use_money: res.plan_link.filter(item1 => {
-                  return item1.plan_id === item.id
-                })[0].use_money,
-                new_money: item.money
-              }
-            }
-          })
-        }
-        this.plan = this.detail.plan
-      },
-      //y验证合同的名称是否存在重复
-      checkName(e) {
-
-      },
-      editor() {
-        editorContract({
-          id: this.contrantId,
-          type: this.detail.type,
-          is_plan: this.detail.isBudget ? 1 : 0,
-          is_simple: this.detail?.is_simple,
-          content: this.detail?.content,
-          is_contract: this.detail?.is_contract,
-          supply: this.detail?.supply,
-          purchase_type_id: this.detail.methods,
-          purchase_way_id: this.detail.modality,
-          money_way_id: this.detail.fundingChannels.toString(),
-          plan_price: this.detail.price,
-          name: this.detail.name,
-          req_status: this.detail.req_status,
-          purchase_status: this.detail.purchase_status,
-          join_status: this.detail.join_status,
-          invite_status: this.detail.invite_status,
-          date: this.detail.date,
-          contract_plan_links: this.detail.plan.map(item => {
-            return item.value
-          }),
-          is_framework: this.detail.is_framework,
-          use_framework_buy: this.detail.use_framework_buy,
-          contract_to_contracts: this.selections.map(i => {
-            return {
-              contract_id: this.contrantId,
-              to_contract_id: i.id,
-              use_money: i.money
-            }
-          })
-        }).then(res => {
-          this.isShowEditor = false
-          Message({
-            type: 'success',
-            message: "操作成功"
-          })
-          this.$emit('success')
-        })
-      },
-
-
-      //框架合同
-      async getContractToContracts() {
-        const res = await getContract(this.contractSelect)
-        let selectedIds = this.selections.map(i => i.id)
-        this.contractList = res.list.data.map(item => {
-          return {
-            ...item,
-            _checked: !!selectedIds.find(i => i === item.id),
-          }
-        })
-        this.contractTotal = res.list.total
-      },
-      selectionChange(selection) {
-        this.selections = Array.from(
-          new Set(
-            selection
-          )
-        );
-      },
-      delSelections(val) {
-        this.selections.map((item, index) => {
-          if (item.id === val.id) {
-            this.selections.splice(index, 1)
-          }
-        })
-      },
-    },
-    computed: {
-
-    },
-    created() {
-      this.getBudgets();
-      this.getMoneyWay();
-      this.getPurchaseType();
-      this.getPurchaseWay();
-      this.boxheight = document.documentElement.clientHeight - 400;
-    },
-    watch: {
-      isShowContractToContracts(val) {
-        if (val) {
-          this.getContractToContracts();
-        } else {
-          this.contractSelect = {
-            page: 1,
-            page_size: 10,
-            is_framework: 1,
-          }
-          this.contractList = [];
-          this.contractTotal = 0;
-        }
-      }
-    },
-    mounted() {
-      let that = this;
-      getInfo().then(response => {
-        console.log(response)
-        this.user = response;
-
-        if (that.userList.indexOf(response.username) != -1) {
-
-          that.adminEdit = true;
-        }
-
-      }).catch(error => {})
-
-    }
-  }
-</script>
-
-<style scoped lang="scss">
-  .contract-add-plan {
-    min-height: 30px;
-    border: 1px solid #dcdee2;
-    border-radius: 4px;
-    display: flex;
-    flex-wrap: wrap;
-    align-items: center;
-    align-content: center;
-
-    padding: 0 8px;
-
-    &-no-plan {
-      height: 30px;
-      line-height: 30px;
-      color: #CDD0D5;
-    }
-  }
-
-  .xy-table-item-label {
-    width: 200px;
-  }
-
-  .xy-table-item-price {
-    position: relative;
-
-    &::after {
-      z-index: 1;
-      position: absolute;
-      right: 0;
-      top: 0;
-      content: '（元）'
-    }
-
-    ::v-deep .el-input__clear {
-      position: relative;
-      right: 30px;
-      z-index: 2;
-    }
-  }
-
-  .xy-table-item-price-wan {
-    position: relative;
-
-    &::after {
-      position: absolute;
-      right: 0;
-      top: 0;
-      content: '（万元）'
-    }
-
-    ::v-deep .el-input__clear {
-      position: relative;
-      right: 46px;
-      z-index: 2;
-    }
-  }
+<template>
+  <div>
+    <el-steps :active="step" align-center>
+      <el-step title="选择预算计划"> </el-step>
+      <el-step title="新增预算支出事项"> </el-step>
+      <el-step title="新增成功"> </el-step>
+    </el-steps>
+
+    <div style="padding: 20px">
+      <div v-show="step === 1">
+        <Input
+          v-model="planSelect.name"
+          search
+          enter-button="搜 索"
+          clearable
+          placeholder="搜索预算计划.."
+          @on-search="getBudgets"
+        />
+
+        <xy-table
+          :list="plans"
+          :show-index="false"
+          :table-item="planTable"
+          :height="boxheight"
+          style="margin-top: 10px"
+          ref="editorPlanTable"
+          row-key="id"
+          border
+          default-expand-all
+          :tree-props="{ children: 'notChildren', hasChildren: 'hasChildren' }"
+        >
+          <template v-slot:btns>
+            <el-table-column
+              label="使用金额（元）"
+              header-align="center"
+              width="144"
+            >
+              <template slot-scope="scope" v-if="scope.row.pid === 0">
+                <InputNumber
+                  style="width: 120px"
+                  :min="0"
+                  :precision="2"
+                  :active-change="false"
+                  v-model="scope.row._inputMoney"
+                  :formatter="
+                    (value) => `${value}`.replace(/\B(?=(\d{3})+(?!\d))/g, ',')
+                  "
+                  :parser="(value) => value.replace(/\$\s?|(,*)/g, '')"
+                ></InputNumber>
+              </template>
+            </el-table-column>
+          </template>
+        </xy-table>
+        <div style="display: flex; justify-content: flex-end">
+          <Page
+            :total="planTotal"
+            show-elevator
+            @on-change="
+              (e) => {
+                planSelect.page = e;
+                getBudgets();
+              }
+            "
+          />
+        </div>
+        <div style="text-align: center">
+          <el-button type="primary" style="margin-top: 12px" @click="() => nextStep()"
+            >下一步</el-button
+          >
+        </div>
+      </div>
+
+      <el-card v-show="step === 2">
+        <el-popover placement="right-start" width="660" trigger="click">
+          <xy-table
+            :list="planSelections"
+            size="mini"
+            :table-item="[
+              ...planTable.slice(1),
+              {
+                width: 120,
+                align: 'right',
+                label: '使用金额（元）',
+                prop: '_inputMoney',
+                formatter: (v1, v2, value) =>
+                  `${value}`.replace(/\B(?=(\d{3})+(?!\d))/g, ','),
+              },
+            ]"
+            :height="400"
+            style="width: 100%"
+            row-key="id"
+            border
+            :tree-props="{
+              children: 'notChildren',
+              hasChildren: 'hasChildren',
+            }"
+          >
+            <template #btns></template>
+          </xy-table>
+          <el-button
+            icon="el-icon-s-order"
+            size="small"
+            type="primary"
+            slot="reference"
+            >查看已选预算计划</el-button
+          >
+        </el-popover>
+
+        <Divider></Divider>
+
+        <el-form
+          ref="form"
+          class="el-form-body"
+          label-position="left"
+          size="small"
+          :model="form"
+          :rules="rules"
+          label-width="180px"
+        >
+          <el-form-item prop="name" label="项目名称">
+            <el-input
+              placeholder="请填写项目名称"
+              v-model="form.name"
+              style="width: 100%"
+            />
+          </el-form-item>
+
+          <el-form-item prop="is_contract" label="是否需要签订合同">
+            <el-switch
+              v-model="form.is_contract"
+              active-text="是"
+              inactive-text="否"
+              :active-value="1"
+              :inactive-value="0"
+            />
+          </el-form-item>
+
+          <el-form-item prop="is_simple" label="是否为简易流程">
+            <el-switch
+              v-model="form.is_simple"
+              active-text="是"
+              inactive-text="否"
+              :active-value="1"
+              :inactive-value="0"
+            />
+            <span style="flex: 1; text-align: right">（水电煤等费用付款）</span>
+          </el-form-item>
+
+          <template v-if="form.is_simple">
+            <el-form-item prop="supply" label="承包商/供货商">
+              <el-input
+                v-model="form.supply"
+                placeholder="请填写承包商/供货商"
+                style="width: 100%"
+              />
+            </el-form-item>
+
+            <el-form-item prop="money" label="合同金额（元）">
+              <InputNumber
+                style="width: 100%"
+                :min="0"
+                :step="10000"
+                :precision="2"
+                :active-change="false"
+                v-model="form.money"
+                :formatter="
+                  (value) => `${value}`.replace(/\B(?=(\d{3})+(?!\d))/g, ',')
+                "
+                :parser="(value) => value.replace(/\$\s?|(,*)/g, '')"
+              ></InputNumber>
+            </el-form-item>
+          </template>
+          <template v-else>
+            <el-form-item prop="type" label="项目类型">
+              <el-select
+                clearable
+                placeholder="请选择项目类型"
+                v-model="form.type"
+                style="width: 100%"
+              >
+                <el-option
+                  v-for="item in types"
+                  :label="item.label"
+                  :value="item.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+
+            <el-form-item prop="purchase_type_id" label="采购形式">
+              <el-select
+                ref="purchaseTypeInput"
+                clearable
+                placeholder="请选择采购形式"
+                v-model="form.purchase_type_id"
+                style="width: 100%"
+              >
+                <el-option
+                  v-for="item in purchaseType"
+                  :label="item.value"
+                  :value="item.id"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+
+            <el-form-item prop="purchase_way_id" label="采购方式">
+              <el-select
+                clearable
+                placeholder="请选择采购方式"
+                v-model="form.purchase_way_id"
+                style="width: 100%"
+              >
+                <el-option
+                  v-for="item in purchaseWay"
+                  :label="item.value"
+                  :value="item.id"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+
+            <el-form-item prop="money_way_id" label="资金渠道">
+              <el-select
+                multiple
+                size="small"
+                clearable
+                placeholder="请选择资金渠道"
+                :value="
+                  form.money_way_id
+                    ? form.money_way_id.split(',').map((i) => Number(i))
+                    : []
+                "
+                style="width: 100%"
+                @change="
+                  (e) => {
+                    form.money_way_id = e.length > 0 ? e.toString() : '';
+                  }
+                "
+              >
+                <el-option
+                  v-for="item in moneyWay"
+                  :value="item.id"
+                  :label="item.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+
+            <el-form-item prop="plan_price" label="采购预算价（元）">
+              <InputNumber
+                style="width: 100%"
+                :min="0"
+                :step="10000"
+                :precision="2"
+                :active-change="false"
+                v-model="form.plan_price"
+                :formatter="
+                  (value) => `${value}`.replace(/\B(?=(\d{3})+(?!\d))/g, ',')
+                "
+                :parser="(value) => value.replace(/\$\s?|(,*)/g, '')"
+              ></InputNumber>
+            </el-form-item>
+          </template>
+
+          <el-form-item
+            prop="use_framework_buy"
+            label="是否使用框架协议采购内容"
+          >
+            <el-switch
+              v-model="form.use_framework_buy"
+              active-text="是"
+              inactive-text="否"
+              :active-value="1"
+              :inactive-value="0"
+            />
+          </el-form-item>
+          <el-form-item
+            prop="is_framework"
+            label="是否新生成框架协议"
+            v-show="isShowIsFramework"
+          >
+            <el-switch
+              v-model="form.is_framework"
+              active-text="是"
+              inactive-text="否"
+              :active-value="1"
+              :inactive-value="0"
+            />
+          </el-form-item>
+          <el-form-item
+            prop="contract_to_contracts"
+            label="关联的框架协议合同"
+            v-show="form.use_framework_buy"
+          >
+            <div
+              class="form__contract-to-contracts--no"
+              @click="isShowContractToContracts = true"
+            >
+              请选择关联的框架协议合同
+            </div>
+            <div v-if="contractToContractsSelections.length > 0">
+              <Tag type="dot"
+                   closable
+                   v-for="(i,index) in contractToContractsSelections"
+                   :color="['primary','success','error','warning'][index%4]"
+                   :key="i.id"
+                   @on-close="closeTag(i)">{{ i.name.slice(0,17) }}</Tag>
+            </div>
+          </el-form-item>
+        </el-form>
+
+        <div style="text-align: center">
+          <el-button style="margin-top: 12px" @click="forwardStep"
+            >上一步</el-button
+          >
+          <el-button
+            style="margin-top: 12px"
+            type="warning"
+            plain
+            @click="resetForm"
+            >重置</el-button
+          >
+          <el-button :loading="btnLoading" style="margin-top: 12px" type="primary" @click="() => nextStep()"
+            >提交</el-button
+          >
+        </div>
+      </el-card>
+
+      <el-card v-show="step === 3">
+        <div class="done">
+          <i class="el-icon-success" style="color: #58bb73;font-size: 40px;"></i>
+          <p>{{ type === 'add' ? '创建' : '编辑' }}完成</p>
+          <svg
+            height="230"
+            viewBox="0 0 230 230"
+            width="230"
+            xmlns="http://www.w3.org/2000/svg"
+          >
+            <defs>
+              <linearGradient
+                gradientUnits="objectBoundingBox"
+                id="linearGradient-1"
+                node-id="5"
+                spreadMethod="pad"
+                x1="-0.19665861"
+                x2="1.0436114"
+                y1="0.5"
+                y2="0.5"
+              >
+                <stop offset="0" stop-color="#56c6fb" />
+                <stop offset="1" stop-color="#56c6fb" stop-opacity="0" />
+              </linearGradient>
+              <linearGradient
+                gradientUnits="objectBoundingBox"
+                id="linearGradient-2"
+                node-id="8"
+                spreadMethod="pad"
+                x1="0"
+                x2="1.0564857"
+                y1="0.40330252"
+                y2="0.6062147"
+              >
+                <stop offset="0" stop-color="#7983d6" />
+                <stop offset="1" stop-color="#242c83" />
+              </linearGradient>
+              <linearGradient
+                gradientUnits="objectBoundingBox"
+                id="linearGradient-3"
+                node-id="11"
+                spreadMethod="pad"
+                x1="0.6815462"
+                x2="0"
+                y1="0.44933662"
+                y2="0.62995005"
+              >
+                <stop offset="0" stop-color="#7dd2fb" />
+                <stop offset="1" stop-color="#3797e2" />
+              </linearGradient>
+              <linearGradient
+                gradientUnits="objectBoundingBox"
+                id="linearGradient-4"
+                node-id="14"
+                spreadMethod="pad"
+                x1="1.0198022"
+                x2="0"
+                y1="0.42886087"
+                y2="0.64435285"
+              >
+                <stop offset="0" stop-color="#eeeeee" />
+                <stop offset="1" stop-color="#d8d8d8" stop-opacity="0" />
+              </linearGradient>
+              <linearGradient
+                gradientUnits="objectBoundingBox"
+                id="linearGradient-5"
+                node-id="17"
+                spreadMethod="pad"
+                x1="-0.019802213"
+                x2="1"
+                y1="0.44724947"
+                y2="0.60703945"
+              >
+                <stop offset="0" stop-color="#eeeeee" />
+                <stop offset="1" stop-color="#d8d8d8" stop-opacity="0" />
+              </linearGradient>
+              <linearGradient
+                gradientUnits="objectBoundingBox"
+                id="linearGradient-6"
+                node-id="20"
+                spreadMethod="pad"
+                x1="0"
+                x2="1.0564857"
+                y1="0.4574653"
+                y2="0.5467211"
+              >
+                <stop offset="0" stop-color="#7983d6" />
+                <stop offset="1" stop-color="#242c83" />
+              </linearGradient>
+              <linearGradient
+                gradientUnits="objectBoundingBox"
+                id="linearGradient-7"
+                node-id="23"
+                spreadMethod="pad"
+                x1="0.7455665"
+                x2="0"
+                y1="0.4161634"
+                y2="0.70934254"
+              >
+                <stop offset="0" stop-color="#e5e7fc" />
+                <stop offset="1" stop-color="#b4b7d5" />
+              </linearGradient>
+              <linearGradient
+                gradientUnits="objectBoundingBox"
+                id="linearGradient-8"
+                node-id="26"
+                spreadMethod="pad"
+                x1="0.6362425"
+                x2="0.23553719"
+                y1="0.28847575"
+                y2="1"
+              >
+                <stop offset="0" stop-color="#c4caf6" />
+                <stop offset="1" stop-color="#b8beed" />
+              </linearGradient>
+              <linearGradient
+                gradientUnits="objectBoundingBox"
+                id="linearGradient-9"
+                node-id="29"
+                spreadMethod="pad"
+                x1="1"
+                x2="-0.05648565"
+                y1="0.455"
+                y2="0.549429"
+              >
+                <stop offset="0" stop-color="#7983d6" />
+                <stop offset="1" stop-color="#242c83" />
+              </linearGradient>
+              <linearGradient
+                gradientUnits="objectBoundingBox"
+                id="linearGradient-10"
+                node-id="32"
+                spreadMethod="pad"
+                x1="0.7575835"
+                x2="0"
+                y1="0.4590923"
+                y2="0.5966975"
+              >
+                <stop offset="0" stop-color="#aeb4e0" />
+                <stop offset="1" stop-color="#7b84cd" />
+              </linearGradient>
+              <linearGradient
+                gradientUnits="objectBoundingBox"
+                id="linearGradient-11"
+                node-id="35"
+                spreadMethod="pad"
+                x1="0.73618025"
+                x2="0.012557022"
+                y1="0.4830155"
+                y2="0.54331756"
+              >
+                <stop offset="0" stop-color="#9da3d6" />
+                <stop offset="1" stop-color="#757fcd" />
+              </linearGradient>
+            </defs>
+            <g node-id="128">
+              <g node-id="129">
+                <g node-id="130">
+                  <path
+                    d="M 40.84 148.59 L 40.84 155.58 L 47.83 155.58 L 47.83 148.59 L 40.84 148.59 Z M 51.33 148.59 L 51.33 155.58 L 99.40 155.58 L 99.40 148.59 L 51.33 148.59 Z"
+                    fill="url(#linearGradient-1)"
+                    fill-opacity="0.4"
+                    fill-rule="evenodd"
+                    group-id="1,2,3"
+                    id="形状结合"
+                    node-id="41"
+                    stroke="none"
+                    target-height="6.991913"
+                    target-width="58.557228"
+                    target-x="40.842773"
+                    target-y="148.58554"
+                  />
+                </g>
+                <g node-id="131">
+                  <g node-id="132">
+                    <path
+                      d="M 84.10 93.80 L 48.10 93.80 L 61.60 115.40 L 97.22 115.40 Z"
+                      fill="url(#linearGradient-2)"
+                      fill-rule="evenodd"
+                      group-id="1,2,4,5"
+                      id="矩形"
+                      node-id="43"
+                      stroke="none"
+                      target-height="21.599998"
+                      target-width="49.116924"
+                      target-x="48.099995"
+                      target-y="93.8"
+                    />
+                  </g>
+                  <g node-id="133">
+                    <path
+                      d="M 69.70 71.30 L 161.50 71.30 L 161.50 118.10 L 69.70 118.10 Z"
+                      fill="url(#linearGradient-3)"
+                      fill-rule="evenodd"
+                      group-id="1,2,4,6"
+                      id="矩形"
+                      node-id="45"
+                      stroke="none"
+                      target-height="46.799995"
+                      target-width="91.8"
+                      target-x="69.7"
+                      target-y="71.3"
+                    />
+                    <g node-id="135">
+                      <path
+                        d="M 77.80 83.00 L 138.10 83.00 L 138.10 115.40 L 77.80 115.40 Z"
+                        fill="url(#linearGradient-4)"
+                        fill-opacity="0.25150117"
+                        fill-rule="evenodd"
+                        group-id="1,2,4,6,8"
+                        id="矩形备份-26"
+                        node-id="46"
+                        stroke="none"
+                        target-height="32.4"
+                        target-width="60.30001"
+                        target-x="77.799995"
+                        target-y="83"
+                      />
+                    </g>
+                    <g node-id="136">
+                      <path
+                        d="M 161.50 71.30 L 101.20 71.30 L 101.20 99.20 L 161.50 99.20 Z"
+                        fill="url(#linearGradient-5)"
+                        fill-opacity="0.21880595"
+                        fill-rule="evenodd"
+                        group-id="1,2,4,6,9"
+                        id="矩形备份-30"
+                        node-id="47"
+                        stroke="none"
+                        target-height="27.899994"
+                        target-width="60.300003"
+                        target-x="101.2"
+                        target-y="71.3"
+                      />
+                    </g>
+                    <path
+                      d="M 134.50 84.22 L 128.20 78.50 L 111.23 96.22 L 101.08 87.43 L 94.90 94.08 L 111.20 108.20 Z"
+                      fill="#ffffff"
+                      fill-rule="nonzero"
+                      group-id="1,2,4,6"
+                      id="路径"
+                      node-id="48"
+                      stroke="none"
+                      target-height="29.699997"
+                      target-width="39.600006"
+                      target-x="94.899994"
+                      target-y="78.5"
+                    />
+                    <path
+                      d="M 69.70 71.30 L 161.50 71.30 L 161.50 65.00 L 69.70 65.00 Z"
+                      fill="#4da3df"
+                      fill-rule="evenodd"
+                      group-id="1,2,4,6,10"
+                      id="矩形"
+                      node-id="49"
+                      stroke="none"
+                      target-height="6.300003"
+                      target-width="91.8"
+                      target-x="69.7"
+                      target-y="65"
+                    />
+                  </g>
+                  <g node-id="134">
+                    <path
+                      d="M 175.00 115.40 L 98.50 115.40 L 106.60 140.60 L 184.90 140.60 Z"
+                      fill="url(#linearGradient-6)"
+                      fill-rule="evenodd"
+                      stroke="none"
+                    />
+                  </g>
+                  <path
+                    d="M 61.60 115.40 L 138.10 115.40 L 138.10 164.90 L 61.60 164.90 Z"
+                    fill="url(#linearGradient-7)"
+                    fill-rule="evenodd"
+                    group-id="1,2,4"
+                    id="矩形"
+                    stroke="none"
+                  />
+                  <path
+                    d="M 73.30 150.50 L 120.10 150.50 L 120.10 154.10 L 73.30 154.10 Z"
+                    fill="#f8f8fa"
+                    fill-rule="evenodd"
+                    stroke="none"
+                  />
+                  <path
+                    d="M 138.10 115.40 L 174.10 115.40 L 174.10 164.90 L 138.10 164.90 Z"
+                    fill="url(#linearGradient-8)"
+                    fill-rule="evenodd"
+                    stroke="none"
+                  />
+                  <path
+                    d="M 148.00 121.70 L 166.00 121.70 L 166.00 127.10 L 148.00 127.10 Z"
+                    fill="url(#linearGradient-9)"
+                    fill-rule="evenodd"
+                    stroke="none"
+                  />
+                  <path
+                    d="M 151.22 93.80 L 187.22 93.80 L 174.10 115.40 L 138.10 115.40 Z"
+                    fill="url(#linearGradient-10)"
+                    fill-rule="evenodd"
+                    stroke="none"
+                  />
+                  <path
+                    d="M 61.60 115.40 L 138.10 115.40 L 130.00 140.60 L 53.50 140.60 Z"
+                    fill="url(#linearGradient-11)"
+                    fill-rule="evenodd"
+                    stroke="none"
+                  />
+                  <path
+                    d="M 54.40 141.50 L 129.10 141.50"
+                    fill="none"
+                    stroke="#d7dbff"
+                    stroke-linecap="square"
+                    stroke-width="1.8"
+                  />
+                  <path
+                    d="M 175.00 141.50 L 184.00 141.50"
+                    fill="none"
+                    stroke="#6a72c9"
+                    stroke-linecap="square"
+                    stroke-width="1.8"
+                  />
+                </g>
+              </g>
+              <path
+                d="M 168.03 65.00 L 168.03 78.50 L 181.53 78.50"
+                fill="none"
+                stroke="#979797"
+                stroke-linecap="butt"
+                stroke-width="2.7"
+              />
+            </g>
+          </svg>
+
+          <div class="done__btns">
+            <Button shape="circle" @click="nextStep(true)">新建</Button>
+            <Button
+              type="primary"
+              style="margin-left: 40px"
+              shape="circle"
+              @click="
+                $router.push({
+                  path: '/contract/contract/contractList',
+                  query: {
+                    keyword: form.name,
+                  },
+                })
+              "
+              >查看</Button
+            >
+          </div>
+        </div>
+      </el-card>
+    </div>
+
+    <el-drawer
+      size="580px"
+      title="框架协议合同"
+      :visible.sync="isShowContractToContracts"
+      direction="rtl"
+      :before-close="handleDrawerClose"
+    >
+      <div style="padding: 0 20px">
+        <xy-table
+          :list="contractList"
+          ref="contractToContractsTable"
+          :table-item="contractTable"
+          :height="600"
+          stripe
+          size="small"
+        >
+          <template #btns></template>
+        </xy-table>
+        <div style="display: flex; justify-content: center">
+          <el-pagination
+            :current-page.sync="contractSelect.page"
+            :page-size="contractSelect.page_size"
+            layout="prev, pager, next, jumper"
+            :total="contractTotal"
+          >
+          </el-pagination>
+        </div>
+      </div>
+    </el-drawer>
+  </div>
+</template>
+
+<script>
+import { getparameter } from "@/api/system/dictionary";
+import {
+  addContrant,
+  editorContract,
+  detailContract,
+  checkContractName,
+  getContract,
+} from "@/api/contract/contract";
+import { getBudget } from "@/api/budget/budget";
+
+import { getInfo } from "@/api/user.js";
+export default {
+  data() {
+    return {
+      btnLoading: false,
+      type: "add",
+      contractId: "",
+      step: 1,
+      types: [
+        { label: "服务", value: 1 },
+        { label: "货物", value: 2 },
+        { label: "工程", value: 3 },
+      ], //项目类型
+      form: {
+        type: "",
+        is_plan: 1,
+        purchase_type_id: "",
+        is_contract: 1,
+        purchase_way_id: "",
+        money_way_id: "",
+        plan_price: 0,
+        name: "",
+        contract_plan_links: [],
+        is_simple: 0,
+        supply: "",
+        money: 0,
+        status: 1,
+        is_framework: 0,
+        use_framework_buy: 0,
+        content: "",
+        contract_to_contracts: [],
+      },
+      purchaseType: [],
+      moneyWay: [],
+      purchaseWay: [],
+      userList: ["ma_sm", "admin", "yu_l", "wang_yx", "li_f", "chen_y"],
+      boxheight: 300,
+      user: null,
+      adminEdit: false,
+      isShowEditor: false,
+      isShowPlan: false,
+      detail: {},
+      plan: [],
+      options: [
+        {
+          value: 1,
+          label: "待申请",
+        },
+        {
+          value: 2,
+          label: "流转中",
+        },
+        {
+          value: 3,
+          label: "已办结",
+        },
+      ],
+      rules: {
+        name: [
+          {
+            required: true,
+            message: "必填",
+            trigger: "blur",
+          },
+          {
+            validator: async (rule, value, callback) => {
+              if (!this.hasValue(value)) {
+                callback(new Error("必填"));
+              } else {
+                const { msg } = await checkContractName({ name: value });
+                if (msg === "未重名") {
+                  callback();
+                } else {
+                  callback(new Error(msg));
+                }
+              }
+            },
+            trigger: "blur",
+          },
+        ],
+        supply: [
+          {
+            validator: (rule, value, callback) => {
+              if (this.form.is_simple) {
+                if (!this.hasValue(value)) {
+                  callback(new Error("必填"));
+                } else {
+                  callback();
+                }
+              } else {
+                callback();
+              }
+            },
+            trigger: "change",
+          },
+        ],
+        type: [
+          {
+            validator: (rule, value, callback) => {
+              if (!this.form.is_simple) {
+                if (!this.hasValue(value)) {
+                  callback(new Error("必填"));
+                } else {
+                  callback();
+                }
+              } else {
+                callback();
+              }
+            },
+            trigger: "change",
+          },
+        ],
+        purchase_type_id: [
+          {
+            validator: (rule, value, callback) => {
+              if (!this.form.is_simple) {
+                if (!this.hasValue(value)) {
+                  callback(new Error("必填"));
+                } else {
+                  callback();
+                }
+              } else {
+                callback();
+              }
+            },
+            trigger: "change",
+          },
+        ],
+        purchase_way_id: [
+          {
+            validator: (rule, value, callback) => {
+              if (!this.form.is_simple) {
+                if (!this.hasValue(value)) {
+                  callback(new Error("必填"));
+                } else {
+                  callback();
+                }
+              } else {
+                callback();
+              }
+            },
+            trigger: "change",
+          },
+        ],
+        money: [
+          {
+            validator: (rule, value, callback) => {
+              if (this.form.is_simple) {
+                if (!this.hasValue(value)) {
+                  callback(new Error("必填"));
+                } else {
+                  if (/^\d+(\.\d+)?$/.test(value)) {
+                    callback();
+                  } else {
+                    callback(new Error("必须为数字"));
+                  }
+                }
+              } else {
+                callback();
+              }
+            },
+            trigger: "blur",
+          },
+        ],
+        plan_money: [
+          {
+            validator: (rule, value, callback) => {
+              if (!this.form.is_simple) {
+                if (!this.hasValue(value)) {
+                  callback(new Error("必填"));
+                } else {
+                  if (/^\d+(\.\d+)?$/.test(value)) {
+                    callback();
+                  } else {
+                    callback(new Error("必须为数字"));
+                  }
+                }
+              } else {
+                callback();
+              }
+            },
+            trigger: "blur",
+          },
+        ],
+        money_way_id: [
+          {
+            validator: (rule, value, callback) => {
+              if (!this.form.is_simple) {
+                if (!this.hasValue(value)) {
+                  callback(new Error("必填"));
+                } else {
+                  callback();
+                }
+              } else {
+                callback();
+              }
+            },
+            trigger: "change",
+          },
+        ],
+        contract_plan_links: [
+          {
+            validator: (rule, value, callback) => {
+              if (this.form.is_plan) {
+                if (this.form.contract_plan_links.length === 0) {
+                  return callback(new Error("必选"));
+                } else {
+                  callback();
+                }
+              } else {
+                callback();
+              }
+            },
+            trigger: "change",
+          },
+        ],
+        contract_to_contracts: [
+          {
+            validator: (rule, value, callback) => {
+              if (this.form.use_framework_buy) {
+                if (this.form.contract_to_contracts.length === 0) {
+                  return callback(new Error("必选"));
+                } else {
+                  callback();
+                }
+              } else {
+                callback();
+              }
+            },
+            trigger: "change",
+          },
+        ],
+      },
+      plans: [],
+      planSelect: {
+        name: "",
+        page_size: 20,
+        page: 1,
+        is_tree: 1,
+      },
+      planTable: [
+        {
+          sortable: false,
+          width: 44,
+          type: "selection",
+          reserveSelection: true,
+          fixed: "left",
+          selectable: (row, index) => {
+            return row.pid === 0;
+          },
+        },
+        {
+          label: "科室",
+          prop: "plan_department.name",
+          width: 100,
+          align: "center",
+        },
+        {
+          label: "年份",
+          prop: "year",
+          width: 80,
+          align: "center",
+        },
+        {
+          label: "分类",
+          prop: "type_detail.value",
+          width: 120,
+        },
+        {
+          label: "名称",
+          prop: "name",
+          minWidth: 180,
+          align: "left",
+        },
+        {
+          label: "计划金额",
+          prop: "money",
+          align: "right",
+          width: 120,
+          formatter: (v1, v2, value) =>
+            value ? `${value}`.replace(/\B(?=(\d{3})+(?!\d))/g, ",") : "",
+        },
+        {
+          label: "实付金额",
+          prop: "use_money_total",
+          width: 120,
+          align: "right",
+          formatter: (v1, v2, value) =>
+            value ? `${value}`.replace(/\B(?=(\d{3})+(?!\d))/g, ",") : "",
+        },
+        {
+          label: "已用金额",
+          prop: "has_money_total",
+          width: 120,
+          align: "right",
+          formatter: (v1, v2, value) =>
+            value ? `${value}`.replace(/\B(?=(\d{3})+(?!\d))/g, ",") : "",
+        },
+      ],
+      planTotal: 0,
+
+      contractSelect: {
+        page: 1,
+        page_size: 10,
+        is_framework: 1,
+      },
+      contractList: [],
+      loading: false,
+      contractTable: [
+        {
+          type: "selection",
+          width: 56,
+          align: "center",
+          fixed: "left",
+          reserveSelection: true,
+        },
+        {
+          label: "项目名称",
+          prop: "name",
+          minWidth: 180,
+          align: "left",
+        },
+        {
+          prop: "purchase_type.value",
+          label: "采购形势",
+          width: 120,
+        },
+        {
+          label: "项目类型",
+          width: 120,
+          customFn: (row) => (
+            <span>
+              {this.types.find((i) => i.value === row.type)?.label || "-"}
+            </span>
+          ),
+        },
+        {
+          prop: "purchase_way.value",
+          label: "采购方式",
+          width: 120,
+        },
+      ],
+      contractTotal: 0,
+      isShowContractToContracts: false,
+    };
+  },
+  methods: {
+    setType(type) {
+      if (["add", "edit"].find((i) => i === type)) {
+        this.type = type;
+      } else {
+        console.warn('type need "add" or "edit"');
+      }
+    },
+
+    hasValue(value) {
+      return (
+        value !== "" &&
+        value !== undefined &&
+        value !== "undefined" &&
+        value !== null
+      );
+    },
+    //获取资金渠道
+    async getMoneyWay() {
+      this.moneyWay =
+        (
+          await getparameter({
+            number: "money_way",
+          })
+        )?.detail || [];
+    },
+    //获取购买方式
+    async getPurchaseWay() {
+      this.purchaseWay =
+        (
+          await getparameter({
+            number: "purchase_way",
+          })
+        )?.detail || [];
+    },
+    //获取购买形式列表
+    async getPurchaseType() {
+      this.purchaseType =
+        (
+          await getparameter({
+            number: "purchase_type",
+          })
+        )?.detail || [];
+    },
+
+    forwardStep() {
+      if (this.step > 1) {
+        this.step--;
+      }
+    },
+    nextStep(isRefresh = false) {
+      if (isRefresh) {
+        this.$refs["editorPlanTable"]?.clearSelection();
+        this.$refs["contractToContractsTable"]?.clearSelection();
+        this.resetForm();
+        this.step = 1;
+        return;
+      }
+      if (this.step >= 3) return;
+      if (this.step === 1) {
+        const selections = this.$refs["editorPlanTable"].getSelection();
+        if (selections?.length > 0) {
+          for (let i of selections) {
+            if (i._inputMoney <= 0) {
+              this.$message({
+                type: "warning",
+                message: `【${i.year}】${i.name} 使用金额需要大于0！`,
+              });
+              return;
+            }
+            if (i._inputMoney > Number(i.money) - Number(i.use_money_total)) {
+              this.$message({
+                type: "warning",
+                message: `【${i.year}】${i.name} 使用金额大于剩余预算！`,
+              });
+              return;
+            }
+          }
+          this.form.contract_plan_links = selections.map((i) => ({
+            plan_id: i.id,
+            use_money: i._inputMoney,
+            new_money: i.money,
+          }));
+          this.step = 2;
+        } else {
+          this.$message({
+            type: "warning",
+            message: "请先选择预算计划！",
+          });
+        }
+      } else if (this.step === 2) {
+        this.$refs["form"].validate((valid) => {
+          if (valid) {
+            this.btnLoading = true
+            if (!this.form.use_framework_buy) {
+              this.form.contract_to_contracts = []
+            }
+            if (this.type === 'add') {
+              addContrant(this.form,true).then(res => {
+                this.btnLoading = false
+                this.step = 3;
+              }).catch(_ => this.btnLoading = false)
+            }
+            if (this.type === 'edit') {
+              editorContract({
+                id: this.contractId,
+                ...this.form
+              }).then(res => {
+                this.btnLoading = false
+                this.step = 3;
+              }).catch(_ => this.btnLoading = false)
+            }
+          }
+        });
+      }
+    },
+
+    //获取预算计划
+    async getBudgets() {
+      let res = await getBudget(this.planSelect);
+      res.list.forEach((item) => (item._inputMoney = 0));
+      this.plans = res.list;
+      this.planTotal = res.list.total || 0;
+    },
+
+    handleDrawerClose(done) {
+      this.$confirm("确认关闭？")
+        .then((_) => {
+          this.form.contract_to_contracts = this.$refs['contractToContractsTable']?.getSelection().map(i => {
+            return this.id ? {
+              contract_id: this.contractId,
+              to_contract_id: i.id,
+              use_money: i.money
+            } : {
+              to_contract_id: i.id,
+              use_money: i.money
+            }
+          })
+          done();
+        })
+        .catch((_) => {});
+    },
+
+    resetForm() {
+      this.form = {
+        type: "",
+        is_plan: 1,
+        purchase_type_id: "",
+        is_contract: 1,
+        purchase_way_id: "",
+        money_way_id: "",
+        plan_price: 0,
+        name: "",
+        contract_plan_links: this.planSelections.map((i) => ({
+          plan_id: i.id,
+          use_money: i._inputMoney,
+          new_money: i.money,
+        })),
+        is_simple: 0,
+        supply: "",
+        money: 0,
+        status: 1,
+        is_framework: 0,
+        use_framework_buy: 0,
+        content: "",
+        contract_to_contracts: [],
+      };
+
+      this.$refs["form"].clearValidate();
+    },
+    //框架合同
+    async getContractToContracts() {
+      const res = await getContract(this.contractSelect, true);
+      this.contractList = res.list.data;
+      this.contractTotal = res.list.total;
+    },
+    closeTag (i) {
+      this.form.contract_to_contracts.splice(this.form.contract_to_contracts.findIndex(j => j.to_contract_id === i.id),1)
+      this.$refs['contractToContractsTable']?.toggleRowSelection(this.$refs['contractToContractsTable']?.getSelection().find(j => i.id === j.id),true)
+    },
+    // selectionChange(selection) {
+    //   this.selections = Array.from(
+    //     new Set(
+    //       selection
+    //     )
+    //   );
+    // },
+    // delSelections(val) {
+    //   this.selections.map((item, index) => {
+    //     if (item.id === val.id) {
+    //       this.selections.splice(index, 1)
+    //     }
+    //   })
+    // },
+  },
+  computed: {
+    isShowIsFramework() {
+      let temp1 = this.form.purchase_type_id;
+      let temp2 = this.form.use_framework_buy;
+      if (
+        this.$refs["purchaseTypeInput"]?.selected?.label === "直接采购" &&
+        this.form.use_framework_buy
+      ) {
+        this.form.is_framework = true;
+        return false;
+      } else {
+        return true;
+      }
+    },
+
+    planSelections() {
+      let temp = this.form.contract_plan_links;
+      return this.$refs["editorPlanTable"]?.getSelection() || [];
+    },
+
+    contractToContractsSelections () {
+      let temp = this.form.contract_to_contracts;
+      return this.$refs["contractToContractsTable"]?.getSelection() || []
+    }
+  },
+  created() {
+    this.getBudgets();
+    this.getMoneyWay();
+    this.getPurchaseType();
+    this.getPurchaseWay();
+    this.boxheight = document.documentElement.clientHeight - 400;
+  },
+  watch: {
+    isShowContractToContracts(val) {
+      if (val) {
+        this.getContractToContracts();
+      } else {
+        this.contractSelect = {
+          page: 1,
+          page_size: 10,
+          is_framework: 1,
+        };
+        this.contractList = [];
+        this.contractTotal = 0;
+      }
+    },
+  },
+  mounted() {
+    let that = this;
+    getInfo().then((response) => {
+      this.user = response;
+      if (that.userList.indexOf(response.username) != -1) {
+        that.adminEdit = true;
+      }
+    });
+  },
+};
+</script>
+
+<style scoped lang="scss">
+.form__contract-to-contracts--no {
+  min-height: 30px;
+  border: 1px solid #dcdee2;
+  border-radius: 4px;
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+  align-content: center;
+  height: 30px;
+  line-height: 30px;
+  color: #cdd0d5;
+  width: 100%;
+  cursor: pointer;
+
+  padding: 0 8px;
+}
+
+.el-form-body {
+  width: 100%;
+  display: grid;
+  grid-template-columns: repeat(2, 1fr);
+  grid-column-gap: 40px;
+  grid-row-gap: 15px;
+
+  padding: 20px;
+}
+
+.done {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  flex-direction: column;
+
+  & > p {
+    font-size: 20px;
+    font-weight: 600;
+    color: #666;
+    line-height: 2;
+
+    margin-top: 12px;
+  }
+}
 </style>
diff --git a/src/views/contract/contractList.vue b/src/views/contract/contractList.vue
index 6c0d00f..da82e44 100644
--- a/src/views/contract/contractList.vue
+++ b/src/views/contract/contractList.vue
@@ -245,31 +245,13 @@
                   </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>
 
           <Button
             style="margin-left: 10px"
             type="primary"
-            @click="new RegExp(/contractLedger/g).test($route.path) ? ($refs['addContractLedger'].setType('add'),$refs['addContractLedger'].show()) : isShowAdd = true"
+            @click="new RegExp(/contractLedger/g).test($route.path) ? ($refs['addContractLedger'].setType('add'),$refs['addContractLedger'].show()) : $router.push('/contract/contractEdit')"
             >新增</Button
           >
           <Button style="margin-left: 10px" type="primary" @click="getContracts"
@@ -303,10 +285,10 @@
         >
           <template slot-scope="scope">
             <div class="slot-btns">
-              <template v-if="(scope.row.status === 2 && scope.row.is_end === 0) || (!scope.row.is_contract && ((scope.row.purchase_way && scope.row.purchase_way.value === '网上商城') || scope.row.purchase_status === 3))">
-                <template v-if="scope.row.is_assurance == 1 || (!scope.row.is_contract && scope.row.purchase_way && scope.row.purchase_way.value === '网上商城'  && scope.row.purchase_status === 3)">
+              <template v-if="scope.row.FLOWSTATUS['zhifu'].isEnabled()">
+                <template v-if="scope.row.is_assurance === 1">
                   <!-- 如果是 履约文件-->
-                  <template v-if="scope.row.assurance_status == 1 || (!scope.row.is_contract && scope.row.purchase_way && scope.row.purchase_way.value === '网上商城'  && scope.row.purchase_status === 3)">
+                  <template v-if="scope.row.assurance_status === 1">
                     <!-- 那么必须财务审核通过-->
                     <Button
                       class="slot-btns-item"
@@ -319,8 +301,6 @@
                           ].isShowPaymentRegistration = true)
                       "
                     >
-                      <!--                           paying(scope.row) @click="$refs['paymentRegistration'].getContract(scope.row),$refs['paymentRegistration'].isShowPaymentRegistration = true"-->
-
                       付款登记
                     </Button>
                   </template>
@@ -336,16 +316,11 @@
                           'paymentRegistration'
                         ].isShowPaymentRegistration = true)
                     "
-                  >
-                    <!--                          @click="$refs['paymentRegistration'].getContract(scope.row),$refs['paymentRegistration'].isShowPaymentRegistration = true"-->
-                    付款登记
+                  >付款登记
                   </Button>
                 </template>
               </template>
-
-              <template
-                v-if="(scope.row.status === 1 && scope.row.join_status === 3 && !/contractLedger/g.test($route.path)) && (scope.row.is_contract && scope.row.purchase_way && scope.row.purchase_way.value !== '网上商城')"
-              >
+              <template v-if="scope.row.FLOWSTATUS['qianding'].isEnabled()">
                 <Button
                   class="slot-btns-item"
                   size="small"
@@ -358,17 +333,7 @@
                   签订合同
                 </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) && (scope.row.is_contract && scope.row.purchase_way && scope.row.purchase_way.value !== '网上商城')
-                "
-              >
+              <template v-if="scope.row.FLOWSTATUS['zhaobiao'].isEnabled()">
                 <Button
                   class="slot-btns-item"
                   size="small"
@@ -377,68 +342,151 @@
                     $refs['biddingUpload'].setId(scope.row.id),
                       $refs['biddingUpload'].show()
                   "
-                  >招标审查</Button
+                >招标审查</Button
                 >
               </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="false">-->
-              <!--                <Button class="slot-btns-item" size="small" type="primary" @click="">中标公告上传</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)) && (scope.row.is_contract && scope.row.purchase_way && scope.row.purchase_way.value !== '网上商城')
-                "
-              >
+              <template v-if="scope.row.FLOWSTATUS['shenpi'].isEnabled()">
                 <Button
                   class="slot-btns-item"
                   size="small"
                   type="primary"
                   @click="signProcess(scope.row)"
-                  >合同审批
+                >合同审批
                 </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
-                "
-              >
+              <template v-if="scope.row.FLOWSTATUS['caigou'].isEnabled()">
                 <Button
                   class="slot-btns-item"
                   size="small"
                   type="primary"
                   @click="buyProcess(scope.row)"
-                  >采购流程
+                >采购流程
                 </Button>
               </template>
+<!--              <template v-if="((scope.row.status === 2) ||-->
+<!--               (!scope.row.is_contract && (scope.row.is_simple)) ||-->
+<!--               ((scope.row.purchase_way && scope.row.purchase_way.value === '网上商城')-->
+<!--               && scope.row.purchase_status === 3) ) && scope.row.is_end === 0">-->
+<!--                <template v-if="scope.row.is_assurance == 1">-->
+<!--                  &lt;!&ndash; 如果是 履约文件&ndash;&gt;-->
+<!--                  <template v-if="scope.row.assurance_status == 1">-->
+<!--                    &lt;!&ndash; 那么必须财务审核通过&ndash;&gt;-->
+<!--                    <Button-->
+<!--                      class="slot-btns-item"-->
+<!--                      size="small"-->
+<!--                      type="primary"-->
+<!--                      @click="-->
+<!--                        $refs['paymentRegistration'].getContract(scope.row),-->
+<!--                          ($refs[-->
+<!--                            'paymentRegistration'-->
+<!--                          ].isShowPaymentRegistration = true)-->
+<!--                      "-->
+<!--                    >-->
+<!--                      &lt;!&ndash;                           paying(scope.row) @click="$refs['paymentRegistration'].getContract(scope.row),$refs['paymentRegistration'].isShowPaymentRegistration = true"&ndash;&gt;-->
+
+<!--                      付款登记-->
+<!--                    </Button>-->
+<!--                  </template>-->
+<!--                </template>-->
+<!--                <template v-else>-->
+<!--                  <Button-->
+<!--                    class="slot-btns-item"-->
+<!--                    size="small"-->
+<!--                    type="primary"-->
+<!--                    @click="-->
+<!--                      $refs['paymentRegistration'].getContract(scope.row),-->
+<!--                        ($refs[-->
+<!--                          'paymentRegistration'-->
+<!--                        ].isShowPaymentRegistration = true)-->
+<!--                    "-->
+<!--                  >-->
+<!--                    &lt;!&ndash;                          @click="$refs['paymentRegistration'].getContract(scope.row),$refs['paymentRegistration'].isShowPaymentRegistration = true"&ndash;&gt;-->
+<!--                    付款登记-->
+<!--                  </Button>-->
+<!--                </template>-->
+<!--              </template>-->
+
+<!--              <template-->
+<!--                v-if="-->
+<!--                (scope.row.status === 1 && scope.row.join_status === 3 && !/contractLedger/g.test($route.path)) &&-->
+<!--                (scope.row.is_contract && scope.row.purchase_way && scope.row.purchase_way.value !== '网上商城')"-->
+<!--              >-->
+<!--                <Button-->
+<!--                  class="slot-btns-item"-->
+<!--                  size="small"-->
+<!--                  type="primary"-->
+<!--                  @click="-->
+<!--                    ($refs['contractSign'].isShow = true),-->
+<!--                      ($refs['contractSign'].contractId = scope.row.id)-->
+<!--                  "-->
+<!--                >-->
+<!--                  签订合同-->
+<!--                </Button>-->
+<!--              </template>-->
+<!--              &lt;!&ndash;      采购完成        &ndash;&gt;-->
+<!--              <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) &&-->
+<!--                  (scope.row.is_contract && scope.row.purchase_way-->
+<!--                  && scope.row.purchase_way.value !== '网上商城')-->
+<!--                "-->
+<!--              >-->
+<!--                <Button-->
+<!--                  class="slot-btns-item"-->
+<!--                  size="small"-->
+<!--                  type="primary"-->
+<!--                  @click="-->
+<!--                    $refs['biddingUpload'].setId(scope.row.id),-->
+<!--                      $refs['biddingUpload'].show()-->
+<!--                  "-->
+<!--                  >招标审查</Button-->
+<!--                >-->
+<!--              </template>-->
+
+<!--              &lt;!&ndash;不需要走采购流程那么直接就是会签，如果采购方式不需要招标的也是直接会签&ndash;&gt;-->
+<!--              <template-->
+<!--                v-if="-->
+<!--                scope.row.is_contract &&-->
+<!--                  ((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))-->
+<!--                  && (scope.row.purchase_way && scope.row.purchase_way.value !== '网上商城')-->
+<!--                "-->
+<!--              >-->
+<!--                <Button-->
+<!--                  class="slot-btns-item"-->
+<!--                  size="small"-->
+<!--                  type="primary"-->
+<!--                  @click="signProcess(scope.row)"-->
+<!--                  >合同审批-->
+<!--                </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>
@@ -1520,66 +1568,6 @@ export default {
         {
           label: "采购流程",
           multiHd: [
-            // {
-            //   label: "请示流程",
-            //   width: 140,
-            //   prop: "req_status",
-            //   formatter: (cell, data, value) => {
-            //     if (cell.is_substitute) {
-            //       return "无";
-            //     }
-            //     if (cell.is_plan === 1) {
-            //       return "无";
-            //     }
-            //     switch (value) {
-            //       case 1:
-            //         return "待申请";
-            //         break;
-            //       case 2:
-            //         return "流转中";
-            //         break;
-            //       case 3:
-            //         return "已办结";
-            //         break;
-            //       default:
-            //         return "异常";
-            //         break;
-            //     }
-            //   },
-            //   customFn:row => {
-            //     const getDate = (value) => {
-            //       if (row.is_substitute) {
-            //         return "无";
-            //       }
-            //       if (row.is_plan === 1) {
-            //         return "无";
-            //       }
-            //       switch (value) {
-            //         case 1:
-            //           return "待申请";
-            //           break;
-            //         case 2:
-            //           return "流转中";
-            //           break;
-            //         case 3:
-            //           return "已办结";
-            //           break;
-            //         default:
-            //           return "异常";
-            //           break;
-            //       }
-            //     }
-            //     return (
-            //       <div>
-            //         <span>{ getDate(row.purchase_status) }</span>
-            //         <br/>
-            //         {
-            //           (row.purchase_status === 1 || row.is_substitute || row.is_plan === 1) ? '' : <a style="color: #333" on={{['click']:this.toOaDetail}}>查看</a>
-            //         }
-            //       </div>
-            //     )
-            //   }
-            // },
             {
               label: "采购业务审批流程",
               width: 158,
@@ -1664,7 +1652,7 @@ export default {
               width: 145,
               prop: "join_status",
               customFn:row => {
-                if (row.is_simple || !row.is_contract) {
+                if (row.is_simple || !row.is_contract || (row.purchase_way && row.purchase_way.value === '网上商城')) {
                   return (<span>无</span>);
                 }
                 const getDate = (value) => {
@@ -1688,7 +1676,7 @@ export default {
                     <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>
+                      row.join_status === 1 ? '' : <a style="color: #333" on={{['click']:()=>this.toOaDetail('hetong',row)}}>查看</a>
                     }
                   </div>
                 )
@@ -2343,7 +2331,7 @@ export default {
         }
       }
       if (column.property === "join_status") {
-        if (row.is_simple) {
+        if (row.is_simple || (row.purchase_way && row.purchase_way.value === '网上商城')) {
           return {
             color: "rgb(140,140,140)",
           };
@@ -2622,7 +2610,7 @@ export default {
         this.select.is_export = 0;
         return;
       }
-
+      res.list.data.forEach(i => this.handleContractFlow(i))
       this.list = res.list.data;
       this.total = res.list.total;
       this.tableTotal.fundLogTotal = res.fund_log_total;
@@ -2633,7 +2621,7 @@ export default {
         .toFixed(2)
         .replace(/(\d)(?=(\d{3})+\.)/g, "$1,");
 
-
+      console.log(this.list)
 
       //新增时打开oa采购录入
       if (isopenOa) {
@@ -2645,9 +2633,8 @@ export default {
               res.list.data[0].is_plan === 1) &&
             !res.list.data[0].is_substitute
           ) {
-
+            await this.buyProcess(res.list.data[0])
           }
-          await this.buyProcess(res.list.data[0])
         }
       }
     },
@@ -2857,6 +2844,88 @@ export default {
     selectionChange(selection) {
       this.selections = Array.from(new Set(selection));
     },
+
+    //数据流程状态处理
+    handleContractFlow (item) {
+      class Flow {
+        status = 0
+        executable = false
+        constructor(status=0, executable=false) {
+          this.status = status
+          this.executable = executable
+        }
+        setStatus (status) {
+          this.status = status
+        }
+        setExecutable (executable) {
+          if (typeof executable === 'boolean') {
+            this.executable = executable
+          }
+        }
+        getStatus () {
+          return this.status
+        }
+        isEnabled () {
+          return this.executable && this.status === 1
+        }
+      }
+      //0无该流程，1未开始，2进行中，3已完成（合同签订1待签订，2已签订）
+      let flowStatus = {
+        "caigou": new Flow(),
+        "zhaobiao": new Flow(),
+        "shenpi": new Flow(),
+        "qianding": new Flow(),
+        "zhifu": new Flow()
+      }
+      if (item.is_simple !== 1 && !item.is_substitute) {
+        //不为简易 采购未开始 不为代建
+
+        flowStatus["caigou"].setStatus(item.purchase_status)
+        if (item.purchase_status === 1) {
+          //采购未开始
+          if (item.is_plan === 1 || (item.is_plan === 0 && item.req_status === 3)) {
+            //不为预算时，请示流程完成
+            flowStatus["caigou"].setExecutable(true)
+          }
+        }
+      }
+      if (item.purchase_way?.value !== '网上商城' && item.is_contract && !item.is_substitute && item.purchase_way?.remark === 'true') {
+        //不为网上商场 是合同 不为代建
+        flowStatus["zhaobiao"].setStatus(item.invite_status)
+        if (item.invite_status === 1 && item.purchase_status === 3) {
+          //采购完成，招标未开始
+          flowStatus["zhaobiao"].setExecutable(true)
+        }
+      }
+      if (item.is_contract && item.purchase_way?.value !== "网上商城") {
+        //为合同 不为网上商城
+        flowStatus["shenpi"].setStatus(item.join_status)
+        if (item.join_status === 1 && (item.invite_status === 3 ||
+          (item.purchase_way?.remark === 'false' && item.purchase_status === 3) ||
+          item.is_substitute)) {
+          //审批未开始 为代建或走招标招标完成或不走招标采购完成
+          flowStatus["shenpi"].setExecutable(true)
+        }
+      }
+      if (item.is_contract && item.purchase_way?.value !== "网上商城" && !/contractLedger/g.test(this.$route.path)) {
+        flowStatus["qianding"].setStatus(item.status)
+        if (item.join_status === 3 && item.status === 1) {
+          flowStatus["qianding"].setExecutable(true)
+        }
+      }
+      if (item.is_end === 0) {
+        flowStatus["zhifu"].setStatus(1)
+        //最后一笔没付完
+        if ((item.purchase_way?.value === "网上商城" && item.purchase_status === 3) ||
+          item.status === 2 ||
+          (!item.is_contract && item.is_simple)) {
+          //网上商场的话采购完成 合同签订完成 不为合同并且为简易
+          flowStatus["zhifu"].setExecutable(true)
+        }
+      }
+
+      item.FLOWSTATUS = flowStatus
+    }
   },
   computed: {
     purchaseWayFormat() {
@@ -2907,66 +2976,18 @@ export default {
     this.getDepartment();
     this.getPurchaseWay();
     this.getMoneyWay();
-    updateFlow().then(_ => this.getContracts())
+    this.getContracts();
     //页面激活后刷新合同列表
     window.onfocus = async () => {
-      await updateFlow();
       await this.getContracts(false,true)
-      // if (this.nowContract?.tbname && this.nowContract?.id) {
-      //   let select = {};
-      //   select["tbname"] = this.nowContract.tbname;
-      //   switch (this.nowContract.tbname) {
-      //     case "caigou":
-      //       select["out_caigou_id"] = this.nowContract.id;
-      //       break;
-      //     case "hetong":
-      //       select["out_contract_id"] = this.nowContract.id;
-      //       break;
-      //     case "zhaobiao":
-      //       select["out_zhaobiao_id"] = this.nowContract.id;
-      //       break;
-      //   }
-      //   const res = await httpCurl(select);
-      //   let flowIdMap = new Map([
-      //     ["caigou", 8],
-      //     ["hetong", 9],
-      //     ["zhaobiao", 30],
-      //   ]);
-      //   let flowTypeMap = new Map([
-      //     ["caigou", 2],
-      //     ["hetong", 3],
-      //     ["zhaobiao", 27],
-      //   ]);
-      //   let getStatus = (status) => {
-      //     if (status === "end") {
-      //       return 1;
-      //     }
-      //     if (Number(status)) {
-      //       return 0;
-      //     }
-      //     return -1;
-      //   };
-      //   await updateStatus({
-      //     flow_id: flowIdMap.get(this.nowContract.tbname),
-      //     flow_type: flowTypeMap.get(this.nowContract.tbname),
-      //     out_contract_id: this.nowContract.id,
-      //     status: getStatus(res.flow?.current_step),
-      //   },true);
-      //   await this.getContracts(false,true);
-      // }
     };
   },
   created() {
     this.getBudgets();
     this.select.keyword = this.$route.query.keyword;
-    // iframe = document.createElement("iframe");
-    // iframe.src = `${process.env.VUE_APP_OUT_OLD}/login/oss_login?id=${this.$store.state.user.userId}&username=${this.$store.state.user.username}`;
-    // iframe.style.display = "none";
-    // document.body.appendChild(iframe);
   },
   destroyed() {
     window.onfocus = null;
-    //document.body.removeChild(iframe);
   },
 };
 </script>
diff --git a/vue.config.js b/vue.config.js
index 423248b..5a43d57 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -25,8 +25,8 @@ module.exports = {
    * In most cases please use '/' !!!
    * Detail: https://cli.vuejs.org/config/#publicpath
    */
-  publicPath: '/admin/',
-  outputDir: '/Users/mac/Documents/Work/s-苏州环境监测中心/code/hjjc-workbench-service/public/admin/',
+  publicPath:  process.env.ENV === 'staging' ? '/admin_test' : '/admin',
+  outputDir: './dist',
   assetsDir: 'static',
   lintOnSave: false,
   productionSourceMap: false,
@@ -38,10 +38,6 @@ module.exports = {
       sass:{
         prependData: '@import "@/styles/index.scss";'
       }
-    },
-    extract: { // 打包后css文件名称添加时间戳
-      filename: `static/css/[name].${timeStamp}.css`,
-      chunkFilename: `static/css/chunk.[id].${timeStamp}.css`
     }
   },
   devServer: {
@@ -84,10 +80,6 @@ module.exports = {
       alias: {
         '@': resolve('src')
       }
-    },
-    output: {
-      filename: `static/js/[name]-${timeStamp}.js`,
-      chunkFilename: `static/js/[name]-${timeStamp}.js`
     }
   },
   chainWebpack(config) {