Merge branch 'master' of http://47.108.172.52:3000/dayou/item-management-web

src/components/Pagination/index.vue

@@ -35,7 +35,7 @@ export default {
     pageSizes: {
       type: Array,
       default() {
-        return [10, 20, 30, 50,100,200]
+        return [10, 20, 30, 50,100]
       }
     },
     layout: {

src/components/YPageListLayout/index.vue

@@ -51,7 +51,7 @@
           default: function(){
 
           }
-        }
+        },
       },
       data(){
           return{

src/views/major/doneList.vue

@@ -47,7 +47,7 @@
             <span>大中型</span>
           </template>
         </el-table-column> -->
-        <el-table-column label="项目名称" align="center" width="200" >
+        <el-table-column label="项目名称" align="center" width="300" >
           <template slot-scope="{row}">
             <span>{{ row.productionName==null?row.orderName: row.productionName }}</span>
           </template>

src/views/major/list.vue

@@ -8,7 +8,7 @@
         <MoreSearchBar business="MAJOR_BUSINESS" @fliterSearch="fliterSearch" @resetParams="resetParams" :listQuery="listQuery" :nodes="majorNodes"></MoreSearchBar>
       </template>
       <parentTable ref="table" v-loading="listLoading" :data="pageData.records" slot="table" style="width: 100%;" @sortTable="sortTable" >
-        <el-table-column label="项目名称" align="center" width="200">
+        <el-table-column label="项目名称" align="center" width="300">
           <template slot-scope="{row}">
             <span>{{ row.productionName==null?row.name: row.productionName }}</span>
           </template>

src/views/major/oldList.vue

@@ -47,7 +47,7 @@
             <span>{{ row.reportNO}}</span>
           </template>
         </el-table-column>
-        <el-table-column label="项目名称" align="center" width="200" >
+        <el-table-column label="项目名称" align="center" width="300" >
           <template slot-scope="{row}">
             <span>{{ row.name }}</span>
           </template>

src/views/major/saveFileDoneList.vue

@@ -30,7 +30,7 @@
         </el-button>
       </template>
       <parentTable  :data="pageData.records" slot="table" style="width: 100%;">
-        <el-table-column label="订单名称" align="center" width="200" show-overflow-tooltip >
+        <el-table-column label="订单名称" align="center" width="300" show-overflow-tooltip >
           <template slot-scope="{row}">
             <span>{{ row.orderName }}</span>
           </template>
@@ -45,7 +45,7 @@
             <span>{{ row.reportNo==null?'-':row.reportNo}}</span>
           </template>
         </el-table-column>
-        <el-table-column label="项目名称" align="center" width="200" show-overflow-tooltip>
+        <el-table-column label="项目名称" align="center" width="300" show-overflow-tooltip>
           <template slot-scope="{row}">
             <span>{{ row.name}}</span>
           </template>

src/views/major/saveFileTodoList.vue

@@ -39,7 +39,7 @@
             <span>{{ row.orderId }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="项目名称" align="center"  width="200" show-overflow-tooltip>
+        <el-table-column label="项目名称" align="center"  width="300" show-overflow-tooltip>
           <template slot-scope="{row}">
             <span>{{ row.name }}</span>
           </template>

src/views/major/todoList.vue

@@ -34,7 +34,7 @@
         </el-button>
       </template>
       <parentTable  :data="pageData.records" slot="table" style="width: 100%;" @sortTable="sortTable">
-        <el-table-column label="项目名称" align="center" width="200" >
+        <el-table-column label="项目名称" align="center" width="300" >
           <template slot-scope="{row}">
             <span>{{ row.productionName==null?row.orderName: row.productionName }}</span>
           </template>

src/views/personal/doneList.vue

@@ -47,7 +47,7 @@
             <span>个贷业务</span>
           </template>
         </el-table-column> -->
-        <el-table-column label="坐落" align="center" width="200" >
+        <el-table-column label="坐落" align="center" width="300">
           <template slot-scope="{row}">
             <span>{{ row.location }}</span>
           </template>
@@ -77,7 +77,7 @@
             <span>{{ row.handler }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="处理节点" align="center"  width='150'>
+        <el-table-column label="处理节点" align="center"  width='130'>
           <template slot-scope="{row}">
             <span>{{ row.nodeName }}</span>
           </template>
@@ -97,7 +97,7 @@
             <span>{{ row.state }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="处理意见" align="center" show-overflow-tooltip>
+        <el-table-column label="处理意见" align="center"  width='130' show-overflow-tooltip>
           <template slot-scope="{row}">
             <span>{{ row.comments==null?'-':row.comments}}</span>
           </template>

src/views/personal/myOrder.vue

@@ -13,12 +13,12 @@
               :nodeCode="false" :clientManager="false" :outwardStaffName="false" :inwardStaffName="false" :pricingStaffName="false" :handlerName="false"></MoreSearchBar>
       </template>
       <parentTable ref="table" v-loading="listLoading" :data="pageData.records" slot="table" style="width: 100%;" >
-        <el-table-column label="坐落" align="center" width="200">
+        <el-table-column label="坐落" align="center" width="300">
           <template slot-scope="{row}">
             <span>{{ row.orderName }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="项目编号" align="center" width="140" >
+        <el-table-column label="项目编号" align="center" width="130" >
           <template slot-scope="{row}">
             <span>{{ row.orderId }}</span>
           </template>
@@ -78,7 +78,7 @@
             <span>{{ row.shouldAmount }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="下单时间" align="center" width="100" prop="created" sortable>
+        <el-table-column label="下单时间" align="center" width="110" prop="created">
           <template slot-scope="{row}">
             {{ row.created }}
           </template>

src/views/personal/pendingList.vue

@@ -8,14 +8,14 @@
         <MoreSearchBar business="PERSONAL_BUSINESS" :nodes="personalNodes"  @fliterSearch="fliterSearch" @resetParams="resetParams" :listQuery="listQuery"></MoreSearchBar>
       </template>
       <parentTable ref="table" v-loading="listLoading" :data="pageData.records" slot="table" style="width: 100%;">
-        <el-table-column label="项目编号" align="center" width="150" >
+        <el-table-column label="坐落" align="center" width="300"  >
           <template slot-scope="{row}">
-            <span>{{ row.orderId }}</span>
+            <span>{{ row.location }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="坐落" align="center" width="200">
+        <el-table-column label="项目编号" align="center" width="150" >
           <template slot-scope="{row}">
-            <span>{{ row.location }}</span>
+            <span>{{ row.orderId }}</span>
           </template>
         </el-table-column>
         <el-table-column label="当前节点" align="center" width="130">
@@ -98,7 +98,7 @@
             <span>{{ row.pricingStaffName?row.pricingStaffName:'--' }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="下单时间" align="center" width="100" prop="created" sortable>
+        <el-table-column label="下单时间" align="center" width="110" prop="created">
           <template slot-scope="{row}">
             {{ row.created }}
           </template>

src/views/personal/readonlyDetail.vue

@@ -1580,21 +1580,20 @@ export default {
   color: green;
 }
 .qr-code-div{
-  border-radius:10px;
-  background-color: RGB(245,245,245); 
-  width: 180px; 
-  height: 180px; 
-  position:absolute;
-  top:-10;
-  left:0;
+  background-color: RGB(245, 245, 245);
+  width: 150px;
+  height: 150px;
+  position: absolute;
   display: flex;
   justify-content: center;
   align-items: center;
 }
 .qr-code{
-  width: 180px; 
-  height: 180px; 
+  width: 150px;
+  height: 150px;
   z-index: 999;
+  border: 1px #919398 solid;
+  border-radius: 5px;
   }
 .qr-code-div:hover {
   cursor: pointer;

src/views/personal/saveFileDoneList.vue

@@ -9,27 +9,27 @@
          @fliterSearch="fliterSearch" @resetParams="resetParams" :listQuery="listQuery"></MoreSearchBar>
       </template>
       <parentTable  :data="pageData.records" slot="table" style="width: 100%;">
-        <el-table-column label="坐落" align="center" width="200">
+        <el-table-column label="坐落" align="center" width="300">
           <template slot-scope="{row}">
             <span>{{ row.location }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="项目编号" align="center" width="140" >
+        <el-table-column label="项目编号" align="center" width="130" >
           <template slot-scope="{row}">
             <span>{{ row.orderId }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="面积" align="center" >
+        <el-table-column label="面积" align="center" width="130">
           <template slot-scope="{row}">
             <span>{{ row.acreage }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="单价" align="center" >
+        <el-table-column label="单价" align="center" width="130">
           <template slot-scope="{row}">
             <span>{{ row.price }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="总价" align="center" >
+        <el-table-column label="总价" align="center" width="130">
           <template slot-scope="{row}">
             <span>{{ row.amount }}</span>
           </template>
@@ -69,12 +69,12 @@
             <span style="color:red;font-weight:bold">{{ row.realAmount }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="下单时间" align="center" width="100">
+        <el-table-column label="下单时间" align="center" width="110">
           <template slot-scope="{row}">
             {{ row.created }}
           </template>
         </el-table-column>
-        <el-table-column label="归档日期" align="center" width="100">
+        <el-table-column label="归档日期" align="center" width="110">
           <template slot-scope="{row}">
             <span>{{ row.saveFileDate }}</span>
           </template>

src/views/personal/saveFileTodoList.vue

@@ -24,7 +24,7 @@
           saveFileOrder
           width="100" border="true">
         </el-table-column>
-        <el-table-column label="坐落" align="center" width="200">
+        <el-table-column label="坐落" align="center" width="300">
           <template slot-scope="{row}">
             <span>{{ row.location }}</span>
           </template>

src/views/personal/todoDetail.vue

@@ -2000,6 +2000,7 @@ export default {
         const feedbackReq = new Object();
         feedbackReq.feedback = this.target.feedback;
         feedbackReq.id = this.target.id;
+        feedbackReq.personalId = this.target.personalId;
         this.$api.personalTarget.feedback(feedbackReq);
       }
       this.decideProductionTypeDialog = false;
@@ -2346,6 +2347,7 @@ export default {
       if (flag) {
         const feedbackDTO = new Object();
         feedbackDTO.id = this.target.id;
+        feedbackDTO.personalId = this.target.personalId;
         if (this.feedback.length == 0) {
           return;
         }
@@ -2578,29 +2580,28 @@ export default {
 }
 
 .qr-code-div {
-  border-radius: 10px;
   background-color: RGB(245, 245, 245);
-  width: 180px;
-  height: 180px;
+  width: 150px;
+  height: 150px;
   position: absolute;
-  top: -10;
-  left: 0;
   display: flex;
   justify-content: center;
   align-items: center;
 }
 
 .qr-code {
-  width: 180px;
-  height: 180px;
+  width: 150px;
+  height: 150px;
   z-index: 999;
+  border: 1px #919398 solid;
+  border-radius: 5px;
 }
 
 .qr-code-div:hover {
   cursor: pointer;
   // background-color:RGB(220,220,220); 
-  width: 180px;
-  height: 180px;
+  // width: 180px;
+  // height: 180px;
 
 }
 a:hover{

src/views/personal/todoList.vue

@@ -14,12 +14,12 @@
         </MoreSearchBar>
       </template>
       <parentTable ref="table" v-loading="listLoading" :data="pageData.records" slot="table" style="width: 100%;">
-        <el-table-column label="坐落" align="center" width="200">
+        <el-table-column label="坐落" align="center" width="300">
           <template slot-scope="{row}">
             <span>{{ row.location }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="项目编号" align="center" width="150" >
+        <el-table-column label="项目编号" align="center" width="130" >
           <template slot-scope="{row}">
             <span>{{ row.orderId }}</span>
           </template>
@@ -104,12 +104,12 @@
             <span>{{ row.pricingStaffName }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="下单时间" align="center" width="100" >
+        <el-table-column label="下单时间" align="center" width="110" >
           <template slot-scope="{row}">
             {{ row.created }}
           </template>
         </el-table-column>
-        <el-table-column label="节点生成时间" align="center" width="120"  >
+        <el-table-column label="节点生成时间" align="center" width="110"  >
           <template slot-scope="{row}">
             {{ row.nodeCreated }}
           </template>
@@ -216,7 +216,7 @@ export default {
       listLoading: false,
       listQuery: {
         page: 1,
-        size: 10,
+        size: 100,
         current: 1,
         descs: null,
         ascs:null,
@@ -271,7 +271,7 @@ export default {
       this.$router.push({ query: {} });
       this.listQuery = {
           current: 1,
-          size: 10,
+          size: 100,
           descs: 'created',
       }
       this.getPage();
@@ -279,7 +279,7 @@ export default {
     searchList() {
       // 重置分页
       this.listQuery.page = 1
-      this.listQuery.size = 10
+      this.listQuery.size = 100
       this.getPage()
     },