Przeglądaj źródła

个贷实收款认领

wucl 1 rok temu
rodzic
commit
a49d5fa316

+ 6 - 0
src/api/modules/financeClaim.js

@@ -24,5 +24,11 @@ export default {
    getList(params){
     return request.get(`financeClaim/list/${params}`)
    },
+   downloadTemp(){
+    return request.get(`financeClaim/personal/claim/template`)
+   },
+   uploadPersonalTemp(file){
+    return request.post(`financeClaim/personal/temp/upload`,{ file: file })
+   }
 
 }

+ 15 - 0
src/api/modules/personal.js

@@ -26,5 +26,20 @@ export default {
    },
    doRecall(params){
     return request.get(`personal/recall/${params}`)
+  },
+  todoSaveFile(params){
+    return request.get(`personal/waiting/saveFile`, { params: params })
+  },
+  batchSaveFile(params){
+    return request.post(`personal/batchSaveFile`, params)
+  },
+  saveFileDone(params){
+    return request.get(`personal/saveFile/done`, { params: params })
+  },
+  myOrder(params) {
+    return request.get(`personal/mine`, { params: params })
+  },
+  waitingClamOrder(params){
+    return request.get(`personal/waiting/claim`, { params: params })
   }
 }

+ 0 - 1
src/components/workflowBoard.vue

@@ -43,7 +43,6 @@ export default {
   watch:{
     nodeBusinessInfo:{
       handler(newVal,oldVal){
-        console.log(newVal.production,oldVal.production);
           if (newVal.ccId){
              this.workNodeCommit.ccId= newVal.ccId;
              this.workNodeCommit.production= newVal.production;

+ 7 - 1
src/router/urlMap.js

@@ -95,6 +95,9 @@ import _views_assets_all_list from '@/views/assets/allList'
 import _views_assets_my_order_list from '@/views/assets/myOrderList'
 import _views_assets_add_order from '@/views/assets/addAssetsOrder'
 import _views_assets_order_detail from '@/views/assets/orderDetail'
+import _views_personal_to_save_file from '@/views/personal/saveFileTodoList'
+import _views_personal_save_file from '@/views/personal/saveFileDoneList'
+import _views_personal_readonly_detail from '@/views/personal/readonlyDetail'
 
 export default {
   _views_set_menu,
@@ -178,5 +181,8 @@ export default {
   _views_assets_all_list,
   _views_assets_my_order_list,
   _views_assets_add_order,
-  _views_assets_order_detail
+  _views_assets_order_detail,
+  _views_personal_to_save_file,
+  _views_personal_save_file,
+  _views_personal_readonly_detail
 }

+ 0 - 3
src/utils/file.js

@@ -42,6 +42,3 @@ export function UploadImg(file, size) { // size 单位为M
   }
 }
 
-export function upload() {
-
-}

+ 97 - 23
src/views/finance/fundList.vue

@@ -324,7 +324,7 @@
             </parentTable>
           </y-page-list-layout>
         </el-tab-pane>
-        <el-tab-pane label="我的个贷订单" name="second">
+        <el-tab-pane label="我的个贷订单" name="PERSONAL_BUSINESS">
           <y-page-list-layout :page-list="myPersonalPageData" :page-para="orderListQuery" :get-page-list="getMyPersonalOrder">
             <template slot="left">
               <el-input v-model="listQuery.name" placeholder="坐落" clearable
@@ -340,35 +340,40 @@
               </el-button>
               <el-button class="filter-item" style="float: left;" round type="success" @click="resetSearch()">重置
               </el-button>
+              <el-button class="filter-item" style="float: left;" round type="info" @click="downloadTemp()">下载模板
+              </el-button>
+              <el-button class="filter-item" style="float: left;" round type="danger" @click="uploadTemp()">模板认领
+              </el-button>
+              <input type="file" ref="fileInput" style="display: none" @change="handleFileChange" />
             </template>
-            <parentTable  :data="myMajorPageData.records" slot="table" style="width: 100%;" :selectionChange="handleSelectionChange">
+            <parentTable  :data="myPersonalPageData.records" slot="table" style="width: 100%;" :selectionChange="handleSelectionChange">
               <el-table-column
                 align="center"
                 type="selection"
                 claimOrders
                 width="100" border="true">
               </el-table-column>
-              <el-table-column label="坐落" align="center" show-overflow-tooltip  >
+              <el-table-column label="坐落" align="center">
                 <template slot-scope="{row}">
-                  <span>{{ row.location }}</span>
+                  <span>{{ row.orderName }}</span>
                 </template>
               </el-table-column>
-              <el-table-column label="订单号" align="center" show-overflow-tooltip   >
+              <el-table-column label="项目编号" align="center">
                 <template slot-scope="{row}">
                   <span>{{row.orderId }}</span>
                 </template>
               </el-table-column>
-              <el-table-column label="委托人" align="center" show-overflow-tooltip width='100'>
+              <el-table-column label="委托人" align="center" width='100'>
                 <template slot-scope="{row}">
                   <span>{{ row.bailorA}} {{ row.bailorB}}</span>
                 </template>
               </el-table-column>
-              <el-table-column label="客户名称" align="center" width='200' show-overflow-tooltip>
+              <el-table-column label="客户名称" align="center" width='200' >
                 <template slot-scope="{row}">
                   <span>{{ row.clientName }}</span>
                 </template>
               </el-table-column>
-              <el-table-column label="业务来源" align="center" show-overflow-tooltip>
+              <el-table-column label="业务来源" align="center" >
                 <template slot-scope="{row}">
                   <span>{{ row.clientSubName }}</span>
                 </template>
@@ -383,9 +388,9 @@
                   <span>{{ row.contactName}}</span>
                 </template>
               </el-table-column>
-              <el-table-column label="实收款(元)" align="center" >
+              <el-table-column label="已认领(元)" align="center" >
                 <template slot-scope="{row}">
-                  <span>{{ row.realAmount }}</span>
+                  <span style="color:red;font-weight: bold;">{{ row.realAmount?row.realAmount:0 }}</span>
                 </template>
               </el-table-column>
               <el-table-column
@@ -399,7 +404,7 @@
         </el-tab-pane>
         <el-tab-pane label="我的资产订单" name="third">资产业务</el-tab-pane>
       </el-tabs>
-      <el-button  style="display:flex; position:absolute;right:50px;top:50px" type="danger" @click="openClaimDialog()">认领</el-button>
+      <el-button  style="display:flex; position:absolute;right:50px;top:50px" round type="danger" @click="openClaimDialog()">选择认领</el-button>
     </el-dialog>
     <el-dialog :visible.sync="allotAmountDialog" width="55%" center  custom-class="doWarehouseClass"  @closed="cleanClaimDTO">
       <el-form v-model="claimOrders" ref="claimOrders">
@@ -417,12 +422,12 @@
           <div slot="header" class="clearfix">
             <el-row>
               <el-col :xs="24" :sm="12" :lg="12" :span="6">
-                <el-form-item label="订单名称:" prop="orderName"   label-width="140px" class="postInfo-container-item">
+                <el-form-item :label="labelName" prop="orderName"   label-width="140px" class="postInfo-container-item">
                   <el-input :value="p.orderName" type="text" class="filter-item" disabled readonly />
                 </el-form-item >
               </el-col>
               <el-col :xs="24" :sm="12" :lg="12" :span="6">
-                <el-form-item label="订单号:" prop="orderId"   label-width="140px" class="postInfo-container-item">
+                <el-form-item :label="labelNum" prop="orderId"   label-width="140px" class="postInfo-container-item">
                   <el-input :value="p.orderId" type="text" class="filter-item" disabled readonly />
                 </el-form-item >
               </el-col>
@@ -452,15 +457,16 @@
               </el-col>
             </el-row>
           </div>
-          <el-row>
-            <el-col :xs="24" :sm="12" :lg="12" :span="6">
-              <el-form-item label="产品列表:" prop="orderName"   label-width="140px" class="postInfo-container-item" />
-            </el-col>
-            <!-- <el-col :xs="24" :sm="12" :lg="6" :span="6">
-                  <el-button v-if="p.reports.length>0" type="primary" style="width:100%" class="filter-item" >自动分配到报告</el-button>
-            </el-col> -->
-          </el-row>
-          <div v-if="p.reports!=null && p.reports.length>0">
+          <div v-if="activeName==='MAJOR_BUSINESS'">
+            <el-row>
+              <el-col :xs="24" :sm="12" :lg="12" :span="6">
+                <el-form-item label="产品列表:" prop="orderName"   label-width="140px" class="postInfo-container-item" />
+              </el-col>
+              <!-- <el-col :xs="24" :sm="12" :lg="6" :span="6">
+                    <el-button v-if="p.reports.length>0" type="primary" style="width:100%" class="filter-item" >自动分配到报告</el-button>
+              </el-col> -->
+            </el-row>
+            <div v-if="p.reports!=null && p.reports.length>0">
             <el-row v-for="(r,index) in p.reports">
               <div  style="margin-left:75px">
                 <el-col :xs="24" :sm="12" :lg="8" :span="6">
@@ -483,6 +489,7 @@
              </el-row>
           </div>
           <span v-else style="margin-left:140px;color:RGB(153,153,153)">暂无产品</span>
+          </div>
         </el-card>
       </el-form>
     </el-dialog>
@@ -500,6 +507,18 @@ export default {
     YPageListLayout
   },
 
+  watch:{
+    activeName:function(){
+        if (this.activeName==='MAJOR_BUSINESS'){
+            this.labelName='订单名称:';
+            this.labelNum='订单号:';
+        }
+        if (this.activeName==='PERSONAL_BUSINESS'){
+            this.labelName='坐落:';
+            this.labelNum='项目编号:';
+        }
+    }
+  },
   data() {
     return {
       pageData: { records: [] },
@@ -546,6 +565,35 @@ export default {
       orderDate:'',
       payDate:'',
       myPersonalPageData:{ records: [] },
+      labelName:'订单名称:',
+      labelNum:'项目编号:',
+      pickerOptions: {
+          shortcuts: [{
+            text: '最近一周',
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+              picker.$emit('pick', [start, end]);
+            }
+          }, {
+            text: '最近一个月',
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+              picker.$emit('pick', [start, end]);
+            }
+          }, {
+            text: '最近三个月',
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+              picker.$emit('pick', [start, end]);
+            }
+          }]
+      },
     }
   },
   created() {
@@ -686,6 +734,9 @@ export default {
         if (tab.name === 'MAJOR_BUSINESS'){
             this.getMyMajorOrder();
         }
+        if (tab.name === 'PERSONAL_BUSINESS'){
+            this.getMyPersonalOrder();
+        }
     },
     openMyOrderDialog(row){
       this.myOrderDialog = true;
@@ -834,11 +885,34 @@ export default {
     },
 
     getMyPersonalOrder(){
-      this.$api.personal.list(this.listQuery).then(res=>{
+      this.$api.personal.waitingClamOrder(this.listQuery).then(res=>{
         if (res.code ===200){
             this.myPersonalPageData = res.data;
         }
       })
+    },
+    downloadTemp(){
+      window.location.href  = "/api/financeClaim/personal/claim/template"
+    },
+    uploadTemp(){
+      this.$refs.fileInput.click(); 
+    },
+    handleFileChange(event){
+      const file = event.target.files[0]; // 获取选中的文件
+      if (file) {
+        // 处理文件
+       this.$api.financeClaim.uploadPersonalTemp(file).then(res => {
+          if (res.code ===200 && res.data) {
+            this.$notify({
+                    title: '成功',
+                    message: '模板认领成功',
+                    type: 'success',
+                    duration: 2000
+                  });
+                this.getMyPersonalOrder();
+          }
+        })
+      }
     }
   },
   

+ 28 - 1
src/views/finance/invoiceCheck.vue

@@ -400,7 +400,34 @@ export default {
         reportNo:null
       },
       planDate:"",
-      applyDate:""
+      applyDate:"",
+      pickerOptions: {
+          shortcuts: [{
+            text: '最近一周',
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+              picker.$emit('pick', [start, end]);
+            }
+          }, {
+            text: '最近一个月',
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+              picker.$emit('pick', [start, end]);
+            }
+          }, {
+            text: '最近三个月',
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+              picker.$emit('pick', [start, end]);
+            }
+          }]
+      },
     }
   },
   created() {

+ 3 - 3
src/views/personal/myOrder.vue

@@ -31,7 +31,7 @@
       <parentTable ref="table" v-loading="listLoading" :data="pageData.records" slot="table" style="width: 100%;" >
         <el-table-column label="坐落" align="center" width="200">
           <template slot-scope="{row}">
-            <span>{{ row.location }}</span>
+            <span>{{ row.orderName }}</span>
           </template>
         </el-table-column>
         <el-table-column label="项目编号" align="center" width="140" >
@@ -101,7 +101,7 @@
         </el-table-column>
         <el-table-column fixed="right" label="操作" width="130" align="center">
           <template slot-scope="{row}">
-            <el-button round type="text" size="small" @click="orderDetail(row)">详情</el-button>
+            <el-button type="text" size="small" @click="orderDetail(row)">详情</el-button>
             <el-button type="text" size="small" @click="productionList(row.id)">产品包</el-button>
           </template>
         </el-table-column>
@@ -403,7 +403,7 @@ export default {
   },
   methods: {
     getPage() {
-      this.$api.personal.list(this.listQuery).then(res=>{
+      this.$api.personal.myOrder(this.listQuery).then(res=>{
         if (res.code ===200){
             this.pageData = res.data;
         }

+ 1 - 9
src/views/personal/pendingList.vue

@@ -197,15 +197,7 @@ export default {
     },
 
     orderDetail(row){
-      if (row.reportNo && row.statementNo){
-        this.$router.push(`/major/detail?id=${row.majorId}&currentNodeName=${row.nodeName}&couldEdit=${false}&reportNo=${row.reportNo}&statementNo=${row.statementNo}&currentNodeId=${row.currentNodeId}&back=${'/major/list'}`)
-      }else if (!row.reportNo && row.statementNo){
-        this.$router.push(`/major/detail?id=${row.majorId}&currentNodeName=${row.nodeName}&couldEdit=${false}&statementNo=${row.statementNo}&currentNodeId=${row.currentNodeId}&back=${'/major/list'}`)
-      }else if (row.reportNo && !row.statementNo){
-        this.$router.push(`/major/detail?id=${row.majorId}&currentNodeName=${row.nodeName}&couldEdit=${false}&reportNo=${row.reportNo}&currentNodeId=${row.currentNodeId}&back=${'/major/list'}`)
-      }else {
-        this.$router.push(`/major/detail?id=${row.majorId}&currentNodeName=${row.nodeName}&couldEdit=${false}&currentNodeId=${row.currentNodeId}&back=${'/major/list'}`)
-      }
+      this.$router.push(`/personal/readonly/detail?id=${row.id}&currentNodeName=${row.currentNodeName}&orderId=${row.orderId}&back=${'/personal/saveFile'}`)
     },
   },
   

Plik diff jest za duży
+ 1845 - 0
src/views/personal/readonlyDetail.vue


+ 201 - 0
src/views/personal/saveFileDoneList.vue

@@ -0,0 +1,201 @@
+<template>
+  <div class="app-container">
+    <div class="title-container">
+      <breadcrumb id="breadcrumb-container" class="breadcrumb-container" />
+    </div>
+    <y-page-list-layout :page-list="pageData" :page-para="listQuery" :get-page-list="getList">
+      <template slot="left">
+        <el-input v-model="listQuery.keyword" placeholder="关键字搜索..." clearable
+          style="margin-left: 20px;width: 500px;float: left;">
+        </el-input>
+        <el-date-picker
+          style="margin-left: 20px;float: left;"
+          v-model="saveFileDate"
+          type="daterange"
+          align="center"
+          unlink-panels
+          range-separator="至"
+          start-placeholder="归档日期(开始)"
+          end-placeholder="归档日期(结束)"
+          :picker-options="pickerOptions" value-format="yyyy-MM-dd">
+        </el-date-picker>
+        <el-button class="filter-item" style="margin-left: 10px;float: left;" type="primary" @click="searchList" round>搜索
+        </el-button>
+        <el-button class="filter-item" style="float: left;" round type="success" @click="resetSearch()">重置
+        </el-button>
+      </template>
+      <parentTable  :data="pageData.records" slot="table" style="width: 100%;">
+        <el-table-column label="坐落" align="center" width="200">
+          <template slot-scope="{row}">
+            <span>{{ row.location }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="项目编号" align="center" width="140" >
+          <template slot-scope="{row}">
+            <span>{{ row.orderId }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="面积" align="center" >
+          <template slot-scope="{row}">
+            <span>{{ row.acreage }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="单价" align="center" >
+          <template slot-scope="{row}">
+            <span>{{ row.price }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="总价" align="center" >
+          <template slot-scope="{row}">
+            <span>{{ row.amount }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="客户名称" align="center" width="130">
+          <template slot-scope="{row}">
+            <span>{{ row.clientName==null?'-': row.clientName }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="业务来源" align="center" width="130">
+          <template slot-scope="{row}">
+            <span>{{ row.clientSubName }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="客户经理" align="center">
+          <template slot-scope="{row}">
+            <span>{{ row.clientManager }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="实勘人" align="center">
+          <template slot-scope="{row}">
+            <span>{{ row.outwardStaffName }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="内业人员" align="center">
+          <template slot-scope="{row}">
+            <span>{{ row.inwardStaffName }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="定价人员" align="center">
+          <template slot-scope="{row}">
+            <span>{{ row.pricingStaffName }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="实收款(元)" align="center">
+          <template slot-scope="{row}">
+            <span style="color:red;font-weight:bold">{{ row.realAmount }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="下单时间" align="center" width="100">
+          <template slot-scope="{row}">
+            {{ row.created }}
+          </template>
+        </el-table-column>
+        <el-table-column label="归档日期" align="center" width="100">
+          <template slot-scope="{row}">
+            <span>{{ row.saveFileDate }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" width="130">
+          <template slot-scope="{row}">
+            <el-button type="success" round @click="toDetail(row)">订单详情</el-button>
+          </template>
+        </el-table-column>
+      </parentTable>
+    </y-page-list-layout>
+  </div>
+</template>
+<script>
+import YPageListLayout from '@/components/YPageListLayout'
+import Breadcrumb from '@/components/Breadcrumb'
+
+export default {
+  name: 'saveFileDonePersonalList',
+  components: {
+    Breadcrumb,
+    YPageListLayout,
+  },
+  filters: {
+    
+  },
+  data() {
+    return {
+      pageData: { records: [] },
+      listQuery: {
+        page: 1,
+        size: 10,
+        descs: 'id',
+      },
+      saveFileDate:'',
+      pickerOptions: {
+          shortcuts: [{
+            text: '最近一周',
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+              picker.$emit('pick', [start, end]);
+            }
+          }, {
+            text: '最近一个月',
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+              picker.$emit('pick', [start, end]);
+            }
+          }, {
+            text: '最近三个月',
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+              picker.$emit('pick', [start, end]);
+            }
+          }]
+      },
+    }
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+  
+    resetSearch() {
+      this.$router.push({ query: {} });
+      this.saveFileDate='';
+      this.listQuery = {
+        current: 1,
+        size: 10,
+        descs: 'id',
+      }
+      this.getList()
+    },
+   
+    searchList() {
+      // 重置分页
+      this.listQuery.page = 1
+      this.listQuery.size = 10
+      if (this.saveFileDate){
+        this.listQuery.startDate = this.saveFileDate[0]+' 00:00:00';
+        this.listQuery.endDate = this.saveFileDate[1]+ ' 23:59:59';
+      }
+      this.getList()
+    },
+    getList() {
+      this.$api.personal.saveFileDone(this.listQuery).then(res=>{
+        if (res.code ===200){
+            this.pageData = res.data;
+        }
+      })
+    },
+   
+    toDetail(row){
+      this.$router.push(`/personal/readonly/detail?id=${row.id}&orderId=${row.orderId}&back=${'/personal/saveFile'}`)
+    },
+  },
+  
+}
+</script>
+<style lang="scss" scoped>
+
+</style>

+ 211 - 0
src/views/personal/saveFileTodoList.vue

@@ -0,0 +1,211 @@
+<template>
+  <div class="app-container">
+    <div class="title-container">
+      <breadcrumb id="breadcrumb-container" class="breadcrumb-container" />
+    </div>
+    <y-page-list-layout :page-list="pageData" :page-para="listQuery" :get-page-list="getList">
+      <template slot="left">
+        <el-input v-model="listQuery.keyword" placeholder="关键字搜索..." clearable
+          style="margin-left: 20px;width: 500px;float: left;">
+        </el-input>
+        <el-button class="filter-item" style="margin-left: 10px;float: left;" type="primary" @click="searchList" round>搜索
+        </el-button>
+        <el-button class="filter-item" style="float: left;" round type="success" @click="resetSearch()">重置
+        </el-button>
+        <el-tooltip class="item" effect="light" content="请先勾选需归档的项目" placement="top-start">
+          <PermissionButton menu-code="_views_personal_batch_save_file" class-name="filter-item" type="danger" icon="el-icon-paperclip"
+            :page-jump="false" round style="float: left" @click="saveFileDialog = true"  :disabled="(!saveFileOrder.length>0)" />
+        </el-tooltip>
+      </template>
+      <parentTable ref="table" v-loading="listLoading" :data="pageData.records" slot="table" style="width: 100%;" :selectionChange="selectionOrderChange" >
+        <el-table-column
+          align="center"
+          type="selection"
+          saveFileOrder
+          width="100" border="true">
+        </el-table-column>
+        <el-table-column label="坐落" align="center" width="200">
+          <template slot-scope="{row}">
+            <span>{{ row.location }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="项目编号" align="center" width="140" >
+          <template slot-scope="{row}">
+            <span>{{ row.orderId }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="面积" align="center" >
+          <template slot-scope="{row}">
+            <span>{{ row.acreage }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="单价" align="center" >
+          <template slot-scope="{row}">
+            <span>{{ row.price }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="总价" align="center" >
+          <template slot-scope="{row}">
+            <span>{{ row.amount }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="客户名称" align="center" width="130">
+          <template slot-scope="{row}">
+            <span>{{ row.clientName==null?'-': row.clientName }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="业务来源" align="center" width="130">
+          <template slot-scope="{row}">
+            <span>{{ row.clientSubName }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="客户经理" align="center">
+          <template slot-scope="{row}">
+            <span>{{ row.clientManager }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="实勘人" align="center">
+          <template slot-scope="{row}">
+            <span>{{ row.outwardStaffName }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="内业人员" align="center">
+          <template slot-scope="{row}">
+            <span>{{ row.inwardStaffName }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="定价人员" align="center">
+          <template slot-scope="{row}">
+            <span>{{ row.pricingStaffName }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="实收款(元)" align="center">
+          <template slot-scope="{row}">
+            <span style="color:red;font-weight:bold">{{ row.realAmount }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="下单时间" align="center" width="100" prop="created" sortable>
+          <template slot-scope="{row}">
+            {{ row.created }}
+          </template>
+        </el-table-column>
+      </parentTable>
+    </y-page-list-layout>
+    <el-dialog :visible.sync="saveFileDialog" width="55%" center  custom-class="doWarehouseClass">
+        <el-result icon="warning" subTitle="请确认将以下项目进行归档操作?"></el-result>
+        <div style="width:100%;text-align:center;">
+            <el-tag v-for="(p,id) in saveFileOrder"   style="font-size:18px;margin-right: 10px;" type="success" effect="plain" :key="p.id"> 
+              {{p.orderId}}</el-tag>
+        </div>
+        <div style="width:100%;text-align:center;margin-top:20px">
+          <el-button type="success" @click="batchSaveFile()">确认归档</el-button>
+        </div>
+    </el-dialog>
+  </div>
+</template>
+<script>
+import YPageListLayout from '@/components/YPageListLayout'
+import Breadcrumb from '@/components/Breadcrumb'
+import PermissionButton from '@/components/PermissionButton/PermissionButton'
+
+export default {
+  name: 'PersonalTodoSaveFile',
+  components: {
+    Breadcrumb,
+    YPageListLayout,
+    PermissionButton,
+  },
+  filters: {
+    
+  },
+ 
+  data() {
+    return {
+      pageData: { records: [] },
+      listLoading: false,
+      listQuery: {
+        page: 1,
+        size: 10,
+        descs: 'id',
+      },
+      saveFileOrder:[],
+      saveFileDialog:false
+    }
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+  
+    resetSearch() {
+      this.$router.push({ query: {} });
+      this.listQuery = {
+        current: 1,
+        size: 10,
+        descs: 'id',
+      }
+      this.getList()
+    },
+   
+    searchList() {
+      // 重置分页
+      this.listQuery.page = 1
+      this.listQuery.size = 10
+      this.getList()
+    },
+    getList() {
+      this.$api.personal.todoSaveFile(this.listQuery).then(res=>{
+        if (res.code ===200){
+            this.pageData = res.data;
+        }
+      })
+    },
+    
+    selectionOrderChange(val){
+      let pickeds = [];
+        for (let i in val){
+          let picked = new Object();
+          picked.taskId = val[i].taskId;
+          picked.currentNodeId = val[i].currentNodeId;
+          picked.businessId = val[i].id;
+          picked.state = "PASS";
+          picked.orderId = val[i].orderId;
+          picked.taskCreated = val[i].taskCreated;
+          pickeds.push(picked);
+        }
+        this.saveFileOrder = pickeds;
+
+    },
+    batchSaveFile(){
+      if (this.saveFileOrder.length>0){
+          this.$api.personal.batchSaveFile(this.saveFileOrder).then(res=>{
+            if (res.code ===200 && res.data){
+              this.$notify({
+                title: '成功',
+                message: '归档成功',
+                type: 'success',
+                duration: 2000
+              });
+              this.saveFileDialog = false;
+              this.getList();
+            }else {
+              this.$notify({
+                title: '失败',
+                message: '归档失败,请联系系统管理员。',
+                type: 'error',
+                duration: 2000
+              });
+            }
+          })
+      }
+    }
+
+  },
+  
+}
+</script>
+<style lang="scss" scoped>
+      /deep/.doWarehouseClass {
+      border-radius: 10px;
+    }
+</style>

+ 0 - 4
src/views/personal/todoDetail.vue

@@ -2323,10 +2323,6 @@
       margin-top:40px
     }
 
-  .myupload{
-    /* float: left;
-    margin-left:10px; */
-  }
   .time {
     font-size: 13px;
     color: #999;