大中型流程细节优化1

src/api/modules/majorProduction.js

@@ -68,6 +68,9 @@ export default {
    },
    performanceList(params){
     return request.get(`majorProduction/performance/allot`,{ params: params })
-   }
+   },
+   noTaskConfirmDelivery(params) {
+    return request.get(`majorProduction/confirmDelivery/${params}`)
+  },
 
 }

src/layout/components/Navbar.vue

@@ -28,7 +28,7 @@
                   </div>
                 </div>
                 <div class="message-content">
-                  {{ showMsg(item) }}
+                  {{ item.message }}
                 </div>
               </el-badge>
             </el-card>
@@ -107,13 +107,13 @@ export default {
       this.showLevel1Status = data;
       this.$emit('getStatus', this.showLevel1Status)
     },
-    showMsg(message) {
-      let xMessage = message.message;
-      if (xMessage.length > 28) {
-        xMessage = xMessage.substring(0, 28) + "...";
-      }
-      return xMessage;
-    },
+    // showMsg(message) {
+    //   let xMessage = message.message;
+    //   if (xMessage.length > 28) {
+    //     xMessage = xMessage.substring(0, 28) + "...";
+    //   }
+    //   return xMessage;
+    // },
     toDetail(message) {
       eventBus.$emit("messageId", message.id)
       if (message.type === 'BUSINESS') {
@@ -143,7 +143,10 @@ export default {
         }else{
           this.$router.push({ path: '/income/major/declare/market', query: { name: name, reportNo: m.reportNo } });
         }
-        
+      }
+      if (message.type === 'MAJOR_OUT_REPERTORY_REMIND'){
+        let m = JSON.parse(message.params);
+        this.$router.push(`/major/my/order?todoBusinessId=${m.majorId}&rNo=${m.reportNo}`)
       }
     },
 
@@ -308,10 +311,6 @@ export default {
   }
 
   .message-content {
-    font-size: smaller;
-    height: 30px;
-    overflow: hidden;
-    color: grey;
     width: 350px;
   }
 }
@@ -322,8 +321,7 @@ export default {
 }
 
 .message-area {
-  border-radius: 20px;
-  height: 800px;
+  border-radius: 10px;
   overflow-y: scroll;
 }
 </style>

src/views/finance/outWarehouseCheck.vue

@@ -97,7 +97,7 @@
               :page-jump="false" round size="mini" @click="doCheck(row.id)" :disabled="(checkType==0&&row.departmentCheckState!=null)" />
             <PermissionButton menu-code="_views_do_out_warehouse_finance_check" class-name="filter-item" type="success"
               :page-jump="false" round size="mini" @click="doCheck(row.id)" 
-              :disabled="!(row.financeCheckState==null && row.departmentCheckState==='审核通过')" />
+              :disabled="!(row.financeCheckState==null && row.departmentCheckState!='审核拒绝')" />
           </template>
         </el-table-column>
       </parentTable> 

src/views/major/myOrder.vue

@@ -277,7 +277,7 @@
           style="width: 100%; margin-top:20px;font-size: 14px;">
           <el-table-column align="center" prop="realAmount" label="申请时实收款金额(元)" width="180">
             <template slot-scope="{row}">
-              <span>{{ row.realAmount == null ? '-' : row.realAmount }}</span>
+              <span style="color:red;font-weight:bold">{{ row.realAmount == null ? '0' : row.realAmount }}</span>
             </template>
           </el-table-column>
           <el-table-column align="center" prop="applyName" label="申请人">
@@ -379,6 +379,9 @@
               <el-button
                 v-if="r.productionNo === statementNo && !r.delivery && r.production === 'STATEMENT'"
                 style="float: right; padding: 3px 0;" type="text" @click="confirmDelivery(r.id)">确认送达</el-button>
+              <el-button
+                v-if="!r.delivery && r.production != 'STATEMENT' &&  r.repertoryState"
+                style="float: right; padding: 3px 0;" type="text" @click="noTaskConfirmDelivery(r.id)">确认送达</el-button>
             </div>
             <el-form :model="r">
               <el-row>
@@ -678,6 +681,7 @@ export default {
     if (this.todoBusinessId) {
       this.productionListDialog = true;
       this.productionList(this.todoBusinessId, this.reportNo == null ? this.statementNo : this.reportNo)
+      console.log(this.reportNo)
       this.activeName = this.reportNo == null ? this.statementNo : this.reportNo
     }
   },
@@ -1036,6 +1040,33 @@ export default {
       }
       return name;
     },
+    noTaskConfirmDelivery(id){
+      this.$confirm('确认执行产品送达操作？', '提示', {
+        confirmButtonText: '确认送达',
+        cancelButtonText: '取消',
+        type: 'warning',
+        center: true
+      }).then(() => {
+           this.$api.majorProduction.noTaskConfirmDelivery(id).then(res=>{
+            if (res.code === 200 && res.data) {
+                this.$notify({
+                title: '成功',
+                message: '产品送达状态修改成功',
+                type: 'success',
+                duration: 2000
+              });
+              this.productionListDialog = false;
+            }else {
+            this.$notify({
+              title: '失败',
+              message: '产品送达状态修改失败',
+              type: 'error',
+              duration: 2000
+            });
+            }
+          })
+      })
+    },
     confirmDelivery(id) {
       this.$confirm('确认执行产品送达操作？', '提示', {
         confirmButtonText: '确认送达',
@@ -1094,6 +1125,7 @@ export default {
         }
       })
     },
+    
     openAllotProductionDialog(row) {
       if (!row.orderFundId) {
         this.$notify({

src/views/major/todoDetail.vue

@@ -1448,11 +1448,11 @@
     <el-dialog :visible.sync="checkFundDialog" width="25%" center top="35vh" custom-class="doWarehouseClass">
       <el-row>
         <el-col :xs="24" :sm="12" :lg="3" :span="6">
-          <i style="font-size:33px;" class="el-icon-warning"></i>
+          <i style="font-size:30px;" class="el-icon-warning-outline"></i>
         </el-col>
         <el-col :xs="24" :sm="12" :lg="21" :span="6">
-          <span style="letter-spacing:2px">系统检测到该订单的价值意见书没有对应的实收款，</span>
-          <span style="letter-spacing:2px">后期是否需要收款？
+          <span >系统检测到意见书</span><span style="color:rgb(131,201,94);font-style: italic;">【{{statementNo}}】</span><span >当前没有对应的实收款记录，</span>
+          <span >后期是否需要收款？
             <el-tooltip class="item" effect="dark" content="收款：继续流程需归档；不收款：终止流程无需归档；" placement="bottom-start">
               <span><i style="font-size:15px" class="el-icon-question"></i></span>
             </el-tooltip>
@@ -2291,7 +2291,7 @@ export default {
               if (this.feedback.production.includes("NONE")) {
                 const pro = new Object();
                 pro.businessId = majorId;
-                pro.reportNo = this.feedback.reportNo;
+                pro.productionNo = this.feedback.reportNo;
                 pro.businessType = "MAJOR_BUSINESS";
                 pro.productionType = "STATEMENT"
                 this.$api.productionFund.checkFund(pro).then(res => {