From 9a98385af369a2978c4627bd0d87ab7e3dc7bed0 Mon Sep 17 00:00:00 2001
From: xy <271556543@qq.com>
Date: Wed, 19 Jul 2023 16:55:31 +0800
Subject: [PATCH] 2023-7-19

---
 src/api/out/index.js                          |  6 +-
 .../contractPaymentRegistration.vue           | 11 ++-
 .../components/paymentRegistration.vue        | 67 +++++++++++++++++++
 src/views/dashboard/index.vue                 | 12 ++--
 .../components/examineRegistration.vue        | 27 ++++++++
 .../inOut/component/addExpenseAccount.vue     |  3 +-
 .../system/workerComponents/department.vue    |  6 +-
 src/views/system/workerComponents/total.vue   |  4 +-
 src/views/system/workerComponents/type.vue    |  6 +-
 vue.config.js                                 |  2 +-
 10 files changed, 122 insertions(+), 22 deletions(-)

diff --git a/src/api/out/index.js b/src/api/out/index.js
index adb2214..d18d642 100644
--- a/src/api/out/index.js
+++ b/src/api/out/index.js
@@ -15,14 +15,14 @@ export function getOutDetail({ tbname,out_caigou_id,out_contract_id,out_pay_id,o
   })
 }
 
-export function httpCurl({ tbname,out_caigou_id,out_contract_id,out_pay_id,out_zhaobiao_id },noloading = true) {
+export function httpCurl({ s = "/Api/flowDetail",tbname,out_caigou_id,out_contract_id,out_pay_id,out_zhaobiao_id },noloading = true) {
   return request({
     method: 'post',
     url: '/api/admin/other/http-curl',
     data: {
-      url: 'http://hjjc-szemcold-test.ali251.langye.net',
+      url: process.env.VUE_APP_OUT_OLD,
       params: {
-        s: "/Api/flowDetail",
+        s,
         tbname,
         out_caigou_id,
         out_contract_id,
diff --git a/src/views/contract/components/contractPaymentRegistration.vue b/src/views/contract/components/contractPaymentRegistration.vue
index 8d324ff..88f687f 100644
--- a/src/views/contract/components/contractPaymentRegistration.vue
+++ b/src/views/contract/components/contractPaymentRegistration.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <xy-dialog :is-show.sync="isShow" title="付款计划" @on-ok="isShow = false">
-      <template v-slot:normalContent>
+      <template>
         <template v-if="isSign">
           <el-button size="small" type="primary" icon="el-icon-plus" style="margin-bottom: 10px;" @click="isShowAddPlan = true">新增付款计划</el-button>
         </template>
@@ -58,6 +58,7 @@
           </div>
         </div>
       </template>
+
     </xy-dialog>
   </div>
 </template>
@@ -137,8 +138,10 @@ export default {
         date:'',
         money:'',
         content:'',
-        remark:''
+        remark:'',
+        file_ids: []
       },
+
       planRules:{
         date:[
           {required:true,message:"必填"}
@@ -154,6 +157,8 @@ export default {
     }
   },
   methods: {
+
+
     async getSignPlan(contractId){
       this.id = contractId
       const res = await getContractSign({contract_id:contractId})
@@ -168,7 +173,7 @@ export default {
         date:`${new Date(this.planForm.date).getFullYear()}-${new Date(this.planForm.date).getMonth()+1}-${new Date(this.planForm.date).getDate()}`,
         content:this.planForm.content,
         money:this.planForm.money,
-        remark:this.planForm.remark
+        remark:this.planForm.remark,
       }).then(res=>{
         this.isShowAddPlan = false
         this.getSignPlan(this.id)
diff --git a/src/views/contract/components/paymentRegistration.vue b/src/views/contract/components/paymentRegistration.vue
index 55a5dde..e497e2c 100644
--- a/src/views/contract/components/paymentRegistration.vue
+++ b/src/views/contract/components/paymentRegistration.vue
@@ -192,6 +192,44 @@
           </div>
         </div>
       </template>
+      <template #files v-if="paymentRegistrationForm.type === '结算款'">
+        <div class="xy-table-item">
+          <div class="xy-table-item-label">
+            附件 ：
+          </div>
+          <div class="xy-table-item-content">
+            <el-upload
+              style="width: 300px"
+              ref="upload"
+              multiple
+              :on-success="successHandle"
+              :before-upload="uploadBefore"
+              accept=".rar,.zip,.doc,.docx,.pdf,.jpg,.png,.gif,.mp4,.xls,.xlsx"
+              :action="action"
+              :file-list="fileList"
+              :auto-upload="false"
+              :on-remove="removeHande"
+              :limit="10"
+            >
+              <el-button slot="trigger" size="small" type="primary"
+              >选取文件</el-button
+              >
+              <el-button
+                style="margin-left: 10px"
+                size="small"
+                type="success"
+                @click="$refs['upload'].submit()"
+              >开始上传</el-button
+              >
+              <div slot="tip" class="el-upload__tip">
+                支持文件格式：.rar .zip .doc .docx .pdf .jpg .png .gif .mp4 .xls
+                .xlsx
+                <br />单个文件不能超过2M
+              </div>
+            </el-upload>
+          </div>
+        </div>
+      </template>
       <template v-slot:extraFormBottom v-if="false">
         <Input
           search
@@ -240,6 +278,8 @@ import { parseTime } from "@/utils";
 export default {
   data() {
     return {
+      fileList: [],
+      action: process.env.VUE_APP_UPLOAD_API,
       searchContent: "",
       planTotal: 0,
       pageIndex: 1,
@@ -283,6 +323,7 @@ export default {
         isLast: false,
         plan: [],
         remark: "",
+        files: []
       },
       form: {
         audit_money: 0,
@@ -345,6 +386,24 @@ export default {
     };
   },
   methods: {
+    //上传
+    successHandle(response, file, fileList) {
+      this.fileList = fileList;
+    },
+    removeHande(file, fileList) {
+      this.fileList = fileList;
+    },
+    uploadBefore(file) {
+      console.log(file);
+      if (file.size / 1000 > 2 * 1024) {
+        this.$message({
+          type: "warning",
+          message: "上传图片大小超过2M！",
+        });
+        return false;
+      }
+    },
+
     async getPlanTypes() {
       const res = await getparameter({
         number: "money_way",
@@ -411,6 +470,13 @@ export default {
       });
 
       this.payment = res.data;
+      this.fileList = res.files_detail?.map(i => {
+        return {
+          url: i?.url,
+          name: i?.original_name,
+          response: i
+        }
+      })
     },
 
     submit() {
@@ -422,6 +488,7 @@ export default {
         is_end: this.paymentRegistrationForm.isLast ? 1 : 0,
         remark: this.paymentRegistrationForm.remark,
         audit_money: this.paymentRegistrationForm.audit_money,
+        files: this.fileList.map(i => i?.response?.id)
       };
       addFundLog(data).then((res) => {
         //付款申请后同时更新一下合同中审计金额
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 9d96833..5d1de8e 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -12,7 +12,7 @@
       <el-col :span="16">
         <el-card class="box-card" style="margin: 20px 0">
           <div slot="header" class="clearfix">
-            <span>预算总体进展情况</span>
+            <span>预算总体执行情况</span>
             <DatePicker
               :value="select.year"
               placeholder="选择所属年份"
@@ -68,7 +68,7 @@
                     )
                   }}%
                 </div>
-                <div class="progress-card-item__label">进展率</div>
+                <div class="progress-card-item__label">执行率</div>
               </div>
             </div>
           </router-link>
@@ -171,7 +171,7 @@
             <div ref="lxHeader" v-if="statistic.departmentList">
               <LxHeader
                 icon="iconfont/icon--kucunguanli"
-                text="科室进展情况"
+                text="科室执行情况"
                 :custom="true"
                 style="margin-bottom: 10px; border: 0px; margin-top: 15px"
               >
@@ -211,7 +211,7 @@
             <div ref="lxHeader" v-if="statistic.typeList">
               <LxHeader
                 icon="iconfont/icon--kucunguanli"
-                text="预算类型进展情况"
+                text="预算类型执行情况"
                 :custom="true"
                 style="margin-bottom: 10px; border: 0px; margin-top: 15px"
               >
@@ -310,7 +310,7 @@ export default {
           fixed: "left",
         },
         {
-          label: "进展情况",
+          label: "执行情况",
           sortable: false,
           minWidth: 220,
           align: "left",
@@ -373,7 +373,7 @@ export default {
           fixed: "left",
         },
         {
-          label: "进展情况",
+          label: "执行情况",
           sortable: false,
           minWidth: 220,
           align: "left",
diff --git a/src/views/finance/components/examineRegistration.vue b/src/views/finance/components/examineRegistration.vue
index 8d97e26..0640590 100644
--- a/src/views/finance/components/examineRegistration.vue
+++ b/src/views/finance/components/examineRegistration.vue
@@ -138,6 +138,24 @@
           </div>
         </div>
       </template>
+      <template #files v-if="paymentRegistrationForm.type === '结算款'">
+        <div class="xy-table-item">
+          <div class="xy-table-item-label">
+            附件 ：
+          </div>
+          <div class="xy-table-item-content">
+            <el-upload
+              style="width: 300px"
+              ref="upload"
+              multiple
+              accept=".rar,.zip,.doc,.docx,.pdf,.jpg,.png,.gif,.mp4,.xls,.xlsx"
+              action=""
+              :file-list="fileList"
+              :auto-upload="false"
+              :limit="10"></el-upload>
+          </div>
+        </div>
+      </template>
       <template v-slot:extraFormBottom>
         <Input search enter-button="搜 索" placeholder="搜索预算计划.." v-model="plansSelect.name" @on-search="getBudgets" />
         <div class="contract-add-plan" style="min-width: 300px;">
@@ -192,6 +210,7 @@
   export default {
     data() {
       return {
+        fileList: [],
         planTotal: 0,
         pageIndex: 1,
         //付款登记
@@ -234,6 +253,7 @@
           plan: [],
           actMoney: '',
           moneyWay: [], //资金列支渠道
+          files: []
         },
         paymentRegistrationRules: {
           applyMoney: [{
@@ -426,6 +446,13 @@
         const res = await detailFundLog({
           id
         })
+        this.fileList = res.files_detail?.map(i => {
+          return {
+            url: i?.url,
+            name: i?.original_name,
+            response: i
+          }
+        })
         this.paymentRegistrationForm.type = res.type
         this.paymentRegistrationForm.isLast = res.is_end === 1
         this.paymentRegistrationForm.deductionMoney = res.apply_money
diff --git a/src/views/inOut/component/addExpenseAccount.vue b/src/views/inOut/component/addExpenseAccount.vue
index 0f15ffa..4344cce 100644
--- a/src/views/inOut/component/addExpenseAccount.vue
+++ b/src/views/inOut/component/addExpenseAccount.vue
@@ -196,6 +196,7 @@ import {
   detailContract as show,
 } from "@/api/contract/contract";
 import { getBudget } from "@/api/budget/budget";
+import { httpCurl } from "@/api/out"
 export default {
   props: {
     report_types: {
@@ -314,7 +315,7 @@ export default {
         report_type: "",
         other_type: "",
         money: undefined,
-        contract_plan_links: [],
+        //contract_plan_links: [],
       },
       rules: {
         report_type: [
diff --git a/src/views/system/workerComponents/department.vue b/src/views/system/workerComponents/department.vue
index d8f5ceb..9a7dfed 100644
--- a/src/views/system/workerComponents/department.vue
+++ b/src/views/system/workerComponents/department.vue
@@ -2,7 +2,7 @@
   <el-card class="box-card" shadow="hover" id="department-card">
     <div slot="header">
       <span style="border-left: 3px solid #338de3ff; padding-left: 6px"
-        >科室进展情况</span
+        >科室执行情况</span
       >
       <i class="el-icon-more" style="float: right; font-size: 20px"></i>
     </div>
@@ -25,7 +25,7 @@ export default {
     w: 6,
     h: 4,
     i: "3",
-    name: "科室进展情况",
+    name: "科室执行情况",
   },
   inject: {
     getStatistic: {
@@ -75,7 +75,7 @@ export default {
           }
         },
         {
-          title: "进展情况",
+          title: "执行情况",
           minWidth: 160,
           fixed: "right",
           render: (h, { row }) => {
diff --git a/src/views/system/workerComponents/total.vue b/src/views/system/workerComponents/total.vue
index 3030869..0fc14b1 100644
--- a/src/views/system/workerComponents/total.vue
+++ b/src/views/system/workerComponents/total.vue
@@ -1,7 +1,7 @@
 <template>
   <el-card class="box-card" shadow="hover">
     <div slot="header" class="clearfix">
-      <span style="border-left: 3px solid #338DE3FF;padding-left: 6px;">预算总体进展情况</span>
+      <span style="border-left: 3px solid #338DE3FF;padding-left: 6px;">预算总体执行情况</span>
       <DatePicker transfer :value="select.year" placeholder="选择所属年份" placement="bottom" style="width: 130px;float: right;"
                   type="year" @on-change="changeYear"></DatePicker>
     </div>
@@ -22,7 +22,7 @@
         <div class="progress-card-item__num">
           {{toper(statistic.progress.money_total_1 || 0,statistic.progress.money_total_2 || 0,statistic.progress.use_money_total || 0)}}%
         </div>
-        <div class="progress-card-item__label">进展率</div>
+        <div class="progress-card-item__label">执行率</div>
       </div>
     </div>
   </el-card>
diff --git a/src/views/system/workerComponents/type.vue b/src/views/system/workerComponents/type.vue
index f08ac24..af950a3 100644
--- a/src/views/system/workerComponents/type.vue
+++ b/src/views/system/workerComponents/type.vue
@@ -2,7 +2,7 @@
   <el-card class="box-card" shadow="hover" id="type-card">
     <div slot="header">
       <span style="border-left: 3px solid #338de3ff; padding-left: 6px"
-        >预算类型进展情况</span
+        >预算类型z执行情况</span
       >
       <i class="el-icon-more" style="float: right; font-size: 20px"></i>
     </div>
@@ -26,7 +26,7 @@ export default {
     w: 6,
     h: 4,
     i: "5",
-    name: "预算类型进展情况",
+    name: "预算类型z执行情况",
   },
   inject: {
     getStatistic: {
@@ -200,7 +200,7 @@ export default {
           fixed: "left",
         },
         {
-          title: "进展情况",
+          title: "z执行情况",
           minWidth: 160,
           fixed: "right",
           render: (h, { row }) => {
diff --git a/vue.config.js b/vue.config.js
index 3d5fdff..cf152d1 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -26,7 +26,7 @@ module.exports = {
    * Detail: https://cli.vuejs.org/config/#publicpath
    */
   publicPath: '/admin/',
-  outputDir: '/Users/liuxiangyu/Work/h-huanjingjiance/app/hjjc-workbench-service/public/admin',
+  outputDir: './dist',
   assetsDir: 'static',
   lintOnSave: false,
   productionSourceMap: false,