财务实收款页面调整

src/components/Pagination/index.vue

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

src/views/finance/fundList.vue

@@ -8,8 +8,12 @@
         <PermissionButton menu-code="_views_finance_real_fund_create" class-name="filter-item" type="success" icon="el-icon-circle-plus-outline"
           :page-jump="false" round style="float: left" @click="createdRealFundDialog = true" />
         <el-input v-model="listQuery.keyword" placeholder="关键字搜索..." clearable
-          style="margin-left: 20px;width: 500px;float: left;">
+          style="margin-left: 20px;width: 300px;float: left;">
         </el-input>
+        <el-select style="margin-left: 20px;float: left;" v-model="listQuery.notFinished" @change="getList()" >
+          <el-option  label="已认领" :value="false">  </el-option>
+          <el-option  label="未认领" :value="true"></el-option>
+        </el-select>
         <el-date-picker
           style="margin-left: 20px;float: left;"
           v-model="payDate"
@@ -94,7 +98,7 @@
             <i v-else style="font-size:20px; color:RGB(255,106,106)" class="el-icon-warning"></i>
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" width="250" fixed="right">
+        <el-table-column label="操作" align="center" width="250" >
           <template slot-scope="{row}">
               <PermissionButton menu-code="_views_claim_list" class-name="filter-item" type="primary"
               :page-jump="false" round size="mini" @click="clamiList(row.id,row.notClaimAmount,row.payer,row.amount)" />
@@ -132,7 +136,7 @@
                 class="postInfo-container-item"
               >
               <el-input-number :precision="2" :min="0" :value-on-clear="0" v-model.number="realFund.amount" type="number" 
-                style="width:100%" class="filter-item" :disabled="realFund.id !== null" :readonly="realFund.id !== null"/>
+                style="width:100%" class="filter-item" />
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="12" :span="6">
@@ -140,11 +144,11 @@
                 label="到账时间："
                 prop="payDatetime"
                 :rules="{required: true, message: '到账时间不能为空', trigger: 'blur'}"
-                label-width="140px"
+                label-width="140px" 
                 class="postInfo-container-item"
               >
                 <el-date-picker
-                  v-model="realFund.payDatetime" type="date" placeholder="选择日期" style="width:100%">
+                  v-model="realFund.payDatetime" type="date" value-format="yyyy-MM-dd"  placeholder="选择日期" style="width:100%">
                 </el-date-picker>
               </el-form-item>
             </el-col>
@@ -194,7 +198,7 @@
         <span>付款方：</span><span style="color:red;font-weight:bold">{{payer}}</span><span style="margin-left:20px">付款金额：</span><span style="color:red;font-weight:bold">{{amount}}￥</span><span style="margin-left:20px">的认领记录:</span>
       </div>
       <parentTable
-        :data="claimListData" border stripe isBoard="300"
+        :data="claimListData" border stripe :isBoard=300
         style="width: 100%">
         <el-table-column
           align = "center"
@@ -234,14 +238,13 @@
           prop="created" width="180"
           label="认领时间">
         </el-table-column>
-        <!-- <el-table-column
+        <el-table-column
         align = "center"
           label="操作">
           <template slot-scope="scope">
-            <el-button @click="updateClaim(scope.row)" type="text" size="small">修改</el-button>
             <el-button @click="removeClaim(scope.row.id)" type="text" size="small">删除</el-button>
           </template>
-        </el-table-column> -->
+        </el-table-column>
       </parentTable>
     </el-dialog>
   </div>
@@ -278,7 +281,8 @@ export default {
         descs: 'id',
         keyword:null,
         startDate:null,
-        endDate:null
+        endDate:null,
+        notFinished:true
       },
       createdRealFundDialog: false,
       claimListDialog:false,
@@ -370,6 +374,7 @@ export default {
       this.$refs.realFund.validate(valid=>{
         if (valid){
           if (this.realFund.id){
+            console.log(this.realFund)
               this.$api.financeRealFund.edit(this.realFund).then(res=>{
                 if (res.code ===200 && res.data){
                     this.$notify({
@@ -461,11 +466,6 @@ export default {
     },
 
 
-    updateClaim(row){
-      this.doClaimDialog = true;
-      this.claimDTO = row;
-      this.notInfo = this.notInfo + this.notClaimAmount + '￥'
-    },
     // doUpdateClaim(){
     //   if (this.claimDTO.id){
     //     this.$api.financeClaim.edit(this.claimDTO).then(res=>{
@@ -490,37 +490,41 @@ export default {
     //     })
     //   }
     // },
-    // removeClaim(id){
-    //   this.$confirm('请确认是否删除此条认领记录？','提示',{
-    //     confirmButtonText: '确定',
-    //     cancelButtonText: '取消',
-    //     type: 'warning',
-    //     center: true       
-    //   }).then(()=>{
-    //     if (id){
-    //       this.$api.financeClaim.delete(id).then(res=>{
-    //         if (res.code ===200 && res.data){
-    //           this.$notify({
-    //                 title: '成功',
-    //                 message: '删除认领记录成功',
-    //                 type: 'success',
-    //                 duration: 2000
-    //               });
-    //           this.clamiList(this.claimDTO.realFundId);
-    //           this.getList();
-    //         }else {
-    //           this.$notify({
-    //                 title: '失败',
-    //                 message: '删除认领记录失败',
-    //                 type: 'error',
-    //                 duration: 2000
-    //           });
-    //         }
-    //       })
-    //     }
-    //   })
+    removeClaim(id){
+      this.$confirm('请确认是否删除此条认领记录？','提示',{
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+        center: true       
+      }).then(()=>{
+        if (id){
+          this.$api.financeClaim.delete(id).then(res=>{
+            if (res.code ===200 && res.data){
+              this.$notify({
+                    title: '成功',
+                    message: '删除认领记录成功',
+                    type: 'success',
+                    duration: 2000
+                  });
+                  this.$api.financeClaim.getList(id).then(res=>{
+                    if (res.code ===200){
+                      this.claimListData = res.data;
+                    }
+                  })
+                  this.getList();
+            }else {
+              this.$notify({
+                    title: '失败',
+                    message: '删除认领记录失败',
+                    type: 'error',
+                    duration: 2000
+              });
+            }
+          })
+        }
+      })
       
-    // },
+    },
    
     cleanFund(){
       this.realFund.id=null;

src/views/mobile/prodValidate/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="moblie">
       <div v-if="validateTarget.productionNo" class="base" style="background-color: RGB(240,239,244);padding-top: 10vw;">
-          <span style="color:red;">请认准我们的认证网站是:http://noa.scdayou.com/,谨防假冒网站地址!</span>
+          <span style="color:red;">请认准我们的认证网站是:http://mbs.scdayou.com/admin/,谨防假冒网站地址!</span>
       </div>
       <div v-else class="base" style="background-color: RGB(240,239,244);padding-top: 10vw;">
           <span style="color:red;">未获取到报告信息，请联系客服人员。</span>