2023-12-5

src/views/contract/components/biddingUpload.vue

@@ -77,6 +77,11 @@ export default {
         id: this.id,
       });
       this.detail = res;
+      this.fileList = res.tender ? [{
+        url: res.tender.url,
+        name: res.tender.original_name,
+        response: res.tender
+      }] : []
     },
     submit() {
       this.detail.invite_status = 3;

src/views/contract/components/paymentRegistration.vue

@@ -506,7 +506,7 @@ export default {
             yizhifujine: this.totalMoney(),
             zongjia: this.contract?.money,
             zhifucishu: this.payment.length,
-            total: this.paymentRegistrationForm.deductionMoney,
+            total: data.apply_money,
             out_pay_id: res
           });
           this.isShowPaymentRegistration = false;

src/views/contract/contractList.vue

@@ -989,9 +989,9 @@
     </xy-dialog>
 
     <!--    新增表 框架合同-->
-    <el-dialog
+    <Modal
       title="框架协议"
-      :visible.sync="isShowContractToContracts"
+      v-model="isShowContractToContracts"
       width="54%"
     >
       <Table
@@ -1023,7 +1023,7 @@
           >确 定</el-button
         >
       </span>
-    </el-dialog>
+    </Modal>
 
     <!--    编辑-->
     <editor
@@ -1478,7 +1478,13 @@ export default {
                     <span>{ getDate(row.invite_status) }</span>
                     <br/>
                     {
-                     (row.is_substitute || row.is_simple || row.purchase_way?.remark === "false" || row.invite_status === 1) ? '' : <a style="color: #333" on={{['click']:()=>this.toOaDetail('pay',row)}}>查看</a>
+                     (row.is_substitute || row.is_simple || row.purchase_way?.remark === "false" || row.invite_status === 1)
+                       ? '' :
+                       <a style="color: #333"
+                          on={{['click']:()=>{
+                            this.$refs['biddingUpload'].setId(row.id)
+                            this.$refs['biddingUpload'].show()
+                          }}}>查看</a>
                     }
                   </div>
                 )
@@ -2358,6 +2364,7 @@ export default {
         "signProcess",
         `top=${this.window.top},left=${this.window.left},width=${this.window.width},height=${this.window.height},location=0`
       );
+      this.$router.push('/contract/contract/paymentRegistrationList_1')
     },
     //请示流程
     async askProcess(row) {

src/views/contract/contractProgress.vue

@@ -681,8 +681,8 @@ export default {
               radiusArr: "50%",
               yArr: [
                 {
-                  value: row.money,
+                  value: (Number(row.money)||0) - (Number(row.fund_log_total)||0),
-                  name: "合同金额",
+                  name: "未付金额（元）",
                   label: {
                     show: false, //这个数据高亮时不显示label，就不会显示替遮住第一个数据的label值了
                   },
@@ -692,7 +692,7 @@ export default {
                     },
                   },
                 },
-                { value: row.plan_price, name: "计划金额" },
+                { value: row.fund_log_total, name: "已付金额（元）" },
               ]
             }
             return (

src/views/contract/paymentRegistrationList.vue

@@ -68,11 +68,11 @@
         <el-table-column
           label="操作"
           fixed="right"
-          width="200"
+          width="220"
           header-align="center"
         >
           <template slot-scope="scope">
-            <template v-if="scope.row.status === 0 && type == 1">
+            <template v-if="scope.row.status === 0 && type == 1 && scope.row.flow_status === 1">
               <Poptip
                 placement="bottom"
                 confirm
@@ -118,8 +118,13 @@
               style="margin-left: 10px; margin-bottom: 4px"
               @click="toOutPay(scope.row)"
             >
-              提交
+              支付审批
             </Button>
+            <Button v-if="scope.row.flow_id"
+                    size="small"
+                    type="primary"
+                    style="margin-left: 10px; margin-bottom: 4px"
+                    @click="toOaDetail(scope.row)">查看</Button>
           </template>
         </el-table-column>
       </template>
@@ -146,7 +151,7 @@
 
 <script>
 import { detailContract } from "@/api/contract/contract";
-import { fundlogFlow } from "@/api/out";
+import { fundlogFlow,httpCurl } from "@/api/out";
 import { getFundLog, delFundLog } from "@/api/paymentRegistration/fundLog";
 import { parseTime } from "@/utils";
 import { Message } from "element-ui";
@@ -230,13 +235,25 @@ export default {
         },
         {
           prop: "status",
-          label: "状态",
+          label: "审核状态",
           width: 120,
           formatter: (cell, data, value) => {
             if (value === 0) return "待审核";
             else return "已审核";
           },
         },
+        {
+          prop: 'flow_status',
+          label: '流程状态',
+          formatter: (cell, data, value) => {
+            let map = new Map([
+              [1,'待申请'],
+              [2,'流转中'],
+              [3,'已完成']
+            ])
+            return map.get(value)
+          }
+        },
         {
           label: "次数",
           prop: "pay_count",
@@ -283,6 +300,14 @@ export default {
     };
   },
   methods: {
+    async toOaDetail (row) {
+      window.open(
+        `http://hjjc-szemcold-test.ali251.langye.net/index.php?s=/flow/edit/id/${row.flow_id}&auth_token=${this.$store.getters.oa_token}`,
+        "bidding",
+        `top=${this.window.top},left=${this.window.left},width=${this.window.width},height=${this.window.height},location=0`
+      )
+    },
+
     async toOutPay(row) {
       let payments = [];
       const actNumsTotal = () => {
@@ -342,7 +367,7 @@ export default {
         yizhifujine: totalMoney(),
         zongjia: contract?.money,
         zhifucishu: payments.length,
-        total: row?.discount_money,
+        total: row?.apply_money,
         //"承包商\\供应商":row.supply
       };
       let url = `${
@@ -402,6 +427,13 @@ export default {
     this.contractId = this.$route.query.contractId;
 
     this.getFundLogs();
+
+    window.onfocus = () => {
+      this.getFundLogs();
+    }
+  },
+  destroyed() {
+    window.onfocus = null;
   },
   created() {
     let type = parseInt(this.$route.path.split("_")[1]);