前端gjy

src/views/financialManagement/collectionManagementList.vue

@@ -68,8 +68,8 @@
       <el-table-column width='100' class="table_td" prop="outWeight" label="出货量(吨)"></el-table-column>
       <el-table-column width='120' class="table_td" prop="alreadyInvoice" label="已开发票(元)"></el-table-column>
       <el-table-column width='120' class="table_td" prop="notInvoice" label="未开发票(元)"></el-table-column>
-      <el-table-column class="table_td" prop="notInvoice" label="附加">
-        <template slot-scope="scope">
+      <el-table-column class="table_td" prop="notInvoice" label="附件">
+        <!-- <template slot-scope="scope">
             <img
               width="18"
               height="20"
@@ -78,17 +78,24 @@
               @click="fujian(scope.row)"
               alt=""
             />
-          </template>
+          </template> -->
+          <template slot-scope="scope">
+          <img
+            width="18"
+            height="20"
+            style="vertical-align: text-top; position: relative; top: -1px"
+            src="../../../public/img/fujian.png"
+            @click="fujian(scope.row)"
+            alt=""
+          />
+          <span v-if="scope.row.addressUrlArray.length > 0">{{
+            scope.row.addressUrlArray.length
+          }}</span>
+          <!-- <i @click="fujian(scope.row)" class="el-icon-paperclip iconCss"></i> -->
+        </template>
       </el-table-column>
       <el-table-column prop="status" label="状态">
             <template slot-scope="scope">
-              <el-popover
-                placement="left"
-                :width="285"
-                trigger="click"
-                visible-arrow="false"
-                @show="history(scope.row)"
-              >
                 <template>
                   <span slot="reference">
                     <span v-if="scope.row.status == '待回款'" class="executory"></span>
@@ -97,7 +104,6 @@
                     {{ scope.row.status }}
                   </span>
                 </template>
-              </el-popover>
             </template>
           </el-table-column>
       <el-table-column class="table_td" prop="updateDate" label="更新时间" width="130"></el-table-column>
@@ -252,7 +258,7 @@
     </el-dialog>
     <!-- 附件弹框 -->
     <el-dialog width="60%" :visible.sync="accessoryTFs" :before-close="handlefujianClose" :append-to-body="true">
-      <p>查看附件</p>
+      <p>添加附件</p>
       <el-upload
   class="avatar-uploader"
   action="https://www.zthymaoyi.com/upload/admin"
@@ -379,7 +385,6 @@ export default {
       id: '',
       contractList: [],
       deptBudgetList: {},
-      historyList: [],
       appendixIdss: [],
       fileList: [],
       dataList: {},
@@ -433,7 +438,12 @@ export default {
         this.getList()
       },
     fujian(row) {
-      this.addressUrls=row.addressUrl.split(',')
+      if(row.addressUrl!=null){
+         this.addressUrls=row.addressUrl.split(',')
+      }
+      else{
+        this.addressUrls=[]
+      }
       this.editlist.id=row.id
       this.accessoryTFs=true
     },
@@ -752,6 +762,16 @@ export default {
       })
         .toPromise()
         .then(response => {
+          for (var i = 0; i < response.records.length; i++) {
+            if (response.records[i].addressUrl != null) {
+              if(response.records[i].addressUrl){
+              response.records[i].addressUrlArray =
+                response.records[i].addressUrl.split(',')
+                }
+            } else {
+              response.records[i].addressUrlArray = []
+            }
+          }
           this.deptCircularPage.currentPage = response.current
           this.deptCircularPage.pageSize = response.size
           this.deptBudgetTotal = response.total
@@ -912,14 +932,6 @@ export default {
     handleCloe() {
       this.dialogViewSpareMoney = false
     },
-    history(row) {
-      console.log(row)
-      billoperatehis({ id: row.id })
-        .toPromise()
-        .then(response => {
-          this.historyList = response
-        })
-    },
     async exportlist() {
       const { data } = await export1(
         {

src/views/salesManagement/salesPlanOrderList.vue

@@ -1246,7 +1246,7 @@ export default {
           .then((response) => {
             this.$message.success('成交成功')
             this.dialogFormVisible1 = false
-            // this.$router.go(-1)
+            this.getList()
           })
           .catch(() => {
             return false

src/views/statisticalReport/component/routers/route.js

@@ -42,21 +42,6 @@ const statisticalReportRouter = {
           // module: 'procurement.sparepart.applDetail'
           }
       },
-      //销售平仓报表
-      {
-        path: 'salesClosingCashierList',
-        component: () =>
-        import(/* webpackChunkName: "applDetail" */ '@/views/statisticalReport/salesClosingCashierList'),
-        name: 'salesClosingCashierList',
-        meta: {
-        title: 'salesClosingCashierList',
-        shortcutEntrance: 'statisticalReport',
-        module: 'report.saleCloseReport',
-        permissicon: [],
-        keepAlive: true
-        // module: 'procurement.sparepart.applDetail'
-        }
-      },
       // 销售出库报表统计
     {
       path: 'salesDeliveryReportList',
@@ -72,6 +57,22 @@ const statisticalReportRouter = {
         // module: 'procurement.sparepart.applDetail'
       }
     },
+      //销售平仓报表
+      {
+        path: 'salesClosingCashierList',
+        component: () =>
+        import(/* webpackChunkName: "applDetail" */ '@/views/statisticalReport/salesClosingCashierList'),
+        name: 'salesClosingCashierList',
+        meta: {
+        title: 'salesClosingCashierList',
+        shortcutEntrance: 'statisticalReport',
+        module: 'report.saleCloseReport',
+        permissicon: [],
+        keepAlive: true
+        // module: 'procurement.sparepart.applDetail'
+        }
+      },
+      
     
   ],
 

src/views/statisticalReport/purchaseClosingCashierList.vue

@@ -367,12 +367,12 @@ export default {
         this.dialogFormVisible2=true
       }
     },
-    audit(item,index,status){
+    audit(item,index,status,status2,reason){
       if(index<this.modification.length){
         posthandle({ taskId: item.taskId,
             approved: status,
-            auditMind: '34',
-            needReapply: false,})
+            auditMind: reason!=undefined?'已驳回':'34',
+            needReapply: status2!=undefined?true:false,})
              .toPromise()
           .then((response) => {
             this.audit(this.modification[index+1],index+1,status)
@@ -437,7 +437,7 @@ export default {
         // }).catch(req => {
         //   this.$message.success('驳回失败')
         // })
-            that.audit(this.modification[0],0,false)
+            that.audit(this.modification[0],0,false,true,'已驳回')
       })
       }
     },

src/views/statisticalReport/purchaseReceiptStatisticsList.vue

@@ -505,6 +505,7 @@ export default {
       invoiceType: '自开发票',
       // invoiceTypeKey:'',
       alreadyInvoice: '',
+      needReapply:true,
       dialogFormVisible1: false,
       dialogFormVisible2: false,
       dialogFormVisible3: false,
@@ -615,8 +616,15 @@ export default {
         this.currect=false
         getselectctcontractno({customerName:this.modification[0].customerName,contractNo:this.modification[0].contractNo}).toPromise()
             .then((response) => {
-
               that.carryovercontractnolist=response
+               for (var i = 0; i < that.carryovercontractnolist.length; i++) {
+                    if(that.carryovercontractnolist[i].amountNotPayable>0){
+                          that.carryovercontractnolist[i].closeaccountstatus="待结算"
+                    }
+                    else{
+                          that.carryovercontractnolist[i].closeaccountstatus="已结算"
+                    }
+                }
             })
             .catch((response) => {
               console.log(response)
@@ -866,12 +874,12 @@ export default {
         })
       }
     },
-    audit(item,index,status){
+    audit(item,index,status,status2,reason){
       if(index<this.modification.length){
         posthandle({ taskId: item.taskId,
             approved: status,
-            auditMind: '34',
-            needReapply: false,})
+            auditMind: reason!=undefined?'已驳回':'34',
+            needReapply: status2!=undefined?true:false,})
              .toPromise()
           .then((response) => {
             this.audit(this.modification[index+1],index+1,status)
@@ -925,7 +933,7 @@ export default {
           //   .catch((req) => {
           //     this.$message.success('驳回失败')
           //   })
-            that.audit(this.modification[0],0,false)
+            that.audit(this.modification[0],0,false,true,'已驳回')
         })
       }
     },
@@ -990,6 +998,7 @@ export default {
     },
     amendconfirm() {
       this.amendlist.id = this.modification[0].id
+      this.amendlist.statusFlag = this.modification[0].statusFlag
       postamend(this.amendlist)
         .toPromise()
         .then((response) => {

src/views/statisticalReport/salesClosingCashierList.vue

@@ -328,12 +328,12 @@ export default {
               }
             }
         },
-        audit(item,index,status){
+        audit(item,index,status,status2,reason){
       if(index<this.multipleSelection.length){
         posthandle({ taskId: item.taskId,
             approved: status,
-            auditMind: '34',
-            needReapply: false,})
+            auditMind: reason!=undefined?'已驳回':'34',
+            needReapply: status2!=undefined?true:false,})
              .toPromise()
           .then((response) => {
             this.audit(this.multipleSelection[index+1],index+1,status)
@@ -522,7 +522,7 @@ export default {
             confirmButtonText: '确定',
             type: 'warning'
           }).then(() => {
-            that.audit(this.multipleSelection[0],0,false)
+            that.audit(this.multipleSelection[0],0,false,true,'已驳回')
           })
         }else{
             this.$message.warning('请选择要驳回的条目')

src/views/statisticalReport/salesDeliveryReportList.vue

@@ -411,12 +411,12 @@ export default {
               }
             }
         },
-     audit(item,index,status){
+     audit(item,index,status,status2,reason){
       if(index<this.modification.length){
         posthandle({ taskId: item.taskId,
             approved: status,
-            auditMind: '34',
-            needReapply: false,})
+            auditMind: reason!=undefined?'已驳回':'34',
+            needReapply: status2!=undefined?true:false,})
              .toPromise()
           .then((response) => {
             this.audit(this.modification[index+1],index+1,status)
@@ -455,7 +455,7 @@ export default {
         confirmButtonText: '确定',
         type: 'warning'
       }).then(() => {
-        that.audit(this.modification[0],0,false)
+        that.audit(this.modification[0],0,false,true,'已驳回')
         // issueapproval({roleFlag:status,flag:2,salesDeliveryReportList:this.modification}).toPromise()
         // .then(response => {
         //   this.$message.success('驳回成功')
@@ -483,7 +483,7 @@ export default {
         // }).catch(req => {
         //   this.$message.success('通过失败')
         // })
-        that.audit(this.modification[0],0,false)
+        that.audit(this.modification[0],0,true)
       })
       }
     },