zxz 2 năm trước cách đây
mục cha
commit
7a8d43dc5e

+ 147 - 65
src/views/parkReportManagement/dailyReport.vue

@@ -1,4 +1,4 @@
-// 规定记录审核
+// 流水单上报
 <template>
   <div class="center">
     <div class="center_css">
@@ -43,8 +43,8 @@
           </el-col>
         </el-row>
       </div>
-      <el-table :data="tableData" style="width: 98%; margin: 0 auto; border-radius: 10px" height="55.8vh" border
-        highlight-current-row>
+      <el-table @selection-change="handleSelectionChange" :data="tableData"
+        style="width: 98%; margin: 0 auto; border-radius: 10px" height="55.8vh" border highlight-current-row>
         <el-table-column type="selection" width="55" :selectable="selectInit">
         </el-table-column>
         <el-table-column type="index" label="序号" width="50">
@@ -59,16 +59,14 @@
         <el-table-column prop="updateDate" label="流水号" />
         <el-table-column prop="updateDate" label="金额(元)" />
         <el-table-column prop="updateDate" label="类型" />
-        <!-- <el-table-column label="上传" prop="submitter" /> -->
-        <!-- <el-table-column prop="versionDescription" label="版本说明" /> -->
         <el-table-column prop="status" label="状态" />
         <el-table-column prop="updateDate" label="付款时间" />
         <el-table-column label="操作" min-width="200">
           <template slot-scope="scope">
             <el-link target="_blank" @click="look(scope.row)" type="primary" :underline="false">查看</el-link>
             <el-divider direction="vertical" />
-            <el-link target="_blank" type="primary" :underline="false" @click="submission(scope.row)" 
-            v-if="scope.row.search == 1 || scope.row.search == 4 || scope.row.status == '暂缓中'" >上报</el-link>
+            <el-link target="_blank" type="primary" :underline="false" @click="submission(scope.row)"
+              v-if="scope.row.search == 1 || scope.row.search == 4 || scope.row.status == '暂缓中'">上报</el-link>
           </template>
         </el-table-column>
       </el-table>
@@ -76,7 +74,7 @@
     <el-pagination :current-page="currentPage" style="text-align: center; margin-top: 10px"
       :page-size="deptCircularPage.pageSize" layout="total, sizes, prev, pager, next, jumper" :total="deptBudgetTotal"
       @size-change="handleSizeChange" @current-change="handleCurrentChange" />
-      
+
     <el-drawer title="运单信息" :visible.sync="rightSee" style="overflow-y: auto !important">
       <div class="right_css">
         <div class="right_item">订单编号:{{ orderData.compilationUnit }}</div>
@@ -100,11 +98,15 @@
         <div class="right_item">{{ orderData.compilationUnit }}</div>
         <div class="right_title">发货地址</div>
         <div class="right_item">
-          {{ orderData.compilationUnit }}{{ orderData.compilationUnit }}{{ orderData.compilationUnit }}{{ orderData.compilationUnit }}
+          {{ orderData.compilationUnit }}{{ orderData.compilationUnit }}{{ orderData.compilationUnit }}{{
+              orderData.compilationUnit
+          }}
         </div>
         <div class="right_title">收货地址</div>
         <div class="right_item">
-          {{ orderData.compilationUnit }}{{ orderData.compilationUnit }}{{ orderData.compilationUnit }}{{ orderData.compilationUnit }}
+          {{ orderData.compilationUnit }}{{ orderData.compilationUnit }}{{ orderData.compilationUnit }}{{
+              orderData.compilationUnit
+          }}
         </div>
         <div class="right_title">司机姓名</div>
         <div class="right_item">{{ orderData.compilationUnit }}</div>
@@ -116,7 +118,7 @@
         <div class="right_item">{{ orderData.compilationUnit }}</div>
         <div class="right_title">重量(kg)</div>
         <div class="right_item">{{ orderData.compilationUnit }}</div>
-        
+
         <!-- <div class="right_title">发货联系人</div>
         <div class="right_item">{{ orderData.compilationUnit }}</div>
         <div class="right_title">发货联系人电话</div>
@@ -201,6 +203,7 @@ import {
 export default {
   data() {
     return {
+      show : false,
       tableData: [],
       // 分页
       searchkeyWord: '',
@@ -209,11 +212,12 @@ export default {
       deptBudgetTotal: 0,
       deptCircularPage: {},
       search: '',
+      modification: [],
       orderData: {
 
       },
       value1: '',
-      status:'',
+      status: '',
       addressUrl: [],
       disabled: false,
       rejectInfo: false,
@@ -240,21 +244,111 @@ export default {
       this.endDate = e[1]
       this.getList()
     },
+    selectInit(row) {
+        if (row.status == '审核中' || row.status == '已通过') {
+          return false
+        } 
+        else {
+          return true
+        }
+    },
+    handleSelectionChange(val) {
+      this.modification = val;
+    },
     //暂缓上报
     postponeSubmission() {
-
+      if (this.modification.length > 0) {
+        this.$confirm('确定暂缓上报选中的条目?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        })
+          .then(() => {
+            this.listLoading = true
+              // var _del = {}
+              // _del.id = row.id
+              // delFormData(_del)
+              .then(response => {
+                this.$notify({
+                  title: '成功',
+                  message: '操作成功!',
+                  type: 'success'
+                })
+                this.getList()
+                this.listLoading = false
+              })
+              .catch(() => {
+                this.loading = false
+              })
+          })
+      } else {
+        this.$notify({
+          title: '操作失败',
+          message: '至少选中一条可上报的条目!',
+          type: 'error'
+        })
+      }
     },
     //批量上报
     batchSubmission() {
-
+      if (this.modification.length > 0) {
+        this.$confirm('确定批量上报流水单信息?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        })
+          .then(() => {
+            this.listLoading = true
+              // var _del = {}
+              // _del.id = row.id
+              // delFormData(_del)
+              .then(response => {
+                this.$notify({
+                  title: '成功',
+                  message: '上报成功!',
+                  type: 'success'
+                })
+                this.getList()
+                this.listLoading = false
+              })
+              .catch(() => {
+                this.loading = false
+              })
+          })
+      } else {
+        this.$notify({
+          title: '上报失败',
+          message: '至少选中一条可上报的条目!',
+          type: 'error'
+        })
+      }
     },
     //上报
     submission() {
-
+      this.$confirm('确定上报运单信息?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      })
+        .then(() => {
+          this.listLoading = true
+            // var _del = {}
+            // _del.id = row.id
+            // delFormData(_del)
+            .then(response => {
+              this.$notify({
+                title: '成功',
+                message: '上报成功!',
+                type: 'success'
+              })
+              this.getList()
+              this.listLoading = false
+            })
+            .catch(() => {
+              this.loading = false
+            })
+        })
     },
-      selectInit() {
-        return true;
-      },
     getList() {
       this.loading = true
       const _obj = {}
@@ -303,21 +397,6 @@ export default {
     //         })
     //     })
     // },
-    // submitInfo() {
-    //   this.listLoading = true
-    //   postNews(this.Info).then(response => {
-    //     this.$notify({
-    //       title: '成功',
-    //       message: '发送成功!',
-    //       type: 'success'
-    //     })
-    //     this.sendInfoClose()
-    //     this.listLoading = false
-    //   })
-    //     .catch(() => {
-    //       this.loading = false
-    //     })
-    // },
     find() {
       this.getList()
     },
@@ -631,48 +710,51 @@ export default {
     margin: 0 auto;
   }
 }
-  .right_css {
-    // overflow-y: auto !important;
-    min-height: 1266px;
-    padding: 0 20px;
 
-    .right_title {
-      color: #9D9D9D;
-      font-size: 14px;
-      margin-bottom: 4px;
-    }
+.right_css {
+  // overflow-y: auto !important;
+  min-height: 1266px;
+  padding: 0 20px;
 
-    .title_name {
-      margin-bottom: 10px;
-    }
+  .right_title {
+    color: #9D9D9D;
+    font-size: 14px;
+    margin-bottom: 4px;
+  }
 
-    .right_item {
-      color: #0D0D0D;
-      font-size: 14px;
-      margin-bottom: 10px;
-    }
+  .title_name {
+    margin-bottom: 10px;
+  }
 
-    .right_btn {
-      text-align: center;
-      margin: 10px 0;
-    }
+  .right_item {
+    color: #0D0D0D;
+    font-size: 14px;
+    margin-bottom: 10px;
+  }
 
-    .img_css {
-      width: 100px;
-      height: 80px;
-      margin-right: 5px;
-    }
+  .right_btn {
+    text-align: center;
+    margin: 10px 0;
+  }
 
-    .right_img {
-      width: 200px;
-      height: 120px;
-      margin-top: 10px;
-    }
+  .img_css {
+    width: 100px;
+    height: 80px;
+    margin-right: 5px;
   }
+
+  .right_img {
+    width: 200px;
+    height: 120px;
+    margin-top: 10px;
+  }
+}
+
 .find::v-deep input.el-input__inner {
   border-radius: 0;
 }
-::v-deep .el-drawer.rtl{
+
+::v-deep .el-drawer.rtl {
   overflow: auto;
 }
 </style>

+ 145 - 92
src/views/parkReportManagement/waybillReporting.vue

@@ -1,4 +1,4 @@
-// 规定记录审核
+// 运单上报
 <template>
   <div class="center">
     <div class="center_css">
@@ -43,8 +43,8 @@
           </el-col>
         </el-row>
       </div>
-      <el-table :data="tableData" style="width: 98%; margin: 0 auto; border-radius: 10px" height="55.8vh" border
-        highlight-current-row>
+      <el-table @selection-change="handleSelectionChange" :data="tableData"
+        style="width: 98%; margin: 0 auto; border-radius: 10px" height="55.8vh" border highlight-current-row>
         <el-table-column type="selection" width="55" :selectable="selectInit">
         </el-table-column>
         <el-table-column type="index" label="序号" width="50">
@@ -66,8 +66,8 @@
           <template slot-scope="scope">
             <el-link target="_blank" @click="look(scope.row)" type="primary" :underline="false">查看</el-link>
             <el-divider direction="vertical" />
-            <el-link target="_blank" type="primary" :underline="false" @click="submission(scope.row)" 
-            v-if="scope.row.search == 1 || scope.row.search == 4 || scope.row.status == '暂缓中'" >上报</el-link>
+            <el-link target="_blank" type="primary" :underline="false" @click="submission(scope.row)"
+              v-if="scope.row.search == 1 || scope.row.search == 4 || scope.row.status == '暂缓中'">上报</el-link>
           </template>
         </el-table-column>
       </el-table>
@@ -75,7 +75,7 @@
     <el-pagination :current-page="currentPage" style="text-align: center; margin-top: 10px"
       :page-size="deptCircularPage.pageSize" layout="total, sizes, prev, pager, next, jumper" :total="deptBudgetTotal"
       @size-change="handleSizeChange" @current-change="handleCurrentChange" />
-      
+
     <el-drawer title="运单信息" :visible.sync="rightSee" style="overflow-y: auto !important">
       <div class="right_css">
         <div class="right_item">订单编号:{{ orderData.compilationUnit }}</div>
@@ -99,11 +99,15 @@
         <div class="right_item">{{ orderData.compilationUnit }}</div>
         <div class="right_title">发货地址</div>
         <div class="right_item">
-          {{ orderData.compilationUnit }}{{ orderData.compilationUnit }}{{ orderData.compilationUnit }}{{ orderData.compilationUnit }}
+          {{ orderData.compilationUnit }}{{ orderData.compilationUnit }}{{ orderData.compilationUnit }}{{
+              orderData.compilationUnit
+          }}
         </div>
         <div class="right_title">收货地址</div>
         <div class="right_item">
-          {{ orderData.compilationUnit }}{{ orderData.compilationUnit }}{{ orderData.compilationUnit }}{{ orderData.compilationUnit }}
+          {{ orderData.compilationUnit }}{{ orderData.compilationUnit }}{{ orderData.compilationUnit }}{{
+              orderData.compilationUnit
+          }}
         </div>
         <div class="right_title">司机姓名</div>
         <div class="right_item">{{ orderData.compilationUnit }}</div>
@@ -115,7 +119,7 @@
         <div class="right_item">{{ orderData.compilationUnit }}</div>
         <div class="right_title">重量(kg)</div>
         <div class="right_item">{{ orderData.compilationUnit }}</div>
-        
+
         <!-- <div class="right_title">发货联系人</div>
         <div class="right_item">{{ orderData.compilationUnit }}</div>
         <div class="right_title">发货联系人电话</div>
@@ -208,11 +212,12 @@ export default {
       deptBudgetTotal: 0,
       deptCircularPage: {},
       search: '',
+      modification: [],
       orderData: {
 
       },
       value1: '',
-      status:'',
+      status: '',
       addressUrl: [],
       disabled: false,
       rejectInfo: false,
@@ -233,7 +238,9 @@ export default {
     //     path: 'specifiedRecordsAdd'
     //   })
     // },
-
+    handleSelectionChange(val) {
+      this.modification = val;
+    },
     dateChange(e) {
       this.startDate = e[0]
       this.endDate = e[1]
@@ -241,19 +248,105 @@ export default {
     },
     //暂缓上报
     postponeSubmission() {
-
+      if (this.modification.length > 0) {
+        this.$confirm('确定暂缓上报选中的条目?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        })
+          .then(() => {
+            this.listLoading = true
+              // var _del = {}
+              // _del.id = row.id
+              // delFormData(_del)
+              .then(response => {
+                this.$notify({
+                  title: '成功',
+                  message: '操作成功!',
+                  type: 'success'
+                })
+                this.getList()
+                this.listLoading = false
+              })
+              .catch(() => {
+                this.loading = false
+              })
+          })
+      } else {
+        this.$notify({
+          title: '失败',
+          message: '至少选中一条可上报的条目!',
+          type: 'error'
+        })
+      }
     },
     //批量上报
     batchSubmission() {
-
+      if (this.modification.length > 0) {
+        this.$confirm('确定批量上报运单信息?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        })
+          .then(() => {
+            this.listLoading = true
+              // var _del = {}
+              // _del.id = row.id
+              // delFormData(_del)
+              .then(response => {
+                this.$notify({
+                  title: '成功',
+                  message: '上报成功!',
+                  type: 'success'
+                })
+                this.getList()
+                this.listLoading = false
+              })
+              .catch(() => {
+                this.loading = false
+              })
+          })
+      } else {
+        this.$notify({
+          title: '上报失败',
+          message: '至少选中一条可上报的条目!',
+          type: 'error'
+        })
+      }
     },
     //上报
     submission() {
-
+      this.$confirm('确定上报运单信息?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      })
+        .then(() => {
+          this.listLoading = true
+            // var _del = {}
+            // _del.id = row.id
+            // delFormData(_del)
+            .then(response => {
+              this.$notify({
+                title: '成功',
+                message: '上报成功!',
+                type: 'success'
+              })
+              this.getList()
+              this.listLoading = false
+            })
+            .catch(() => {
+              this.loading = false
+            })
+        })
+    },
+    selectInit(row) {
+       if (row.status == '审核中' || row.status == '已通过') {
+          return false
+        } else {
+          return true
+        }
     },
-      selectInit() {
-        return true;
-      },
     getList() {
       this.loading = true
       const _obj = {}
@@ -264,10 +357,6 @@ export default {
       getList(_obj).then(response => {
         this.tableData = response.data.records
         this.deptBudgetTotal = response.data.total
-        // if (this.tableData[0].status == '待审核' || this.tableData[0].status == '已驳回') {
-        //   // 最上面一条处于待审核和已驳回时新增按钮置灰不可用
-        //   this.disabled = true
-        // }
         this.listLoading = false
       })
         .catch(() => {
@@ -278,45 +367,6 @@ export default {
       this.search = num;
       this.getList();
     },
-    // del(row) {
-    //   this.$confirm('确定要删除该记录吗?', '提示', {
-    //     confirmButtonText: '确定',
-    //     cancelButtonText: '取消',
-    //     type: 'warning'
-    //   })
-    //     .then(() => {
-    //       this.listLoading = true
-    //       var _del = {}
-    //       _del.id = row.id
-    //       delFormData(_del).then(response => {
-    //         this.$notify({
-    //           title: '成功',
-    //           message: '删除成功!',
-    //           type: 'success'
-    //         })
-    //         this.getList()
-    //         this.listLoading = false
-    //       })
-    //         .catch(() => {
-    //           this.loading = false
-    //         })
-    //     })
-    // },
-    // submitInfo() {
-    //   this.listLoading = true
-    //   postNews(this.Info).then(response => {
-    //     this.$notify({
-    //       title: '成功',
-    //       message: '发送成功!',
-    //       type: 'success'
-    //     })
-    //     this.sendInfoClose()
-    //     this.listLoading = false
-    //   })
-    //     .catch(() => {
-    //       this.loading = false
-    //     })
-    // },
     find() {
       this.getList()
     },
@@ -630,48 +680,51 @@ export default {
     margin: 0 auto;
   }
 }
-  .right_css {
-    // overflow-y: auto !important;
-    min-height: 1266px;
-    padding: 0 20px;
 
-    .right_title {
-      color: #9D9D9D;
-      font-size: 14px;
-      margin-bottom: 4px;
-    }
+.right_css {
+  // overflow-y: auto !important;
+  min-height: 1266px;
+  padding: 0 20px;
 
-    .title_name {
-      margin-bottom: 10px;
-    }
+  .right_title {
+    color: #9D9D9D;
+    font-size: 14px;
+    margin-bottom: 4px;
+  }
 
-    .right_item {
-      color: #0D0D0D;
-      font-size: 14px;
-      margin-bottom: 10px;
-    }
+  .title_name {
+    margin-bottom: 10px;
+  }
 
-    .right_btn {
-      text-align: center;
-      margin: 10px 0;
-    }
+  .right_item {
+    color: #0D0D0D;
+    font-size: 14px;
+    margin-bottom: 10px;
+  }
 
-    .img_css {
-      width: 100px;
-      height: 80px;
-      margin-right: 5px;
-    }
+  .right_btn {
+    text-align: center;
+    margin: 10px 0;
+  }
 
-    .right_img {
-      width: 200px;
-      height: 120px;
-      margin-top: 10px;
-    }
+  .img_css {
+    width: 100px;
+    height: 80px;
+    margin-right: 5px;
   }
+
+  .right_img {
+    width: 200px;
+    height: 120px;
+    margin-top: 10px;
+  }
+}
+
 .find::v-deep input.el-input__inner {
   border-radius: 0;
 }
-::v-deep .el-drawer.rtl{
+
+::v-deep .el-drawer.rtl {
   overflow: auto;
 }
 </style>