Browse Source

审核新增了金额限制

duanxiaoduan 1 year ago
parent
commit
1bcc34db3d
3 changed files with 44 additions and 10 deletions
  1. 0 0
      dist/index.html
  2. 20 8
      src/views/cost/diesel/index.vue
  3. 24 2
      src/views/custom/subscribe/index.vue

File diff suppressed because it is too large
+ 0 - 0
dist/index.html


+ 20 - 8
src/views/cost/diesel/index.vue

@@ -28,7 +28,7 @@
           <el-button v-if="isRetreatImport" v-waves class="filter-item" type="warning" icon="el-icon-upload2" @click="form_search">导入</el-button>
         </el-upload>
         <el-button v-if="isDieselExport" v-waves class="filter-item" type="success" icon="el-icon-download" @click="handleDownload">数据导出</el-button>
-        <el-button class="filter-item" type="danger" icon="el-icon-download" @click="form_delete">删除</el-button>
+        <!-- <el-button class="filter-item" type="danger" icon="el-icon-download" @click="form_delete">删除</el-button> -->
       </div>
     </div>
 
@@ -766,20 +766,19 @@ export default {
     handleImportExcelSuccess(res, file) {
     //  if (res.msg === 'ok') {
       if (res.msg === 'ok') {
-        this.$message({
-          title: '成功',
-          message: '导入成功',
-          type: 'success',
-          duration: 2000
-        })
         if (res.data.err_count > 0) {
+          this.$message({
+            title: '失败',
+            message: '导入失败',
+            type: 'danger',
+            duration: 2000
+          })
           this.$notify({
             title: '失败',
             message: '导入失败',
             type: 'danger',
             duration: 2000
           })
-
            import('@/vendor/Export2Excel').then(excel => {
              const list1 = res.data.result
              const tHeader = [
@@ -797,6 +796,19 @@ export default {
                bookType: 'xlsx'
              })
            })
+        }else{
+          this.$message({
+            title: '成功',
+            message: '导入成功',
+            type: 'success',
+            duration: 2000
+          })
+          this.$notify({
+            title: '成功',
+            message: '导入成功',
+            type: 'success',
+            duration: 2000
+          })
         }
       } else {
         this.$notify({

+ 24 - 2
src/views/custom/subscribe/index.vue

@@ -803,6 +803,7 @@ export default {
         }
       },
       apply_subscribeData:{},
+      isApplyEx4:true,
       myHeight:document.documentElement.clientHeight - 85- 150
     }
   },
@@ -1490,6 +1491,19 @@ export default {
           console.log('查看下方table数据', response.data.list)
           this.listSee = response.data.list
           this.listAdd = response.data.list
+          var sumPrices = 0
+          response.data.list.forEach(function(i,j){
+            sumPrices = sumPrices + i["sumPrice"]
+          })
+          console.log("总价sumPrices",sumPrices)
+          var priceObj  = response.data.list.find(obj => obj.price >= 500)
+          console.log("priceObj",priceObj)
+          //总价大于2000 或单价>500
+          if(sumPrices >= 2000 || priceObj){
+            this.isApplyEx4 = true
+          } else {
+            this.isApplyEx4 = false
+          }
           for (let i = 0; i < response.data.list.length; i++) {
             if (response.data.list[i].srcpath !== null && response.data.list[i].picpath !== null && response.data.list[i].srcpath !== undefined && response.data.list[i].picpath !== undefined) {
               console.log(process.env.VUE_APP_BASE_API + response.data.list[i].srcpath, '=======1')
@@ -1891,9 +1905,17 @@ export default {
           this.requestParam.parammaps = {}
           this.requestParam.parammaps.id = this.examineTemp.id
           if (this.examineTemp.statue == 1) {
-            this.requestParam.parammaps.statue = 5
+            if(this.isApplyEx4 == true){
+              this.requestParam.parammaps.statue = 5
+            }else{
+              this.requestParam.parammaps.statue = 11
+            }
           } else if (this.examineTemp.statue == 2) {
-            this.requestParam.parammaps.statue = 6
+            if(this.isApplyEx4 == true){
+              this.requestParam.parammaps.statue = 6
+            }else{
+              this.requestParam.parammaps.statue = 12
+            }
           }
           this.requestParam.parammaps.empId	 = Cookies.get('employeid')
           this.requestParam.parammaps.workflowNote = this.examineTemp.workflowNote

Some files were not shown because too many files changed in this diff