Просмотр исходного кода

Merge branch 'dev' of http://www.baoxianzhanggui.com:8090/sxzgd/vue-insagent-pc into dev

lihongxiao 2 лет назад
Родитель
Сommit
d47915eca6

+ 11 - 1
src/http/moudules/task.js

@@ -9,6 +9,16 @@ export const findPage = (data) => {
     })
 }
 
+//任务池操作校验
+export const checkOrdersEdit = (data) => {
+  return axios({
+    url: "/order/taskPools/checkCurrentUserEdit",
+    method: "post",
+    data
+
+  })
+}
+
 // 根据任务号查询订单报价信息
 export const getOrderInfoByOrderno = (data) => {
     return axios({
@@ -575,4 +585,4 @@ export const delPoster = (data) => {
         method:"post",
         
     })
-}
+}

+ 54 - 42
src/views/Letter/Letter.vue

@@ -1960,63 +1960,75 @@
             ¥{{queryOrders.orderCommissionVo&&queryOrders.orderCommissionVo.totalFeePremium?queryOrders.orderCommissionVo.totalFeePremium:0 }}</span>
         </div>
         <div class="headers headers_Custom" >
-          <div v-show="queryOrders.jqpremium">
-            交强险金额:
-            <span>
+          <el-row style="width: 100%">
+            <el-col :span="1"></el-col>
+            <el-col :span="5"><div v-show="queryOrders.jqpremium">
+              交强险金额:
+              <span>
               ¥{{
               queryOrders.jqpremium }}
             </span>
-          </div>
-          <div v-if="queryOrders.orderCommissionVo&&queryOrders.orderCommissionVo.jqFeeRate">
-            手续费比例:
-            <span>
+            </div></el-col>
+            <el-col :span="4" v-if="queryOrders.orderCommissionVo&&queryOrders.orderCommissionVo.jqFeeRate"><div>
+              手续费比例:
+              <span>
               {{
                 queryOrders.orderCommissionVo.jqFeeRate  }}%
             </span>
-          </div>
-          <div v-if="queryOrders.orderCommissionVo&&queryOrders.orderCommissionVo.jqFeePremium">
-            手续费金额:
-            <span>
+            </div></el-col>
+            <el-col :span="5" v-if="queryOrders.orderCommissionVo&&queryOrders.orderCommissionVo.jqFeePremium"><div>
+              手续费金额:
+              <span>
               ¥{{queryOrders.orderCommissionVo.jqFeePremium}}
             </span>
-          </div>
-          <div v-show="queryOrders.taxamount">
-            车船税:
-            <span>¥{{ queryOrders.taxamount }}</span>
-          </div>
-          <div v-show="queryOrders.jqstartdate">
-            交强险起保日期:
-            <span>{{ queryOrders.jqstartdate }}</span>
-          </div>
+            </div></el-col>
+            <el-col :span="6"><div v-show="queryOrders.jqstartdate">
+              交强险起保日期:
+              <span>{{ queryOrders.jqstartdate }}</span>
+            </div></el-col>
+            <el-col :span="3"><div v-show="queryOrders.taxamount">
+              车船税:
+              <span>¥{{ queryOrders.taxamount }}</span>
+            </div></el-col>
+          </el-row>
         </div>
         <div class="headers headers_Custom" >
-          <div v-show="queryOrders.sypremium">
-            商业险金额:
-            <span>¥{{ queryOrders.sypremium }}</span>
-          </div>
-          <div v-if="queryOrders.orderCommissionVo&&queryOrders.orderCommissionVo.syFeeRate">
-            手续费比例:
-            <span>
+          <el-row style="width: 100%">
+            <el-col :span="1"></el-col>
+            <el-col :span="5"><div v-show="queryOrders.sypremium">
+              商业险金额:
+              <span>¥{{ queryOrders.sypremium }}</span>
+            </div></el-col>
+            <el-col :span="4" v-if="queryOrders.orderCommissionVo&&queryOrders.orderCommissionVo.syFeeRate"><div>
+              手续费比例:
+              <span>
               {{
                 queryOrders.orderCommissionVo.syFeeRate  }}%
             </span>
-          </div>
-          <div v-if="queryOrders.orderCommissionVo&&queryOrders.orderCommissionVo.syFeePremium">
-            手续费金额:
-            <span>
+            </div></el-col>
+            <el-col :span="5" v-if="queryOrders.orderCommissionVo&&queryOrders.orderCommissionVo.syFeePremium"><div>
+              手续费金额:
+              <span>
               ¥{{queryOrders.orderCommissionVo.syFeePremium}}
             </span>
-          </div>
-          <div v-show="queryOrders.systartdate">
-            商业险起保日期:
-            <span>{{ queryOrders.systartdate }}</span>
-          </div>
+            </div></el-col>
+            <el-col :span="6"><div v-show="queryOrders.systartdate">
+              商业险起保日期:
+              <span>{{ queryOrders.systartdate }}</span>
+            </div></el-col>
+            <el-col :span="3"></el-col>
+          </el-row>
         </div>
         <div class="headers headers_Custom" >
-          <div v-if="queryOrders.jypremium">
-            驾意险:
-            <span>¥{{ queryOrders.jypremium }}</span>
-          </div>
+          <el-row style="width: 100%">
+            <el-col :span="1"></el-col>
+            <el-col :span="5" v-if="queryOrders.jypremium"><div>
+              驾意险:
+              <span>¥{{ queryOrders.jypremium }}</span>
+            </div></el-col>
+            <el-col :span="18"></el-col>
+          </el-row>
+
         </div>
       </div>
       <div class="Enclosure" v-if="queryOrders">
@@ -9011,8 +9023,8 @@ export default {
 /* 内容待定 */
 .headers_Custom {
   div {
-    padding: 5px 40px;
-    font-size: 16px;
+    padding: 2px 0px;
+    font-size: 14px;
 
     & > span {
       color: rgb(226, 118, 10);

+ 43 - 28
src/views/Letter/Orderlist.vue

@@ -240,63 +240,74 @@
             ¥{{orderInfo.orderCommissionVo&&orderInfo.orderCommissionVo.totalFeePremium?orderInfo.orderCommissionVo.totalFeePremium:0 }}</span>
         </div>
         <div class="headers headers_Custom" >
-          <div v-show="orderInfo.jqpremium">
+          <el-row style="width: 100%">
+            <el-col :span="1"></el-col>
+            <el-col :span="5"><div v-show="orderInfo.jqpremium">
             交强险金额:
             <span>
               ¥{{
                 orderInfo.jqpremium }}
             </span>
-          </div>
-          <div v-if="orderInfo.orderCommissionVo&&orderInfo.orderCommissionVo.jqFeeRate">
+          </div></el-col>
+            <el-col :span="4" v-if="orderInfo.orderCommissionVo&&orderInfo.orderCommissionVo.jqFeeRate"><div>
             手续费比例:
             <span>
               {{
                 orderInfo.orderCommissionVo.jqFeeRate  }}%
             </span>
-          </div>
-          <div v-if="orderInfo.orderCommissionVo&&orderInfo.orderCommissionVo.jqFeePremium">
+          </div></el-col>
+            <el-col :span="5" v-if="orderInfo.orderCommissionVo&&orderInfo.orderCommissionVo.jqFeePremium"><div>
             手续费金额:
             <span>
               ¥{{orderInfo.orderCommissionVo.jqFeePremium }}
             </span>
-          </div>
-          <div v-show="orderInfo.taxamount">
-            车船税:
-            <span>¥{{ orderInfo.taxamount }}</span>
-          </div>
-          <div v-show="orderInfo.jqstartdate">
+          </div></el-col>
+            <el-col :span="6"><div v-show="orderInfo.jqstartdate">
             交强险起保日期:
             <span>{{ orderInfo.jqstartdate }}</span>
-          </div>
+          </div></el-col>
+            <el-col :span="3"><div v-show="orderInfo.taxamount">
+            车船税:
+            <span>¥{{ orderInfo.taxamount }}</span>
+          </div></el-col>
+          </el-row>
         </div>
         <div class="headers headers_Custom" >
-        <div v-show="orderInfo.sypremium">
+          <el-row style="width: 100%">
+            <el-col :span="1"></el-col>
+            <el-col :span="5"><div v-show="orderInfo.sypremium">
           商业险金额:
           <span>¥{{ orderInfo.sypremium }}</span>
-        </div>
-          <div v-if="orderInfo.orderCommissionVo&&orderInfo.orderCommissionVo.syFeeRate">
+        </div></el-col>
+            <el-col :span="4" v-if="orderInfo.orderCommissionVo&&orderInfo.orderCommissionVo.syFeeRate"><div>
             手续费比例:
             <span>
               {{
                 orderInfo.orderCommissionVo.syFeeRate  }}%
             </span>
-          </div>
-          <div v-if="orderInfo.orderCommissionVo&&orderInfo.orderCommissionVo.syFeePremium">
+          </div></el-col>
+            <el-col :span="5" v-if="orderInfo.orderCommissionVo&&orderInfo.orderCommissionVo.syFeePremium"><div>
             手续费金额:
             <span>
               ¥{{orderInfo.orderCommissionVo.syFeePremium }}
             </span>
-          </div>
-        <div v-show="orderInfo.systartdate">
+          </div></el-col>
+            <el-col :span="6"><div v-show="orderInfo.systartdate">
           商业险起保日期:
           <span>{{ orderInfo.systartdate }}</span>
-        </div>
+        </div></el-col>
+            <el-col :span="3"></el-col>
+          </el-row>
       </div>
         <div class="headers headers_Custom" >
-          <div v-if="orderInfo.jypremium">
+          <el-row style="width: 100%">
+            <el-col :span="1"></el-col>
+            <el-col :span="5" v-if="orderInfo.jypremium"><div>
             驾意险:
             <span>¥{{ orderInfo.jypremium }}</span>
-          </div>
+          </div></el-col>
+            <el-col :span="18"></el-col>
+          </el-row>
         </div>
       </div>
       <div class="Enclosure" v-if="orderInfo.extendInfo">
@@ -2718,13 +2729,17 @@ export default {
   font-weight: bold;
   color: #333;
 }
+
 /* 内容待定 */
-.headers_Custom >div{
-  padding: 5px 40px;
-  font-size: 16px;
-}
-.headers_Custom >div>span {
-  color: rgb(226, 118, 10);
+.headers_Custom {
+  div {
+    padding: 2px 0px;
+    font-size: 14px;
+
+  & > span {
+      color: rgb(226, 118, 10);
+    }
+  }
 }
 
   .back {

+ 56 - 25
src/views/Task/Complete.vue

@@ -228,7 +228,7 @@
         </el-row>
         <el-row class="task_bottom u-f u-f-je">
           <el-button size="mini" type="primary" style="background:#F99070;border: 1px solid #F99070;"
-                     @click="getHistoryList(order.orderno)">报价轨迹</el-button>
+            @click="commonCheck(order.orderno,'3')">报价轨迹</el-button>
 
         </el-row>
       </el-card>
@@ -256,63 +256,74 @@
             ¥{{orderInfo.orderCommissionVo&&orderInfo.orderCommissionVo.totalFeePremium?orderInfo.orderCommissionVo.totalFeePremium:0 }}</span>
         </div>
         <div class="headers headers_Custom">
-          <div v-show="orderInfo.jqpremium">
+          <el-row style="width: 100%">
+            <el-col :span="1"></el-col>
+            <el-col :span="5"><div v-show="orderInfo.jqpremium">
             交强险金额:
             <span>
               ¥{{
                 orderInfo.jqpremium }}
             </span>
-          </div>
-          <div v-if="orderInfo.orderCommissionVo&&orderInfo.orderCommissionVo.jqFeeRate">
+          </div></el-col>
+            <el-col :span="4" v-if="orderInfo.orderCommissionVo&&orderInfo.orderCommissionVo.jqFeeRate"><div>
             手续费比例:
             <span>
               {{
                 orderInfo.orderCommissionVo.jqFeeRate }}%
             </span>
-          </div>
-          <div v-if="orderInfo.orderCommissionVo&&orderInfo.orderCommissionVo.jqFeePremium">
+          </div></el-col>
+            <el-col :span="5" v-if="orderInfo.orderCommissionVo&&orderInfo.orderCommissionVo.jqFeePremium"><div>
             手续费金额:
             <span>
               ¥{{orderInfo.orderCommissionVo.jqFeePremium }}
             </span>
-          </div>
-          <div v-show="orderInfo.taxamount">
-            车船税:
-            <span>¥{{ orderInfo.taxamount }}</span>
-          </div>
-          <div v-show="orderInfo.jqstartdate">
+          </div></el-col>
+            <el-col :span="6"><div v-show="orderInfo.jqstartdate">
             交强险起保日期:
             <span>{{ orderInfo.jqstartdate }}</span>
-          </div>
+          </div></el-col>
+            <el-col :span="3"><div v-show="orderInfo.taxamount">
+            车船税:
+            <span>¥{{ orderInfo.taxamount }}</span>
+          </div></el-col>
+          </el-row>
         </div>
         <div class="headers headers_Custom" >
-          <div v-show="orderInfo.sypremium">
+          <el-row style="width: 100%">
+            <el-col :span="1"></el-col>
+            <el-col :span="5"><div v-show="orderInfo.sypremium">
             商业险金额:
             <span>¥{{ orderInfo.sypremium }}</span>
-          </div>
-          <div v-if="orderInfo.orderCommissionVo&&orderInfo.orderCommissionVo.syFeeRate">
+          </div></el-col>
+            <el-col :span="4" v-if="orderInfo.orderCommissionVo&&orderInfo.orderCommissionVo.syFeeRate"><div>
             手续费比例:
             <span>
               {{
                 orderInfo.orderCommissionVo.syFeeRate  }}%
             </span>
-          </div>
-          <div v-if="orderInfo.orderCommissionVo&&orderInfo.orderCommissionVo.syFeePremium">
+          </div></el-col>
+            <el-col :span="5" v-if="orderInfo.orderCommissionVo&&orderInfo.orderCommissionVo.syFeePremium"><div>
             手续费金额:
             <span>
               ¥{{orderInfo.orderCommissionVo.syFeePremium }}
             </span>
-          </div>
-          <div v-show="orderInfo.systartdate">
+          </div></el-col>
+            <el-col :span="6"><div v-show="orderInfo.systartdate">
             商业险起保日期:
             <span>{{ orderInfo.systartdate }}</span>
-          </div>
+          </div></el-col>
+            <el-col :span="3"></el-col>
+          </el-row>
         </div>
         <div class="headers headers_Custom" >
-          <div v-if="orderInfo.jypremium">
+          <el-row style="width: 100%">
+            <el-col :span="1"></el-col>
+            <el-col :span="5" v-if="orderInfo.jypremium"><div>
             驾意险:
             <span>¥{{ orderInfo.jypremium }}</span>
-          </div>
+          </div></el-col>
+            <el-col :span="18"></el-col>
+          </el-row>
         </div>
       </div>
       <div class="Enclosure" v-if="orderInfo.extendInfo">
@@ -1114,6 +1125,26 @@
 
     },
     methods: {
+    //公共操作进行校验,是否可以操作
+    commonCheck(orderno,type) {
+      this.$api.task.checkOrdersEdit({ orderNo: orderno }).then((res) => {
+        if (res.code == 200) {
+          //如果校验通过,则按分支去走自己的方法
+          if(type=='1'){//编辑
+              this.CloseEdit(orderno);
+          }else if(type=='2'){//任务转发
+              this.openTaskForward(orderno);
+          }else if(type=='3'){//报价轨迹
+              this.getHistoryList(orderno);
+          }
+        }else{
+          this.$message({
+            message: res.msg,
+            type: 'error'
+          });
+        }
+      })
+    },
       //预览文件
       viewfile(index) {
         let name = index.fileurl.lastIndexOf("\/")
@@ -2684,8 +2715,8 @@
   /* 内容待定 */
   .headers_Custom {
     div {
-      padding: 5px 30px;
-      font-size: 16px;
+      padding: 2px 0px;
+      font-size: 14px;
 
       &>span {
         color: rgb(226, 118, 10);

+ 60 - 29
src/views/Task/OfflinePay.vue

@@ -227,12 +227,12 @@
           </div>
         </el-row>
         <el-row class="task_bottom u-f u-f-je">
-          <el-button size="mini" type="primary" style="background:#419fff;border: 1px solid #419fff;"
-                     @click="CloseEdit(order.orderno)">编辑</el-button>
-          <el-button size="mini" type="primary" style="background:#DE504C;border: 1px solid #DE504C;"
-            @click="openTaskForward(order.orderno)">任务转发</el-button>
+          <el-button v-if="order.orderstatus!='3'" size="mini" type="primary" style="background:#419fff;border: 1px solid #419fff;"
+                     @click="commonCheck(order.orderno,'1')">编辑</el-button>
+          <el-button v-if="order.orderstatus!='3'" size="mini" type="primary" style="background:#DE504C;border: 1px solid #DE504C;"
+            @click="commonCheck(order.orderno,'2')">任务转发</el-button>
           <el-button size="mini" type="primary" style="background:#F99070;border: 1px solid #F99070;"
-            @click="getHistoryList(order.orderno)">报价轨迹</el-button>
+            @click="commonCheck(order.orderno,'3')">报价轨迹</el-button>
 
         </el-row>
       </el-card>
@@ -260,63 +260,74 @@
             ¥{{orderInfo.orderCommissionVo&&orderInfo.orderCommissionVo.totalFeePremium?orderInfo.orderCommissionVo.totalFeePremium:0 }}</span>
         </div>
         <div class="headers headers_Custom">
-          <div v-show="orderInfo.jqpremium">
+          <el-row style="width: 100%">
+            <el-col :span="1"></el-col>
+            <el-col :span="5"><div v-show="orderInfo.jqpremium">
             交强险金额:
             <span>
               ¥{{
                 orderInfo.jqpremium }}
             </span>
-          </div>
-          <div v-if="orderInfo.orderCommissionVo&&orderInfo.orderCommissionVo.jqFeeRate">
+          </div></el-col>
+            <el-col :span="4" v-if="orderInfo.orderCommissionVo&&orderInfo.orderCommissionVo.jqFeeRate"><div>
             手续费比例:
             <span>
               {{
                 orderInfo.orderCommissionVo.jqFeeRate }}%
             </span>
-          </div>
-          <div v-if="orderInfo.orderCommissionVo&&orderInfo.orderCommissionVo.jqFeePremium">
+          </div></el-col>
+            <el-col :span="5" v-if="orderInfo.orderCommissionVo&&orderInfo.orderCommissionVo.jqFeePremium"><div>
             手续费金额:
             <span>
               ¥{{orderInfo.orderCommissionVo.jqFeePremium }}
             </span>
-          </div>
-          <div v-show="orderInfo.taxamount">
-            车船税:
-            <span>¥{{ orderInfo.taxamount }}</span>
-          </div>
-          <div v-show="orderInfo.jqstartdate">
+          </div></el-col>
+            <el-col :span="6"><div v-show="orderInfo.jqstartdate">
             交强险起保日期:
             <span>{{ orderInfo.jqstartdate }}</span>
-          </div>
+          </div></el-col>
+            <el-col :span="3"><div v-show="orderInfo.taxamount">
+            车船税:
+            <span>¥{{ orderInfo.taxamount }}</span>
+          </div></el-col>
+          </el-row>
         </div>
         <div class="headers headers_Custom" >
-          <div v-show="orderInfo.sypremium">
+          <el-row style="width: 100%">
+            <el-col :span="1"></el-col>
+            <el-col :span="5"><div v-show="orderInfo.sypremium">
             商业险金额:
             <span>¥{{ orderInfo.sypremium }}</span>
-          </div>
-          <div v-if="orderInfo.orderCommissionVo&&orderInfo.orderCommissionVo.syFeeRate">
+          </div></el-col>
+            <el-col :span="4" v-if="orderInfo.orderCommissionVo&&orderInfo.orderCommissionVo.syFeeRate"><div>
             手续费比例:
             <span>
               {{
                 orderInfo.orderCommissionVo.syFeeRate  }}%
             </span>
-          </div>
-          <div v-if="orderInfo.orderCommissionVo&&orderInfo.orderCommissionVo.syFeePremium">
+          </div></el-col>
+            <el-col :span="5" v-if="orderInfo.orderCommissionVo&&orderInfo.orderCommissionVo.syFeePremium"><div>
             手续费金额:
             <span>
               ¥{{orderInfo.orderCommissionVo.syFeePremium }}
             </span>
-          </div>
-          <div v-show="orderInfo.systartdate">
+          </div></el-col>
+            <el-col :span="6"><div v-show="orderInfo.systartdate">
             商业险起保日期:
             <span>{{ orderInfo.systartdate }}</span>
-          </div>
+          </div></el-col>
+            <el-col :span="3"></el-col>
+          </el-row>
         </div>
         <div class="headers headers_Custom" >
-          <div v-if="orderInfo.jypremium">
+          <el-row style="width: 100%">
+            <el-col :span="1"></el-col>
+            <el-col :span="5" v-if="orderInfo.jypremium"><div>
             驾意险:
             <span>¥{{ orderInfo.jypremium }}</span>
-          </div>
+          </div></el-col>
+            <el-col :span="18"></el-col>
+          </el-row>
         </div>
       </div>
       <div class="Enclosure" v-if="orderInfo.extendInfo">
@@ -1119,6 +1130,26 @@ export default {
 
   },
   methods: {
+    //公共操作进行校验,是否可以操作
+    commonCheck(orderno,type) {
+      this.$api.task.checkOrdersEdit({ orderNo: orderno }).then((res) => {
+        if (res.code == 200) {
+          //如果校验通过,则按分支去走自己的方法
+          if(type=='1'){//编辑
+              this.CloseEdit(orderno);
+          }else if(type=='2'){//任务转发
+              this.openTaskForward(orderno);
+          }else if(type=='3'){//报价轨迹
+              this.getHistoryList(orderno);
+          }
+        }else{
+          this.$message({
+            message: res.msg,
+            type: 'error'
+          });
+        }
+      })
+    },
 //预览文件
       viewfile(index) {
         let name = index.fileurl.lastIndexOf("\/")
@@ -2692,8 +2723,8 @@ export default {
 /* 内容待定 */
 .headers_Custom {
   div {
-      padding: 5px 30px;
-    font-size: 16px;
+      padding: 2px 0px;
+      font-size: 14px;
 
     &>span {
       color: rgb(226, 118, 10);

+ 60 - 29
src/views/Task/Quote.vue

@@ -227,12 +227,12 @@
           </div>
         </el-row>
         <el-row class="task_bottom u-f u-f-je">
-          <el-button size="mini" type="primary" style="background:#419fff;border: 1px solid #419fff;"
-                     @click="CloseEdit(order.orderno)">编辑</el-button>
-          <el-button size="mini" type="primary" style="background:#DE504C;border: 1px solid #DE504C;"
-                     @click="openTaskForward(order.orderno)">任务转发</el-button>
+          <el-button v-if="order.orderstatus!='3'" size="mini" type="primary" style="background:#419fff;border: 1px solid #419fff;"
+                     @click="commonCheck(order.orderno,'1')">编辑</el-button>
+          <el-button v-if="order.orderstatus!='3'" size="mini" type="primary" style="background:#DE504C;border: 1px solid #DE504C;"
+            @click="commonCheck(order.orderno,'2')">任务转发</el-button>
           <el-button size="mini" type="primary" style="background:#F99070;border: 1px solid #F99070;"
-                     @click="getHistoryList(order.orderno)">报价轨迹</el-button>
+            @click="commonCheck(order.orderno,'3')">报价轨迹</el-button>
 
         </el-row>
       </el-card>
@@ -260,63 +260,74 @@
             ¥{{orderInfo.orderCommissionVo&&orderInfo.orderCommissionVo.totalFeePremium?orderInfo.orderCommissionVo.totalFeePremium:0 }}</span>
         </div>
         <div class="headers headers_Custom">
-          <div v-show="orderInfo.jqpremium">
+          <el-row style="width: 100%">
+            <el-col :span="1"></el-col>
+            <el-col :span="5"><div v-show="orderInfo.jqpremium">
             交强险金额:
             <span>
               ¥{{
                 orderInfo.jqpremium }}
             </span>
-          </div>
-          <div v-if="orderInfo.orderCommissionVo&&orderInfo.orderCommissionVo.jqFeeRate">
+          </div></el-col>
+            <el-col :span="4" v-if="orderInfo.orderCommissionVo&&orderInfo.orderCommissionVo.jqFeeRate"><div>
             手续费比例:
             <span>
               {{
                 orderInfo.orderCommissionVo.jqFeeRate }}%
             </span>
-          </div>
-          <div v-if="orderInfo.orderCommissionVo&&orderInfo.orderCommissionVo.jqFeePremium">
+          </div></el-col>
+            <el-col :span="5" v-if="orderInfo.orderCommissionVo&&orderInfo.orderCommissionVo.jqFeePremium"><div>
             手续费金额:
             <span>
               ¥{{orderInfo.orderCommissionVo.jqFeePremium }}
             </span>
-          </div>
-          <div v-show="orderInfo.taxamount">
-            车船税:
-            <span>¥{{ orderInfo.taxamount }}</span>
-          </div>
-          <div v-show="orderInfo.jqstartdate">
+          </div></el-col>
+            <el-col :span="6"><div v-show="orderInfo.jqstartdate">
             交强险起保日期:
             <span>{{ orderInfo.jqstartdate }}</span>
-          </div>
+          </div></el-col>
+            <el-col :span="3"><div v-show="orderInfo.taxamount">
+            车船税:
+            <span>¥{{ orderInfo.taxamount }}</span>
+          </div></el-col>
+          </el-row>
         </div>
         <div class="headers headers_Custom" >
-          <div v-show="orderInfo.sypremium">
+          <el-row style="width: 100%">
+            <el-col :span="1"></el-col>
+            <el-col :span="5"><div v-show="orderInfo.sypremium">
             商业险金额:
             <span>¥{{ orderInfo.sypremium }}</span>
-          </div>
-          <div v-if="orderInfo.orderCommissionVo&&orderInfo.orderCommissionVo.syFeeRate">
+          </div></el-col>
+            <el-col :span="4" v-if="orderInfo.orderCommissionVo&&orderInfo.orderCommissionVo.syFeeRate"><div>
             手续费比例:
             <span>
               {{
                 orderInfo.orderCommissionVo.syFeeRate  }}%
             </span>
-          </div>
-          <div v-if="orderInfo.orderCommissionVo&&orderInfo.orderCommissionVo.syFeePremium">
+          </div></el-col>
+            <el-col :span="5" v-if="orderInfo.orderCommissionVo&&orderInfo.orderCommissionVo.syFeePremium"><div>
             手续费金额:
             <span>
               ¥{{orderInfo.orderCommissionVo.syFeePremium }}
             </span>
-          </div>
-          <div v-show="orderInfo.systartdate">
+          </div></el-col>
+            <el-col :span="6"><div v-show="orderInfo.systartdate">
             商业险起保日期:
             <span>{{ orderInfo.systartdate }}</span>
-          </div>
+          </div></el-col>
+            <el-col :span="3"></el-col>
+          </el-row>
         </div>
         <div class="headers headers_Custom" >
-          <div v-if="orderInfo.jypremium">
+          <el-row style="width: 100%">
+            <el-col :span="1"></el-col>
+            <el-col :span="5" v-if="orderInfo.jypremium"><div>
             驾意险:
             <span>¥{{ orderInfo.jypremium }}</span>
-          </div>
+          </div></el-col>
+            <el-col :span="18"></el-col>
+          </el-row>
         </div>
       </div>
       <div class="Enclosure" v-if="orderInfo.extendInfo">
@@ -1118,6 +1129,26 @@
 
     },
     methods: {
+    //公共操作进行校验,是否可以操作
+    commonCheck(orderno,type) {
+      this.$api.task.checkOrdersEdit({ orderNo: orderno }).then((res) => {
+        if (res.code == 200) {
+          //如果校验通过,则按分支去走自己的方法
+          if(type=='1'){//编辑
+              this.CloseEdit(orderno);
+          }else if(type=='2'){//任务转发
+              this.openTaskForward(orderno);
+          }else if(type=='3'){//报价轨迹
+              this.getHistoryList(orderno);
+          }
+        }else{
+          this.$message({
+            message: res.msg,
+            type: 'error'
+          });
+        }
+      })
+    },
 //预览文件
       viewfile(index) {
         let name = index.fileurl.lastIndexOf("\/")
@@ -2680,8 +2711,8 @@
   /* 内容待定 */
   .headers_Custom {
     div {
-      padding: 5px 30px;
-      font-size: 16px;
+      padding: 2px 0px;
+      font-size: 14px;
 
       &>span {
         color: rgb(226, 118, 10);

+ 59 - 27
src/views/Task/TaskpoolAll.vue

@@ -255,11 +255,11 @@
         </el-row>
         <el-row class="task_bottom u-f u-f-je">
           <el-button v-if="order.orderstatus!='3'" size="mini" type="primary" style="background:#419fff;border: 1px solid #419fff;"
-                     @click="CloseEdit(order.orderno)">编辑</el-button>
+                     @click="commonCheck(order.orderno,'1')">编辑</el-button>
           <el-button v-if="order.orderstatus!='3'" size="mini" type="primary" style="background:#DE504C;border: 1px solid #DE504C;"
-            @click="openTaskForward(order.orderno)">任务转发</el-button>
+            @click="commonCheck(order.orderno,'2')">任务转发</el-button>
           <el-button size="mini" type="primary" style="background:#F99070;border: 1px solid #F99070;"
-            @click="getHistoryList(order.orderno)">报价轨迹</el-button>
+            @click="commonCheck(order.orderno,'3')">报价轨迹</el-button>
 
         </el-row>
       </el-card>
@@ -288,63 +288,74 @@
             ¥{{orderInfo.orderCommissionVo&&orderInfo.orderCommissionVo.totalFeePremium?orderInfo.orderCommissionVo.totalFeePremium:0 }}</span>
         </div>
         <div class="headers headers_Custom">
-          <div v-show="orderInfo.jqpremium">
+          <el-row style="width: 100%">
+            <el-col :span="1"></el-col>
+            <el-col :span="5"><div v-show="orderInfo.jqpremium">
             交强险金额:
             <span>
               ¥{{
                 orderInfo.jqpremium }}
             </span>
-          </div>
-          <div v-if="orderInfo.orderCommissionVo&&orderInfo.orderCommissionVo.jqFeeRate">
+          </div></el-col>
+            <el-col :span="4" v-if="orderInfo.orderCommissionVo&&orderInfo.orderCommissionVo.jqFeeRate"><div>
             手续费比例:
             <span>
               {{
                 orderInfo.orderCommissionVo.jqFeeRate }}%
             </span>
-          </div>
-          <div v-if="orderInfo.orderCommissionVo&&orderInfo.orderCommissionVo.jqFeePremium">
+          </div></el-col>
+            <el-col :span="5" v-if="orderInfo.orderCommissionVo&&orderInfo.orderCommissionVo.jqFeePremium"><div>
             手续费金额:
             <span>
               ¥{{orderInfo.orderCommissionVo.jqFeePremium }}
             </span>
-          </div>
-          <div v-show="orderInfo.taxamount">
-            车船税:
-            <span>¥{{ orderInfo.taxamount }}</span>
-          </div>
-          <div v-show="orderInfo.jqstartdate">
+          </div></el-col>
+            <el-col :span="6"><div v-show="orderInfo.jqstartdate">
             交强险起保日期:
             <span>{{ orderInfo.jqstartdate }}</span>
-          </div>
+          </div></el-col>
+            <el-col :span="3"><div v-show="orderInfo.taxamount">
+            车船税:
+            <span>¥{{ orderInfo.taxamount }}</span>
+          </div></el-col>
+          </el-row>
         </div>
         <div class="headers headers_Custom" >
-          <div v-show="orderInfo.sypremium">
+          <el-row style="width: 100%">
+            <el-col :span="1"></el-col>
+            <el-col :span="5"><div v-show="orderInfo.sypremium">
             商业险金额:
             <span>¥{{ orderInfo.sypremium }}</span>
-          </div>
-          <div v-if="orderInfo.orderCommissionVo&&orderInfo.orderCommissionVo.syFeeRate">
+          </div></el-col>
+            <el-col :span="4" v-if="orderInfo.orderCommissionVo&&orderInfo.orderCommissionVo.syFeeRate"><div>
             手续费比例:
             <span>
               {{
                 orderInfo.orderCommissionVo.syFeeRate  }}%
             </span>
-          </div>
-          <div v-if="orderInfo.orderCommissionVo&&orderInfo.orderCommissionVo.syFeePremium">
+          </div></el-col>
+            <el-col :span="5" v-if="orderInfo.orderCommissionVo&&orderInfo.orderCommissionVo.syFeePremium"><div>
             手续费金额:
             <span>
               ¥{{orderInfo.orderCommissionVo.syFeePremium }}
             </span>
-          </div>
-          <div v-show="orderInfo.systartdate">
+          </div></el-col>
+            <el-col :span="6"><div v-show="orderInfo.systartdate">
             商业险起保日期:
             <span>{{ orderInfo.systartdate }}</span>
-          </div>
+          </div></el-col>
+            <el-col :span="3"></el-col>
+          </el-row>
         </div>
         <div class="headers headers_Custom" >
-          <div v-if="orderInfo.jypremium">
+          <el-row style="width: 100%">
+            <el-col :span="1"></el-col>
+            <el-col :span="5" v-if="orderInfo.jypremium"><div>
             驾意险:
             <span>¥{{ orderInfo.jypremium }}</span>
-          </div>
+          </div></el-col>
+            <el-col :span="18"></el-col>
+          </el-row>
         </div>
       </div>
       <div class="Enclosure" v-if="orderInfo.extendInfo">
@@ -1159,6 +1170,27 @@ export default {
     this.getAllStaff()//获取任务转发列表
   },
   methods: {
+    //公共操作进行校验,是否可以操作
+    commonCheck(orderno,type) {
+      this.$api.task.checkOrdersEdit({ orderNo: orderno }).then((res) => {
+        if (res.code == 200) {
+          //如果校验通过,则按分支去走自己的方法
+          if(type=='1'){//编辑
+              this.CloseEdit(orderno);
+          }else if(type=='2'){//任务转发
+              this.openTaskForward(orderno);
+          }else if(type=='3'){//报价轨迹
+              this.getHistoryList(orderno);
+          }
+        }else{
+          this.$message({
+            message: res.msg,
+            type: 'error'
+          });
+        }
+      })
+    },
+
 //预览文件
       viewfile(index) {
         let name = index.fileurl.lastIndexOf("\/")
@@ -2724,8 +2756,8 @@ export default {
   /* 内容待定 */
   .headers_Custom {
     div {
-      padding: 5px 30px;
-      font-size: 16px;
+      padding: 2px 0px;
+      font-size: 14px;
       &>span {
         color: rgb(226, 118, 10);
       }

+ 60 - 29
src/views/Task/Underwrite.vue

@@ -227,12 +227,12 @@
 			</div>
 		  </el-row>
 		  <el-row class="task_bottom u-f u-f-je">
-        <el-button size="mini" type="primary" style="background:#419fff;border: 1px solid #419fff;"
-                   @click="CloseEdit(order.orderno)">编辑</el-button>
-			<el-button size="mini" type="primary" style="background:#DE504C;border: 1px solid #DE504C;"
-			  @click="openTaskForward(order.orderno)">任务转发</el-button>
+          <el-button v-if="order.orderstatus!='3'" size="mini" type="primary" style="background:#419fff;border: 1px solid #419fff;"
+                     @click="commonCheck(order.orderno,'1')">编辑</el-button>
+          <el-button v-if="order.orderstatus!='3'" size="mini" type="primary" style="background:#DE504C;border: 1px solid #DE504C;"
+            @click="commonCheck(order.orderno,'2')">任务转发</el-button>
 			<el-button size="mini" type="primary" style="background:#F99070;border: 1px solid #F99070;"
-			  @click="getHistoryList(order.orderno)">报价轨迹</el-button>
+            @click="commonCheck(order.orderno,'3')">报价轨迹</el-button>
   
 		  </el-row>
 		</el-card>
@@ -261,63 +261,74 @@
             ¥{{orderInfo.orderCommissionVo&&orderInfo.orderCommissionVo.totalFeePremium?orderInfo.orderCommissionVo.totalFeePremium:0 }}</span>
         </div>
         <div class="headers headers_Custom">
-          <div v-show="orderInfo.jqpremium">
+          <el-row style="width: 100%">
+            <el-col :span="1"></el-col>
+            <el-col :span="5"><div v-show="orderInfo.jqpremium">
             交强险金额:
             <span>
               ¥{{
                 orderInfo.jqpremium }}
             </span>
-          </div>
-          <div v-if="orderInfo.orderCommissionVo&&orderInfo.orderCommissionVo.jqFeeRate">
+          </div></el-col>
+            <el-col :span="4" v-if="orderInfo.orderCommissionVo&&orderInfo.orderCommissionVo.jqFeeRate"><div>
             手续费比例:
             <span>
               {{
                 orderInfo.orderCommissionVo.jqFeeRate }}%
             </span>
-          </div>
-          <div v-if="orderInfo.orderCommissionVo&&orderInfo.orderCommissionVo.jqFeePremium">
+          </div></el-col>
+            <el-col :span="5" v-if="orderInfo.orderCommissionVo&&orderInfo.orderCommissionVo.jqFeePremium"><div>
             手续费金额:
             <span>
               ¥{{orderInfo.orderCommissionVo.jqFeePremium }}
             </span>
-          </div>
-          <div v-show="orderInfo.taxamount">
-            车船税:
-            <span>¥{{ orderInfo.taxamount }}</span>
-          </div>
-          <div v-show="orderInfo.jqstartdate">
+          </div></el-col>
+            <el-col :span="6"><div v-show="orderInfo.jqstartdate">
             交强险起保日期:
             <span>{{ orderInfo.jqstartdate }}</span>
-          </div>
+          </div></el-col>
+            <el-col :span="3"><div v-show="orderInfo.taxamount">
+            车船税:
+            <span>¥{{ orderInfo.taxamount }}</span>
+          </div></el-col>
+          </el-row>
         </div>
         <div class="headers headers_Custom" >
-          <div v-show="orderInfo.sypremium">
+          <el-row style="width: 100%">
+            <el-col :span="1"></el-col>
+            <el-col :span="5"><div v-show="orderInfo.sypremium">
             商业险金额:
             <span>¥{{ orderInfo.sypremium }}</span>
-          </div>
-          <div v-if="orderInfo.orderCommissionVo&&orderInfo.orderCommissionVo.syFeeRate">
+          </div></el-col>
+            <el-col :span="4" v-if="orderInfo.orderCommissionVo&&orderInfo.orderCommissionVo.syFeeRate"><div>
             手续费比例:
             <span>
               {{
                 orderInfo.orderCommissionVo.syFeeRate  }}%
             </span>
-          </div>
-          <div v-if="orderInfo.orderCommissionVo&&orderInfo.orderCommissionVo.syFeePremium">
+          </div></el-col>
+            <el-col :span="5" v-if="orderInfo.orderCommissionVo&&orderInfo.orderCommissionVo.syFeePremium"><div>
             手续费金额:
             <span>
               ¥{{orderInfo.orderCommissionVo.syFeePremium }}
             </span>
-          </div>
-          <div v-show="orderInfo.systartdate">
+          </div></el-col>
+            <el-col :span="6"><div v-show="orderInfo.systartdate">
             商业险起保日期:
             <span>{{ orderInfo.systartdate }}</span>
-          </div>
+          </div></el-col>
+            <el-col :span="3"></el-col>
+          </el-row>
         </div>
         <div class="headers headers_Custom" >
-          <div v-if="orderInfo.jypremium">
+          <el-row style="width: 100%">
+            <el-col :span="1"></el-col>
+            <el-col :span="5" v-if="orderInfo.jypremium"><div>
             驾意险:
             <span>¥{{ orderInfo.jypremium }}</span>
-          </div>
+          </div></el-col>
+            <el-col :span="18"></el-col>
+          </el-row>
         </div>
       </div>
       <div class="Enclosure" v-if="orderInfo.extendInfo">
@@ -1137,6 +1148,26 @@
   
 	},
 	methods: {
+    //公共操作进行校验,是否可以操作
+    commonCheck(orderno,type) {
+      this.$api.task.checkOrdersEdit({ orderNo: orderno }).then((res) => {
+        if (res.code == 200) {
+          //如果校验通过,则按分支去走自己的方法
+          if(type=='1'){//编辑
+              this.CloseEdit(orderno);
+          }else if(type=='2'){//任务转发
+              this.openTaskForward(orderno);
+          }else if(type=='3'){//报价轨迹
+              this.getHistoryList(orderno);
+          }
+        }else{
+          this.$message({
+            message: res.msg,
+            type: 'error'
+          });
+        }
+      })
+    },
 //预览文件
       viewfile(index) {
         let name = index.fileurl.lastIndexOf("\/")
@@ -2699,8 +2730,8 @@
   /* 内容待定 */
   .headers_Custom {
     div {
-      padding: 5px 30px;
-      font-size: 16px;
+      padding: 2px 0px;
+      font-size: 14px;
       &>span {
         color: rgb(226, 118, 10);
       }

+ 60 - 29
src/views/Task/UnderwriteBack.vue

@@ -227,12 +227,12 @@
           </div>
         </el-row>
         <el-row class="task_bottom u-f u-f-je">
-          <el-button size="mini" type="primary" style="background:#419fff;border: 1px solid #419fff;"
-                     @click="CloseEdit(order.orderno)">编辑</el-button>
-          <el-button size="mini" type="primary" style="background:#DE504C;border: 1px solid #DE504C;"
-                     @click="openTaskForward(order.orderno)">任务转发</el-button>
+          <el-button v-if="order.orderstatus!='3'" size="mini" type="primary" style="background:#419fff;border: 1px solid #419fff;"
+                     @click="commonCheck(order.orderno,'1')">编辑</el-button>
+          <el-button v-if="order.orderstatus!='3'" size="mini" type="primary" style="background:#DE504C;border: 1px solid #DE504C;"
+            @click="commonCheck(order.orderno,'2')">任务转发</el-button>
           <el-button size="mini" type="primary" style="background:#F99070;border: 1px solid #F99070;"
-                     @click="getHistoryList(order.orderno)">报价轨迹</el-button>
+            @click="commonCheck(order.orderno,'3')">报价轨迹</el-button>
 
         </el-row>
       </el-card>
@@ -261,63 +261,74 @@
             ¥{{orderInfo.orderCommissionVo&&orderInfo.orderCommissionVo.totalFeePremium?orderInfo.orderCommissionVo.totalFeePremium:0 }}</span>
         </div>
         <div class="headers headers_Custom">
-          <div v-show="orderInfo.jqpremium">
+          <el-row style="width: 100%">
+            <el-col :span="1"></el-col>
+            <el-col :span="5"><div v-show="orderInfo.jqpremium">
             交强险金额:
             <span>
               ¥{{
                 orderInfo.jqpremium }}
             </span>
-          </div>
-          <div v-if="orderInfo.orderCommissionVo&&orderInfo.orderCommissionVo.jqFeeRate">
+          </div></el-col>
+            <el-col :span="4" v-if="orderInfo.orderCommissionVo&&orderInfo.orderCommissionVo.jqFeeRate"><div>
             手续费比例:
             <span>
               {{
                 orderInfo.orderCommissionVo.jqFeeRate }}%
             </span>
-          </div>
-          <div v-if="orderInfo.orderCommissionVo&&orderInfo.orderCommissionVo.jqFeePremium">
+          </div></el-col>
+            <el-col :span="5" v-if="orderInfo.orderCommissionVo&&orderInfo.orderCommissionVo.jqFeePremium"><div>
             手续费金额:
             <span>
               ¥{{orderInfo.orderCommissionVo.jqFeePremium }}
             </span>
-          </div>
-          <div v-show="orderInfo.taxamount">
-            车船税:
-            <span>¥{{ orderInfo.taxamount }}</span>
-          </div>
-          <div v-show="orderInfo.jqstartdate">
+          </div></el-col>
+            <el-col :span="6"><div v-show="orderInfo.jqstartdate">
             交强险起保日期:
             <span>{{ orderInfo.jqstartdate }}</span>
-          </div>
+          </div></el-col>
+            <el-col :span="3"><div v-show="orderInfo.taxamount">
+            车船税:
+            <span>¥{{ orderInfo.taxamount }}</span>
+          </div></el-col>
+          </el-row>
         </div>
         <div class="headers headers_Custom" >
-          <div v-show="orderInfo.sypremium">
+          <el-row style="width: 100%">
+            <el-col :span="1"></el-col>
+            <el-col :span="5"><div v-show="orderInfo.sypremium">
             商业险金额:
             <span>¥{{ orderInfo.sypremium }}</span>
-          </div>
-          <div v-if="orderInfo.orderCommissionVo&&orderInfo.orderCommissionVo.syFeeRate">
+          </div></el-col>
+            <el-col :span="4" v-if="orderInfo.orderCommissionVo&&orderInfo.orderCommissionVo.syFeeRate"><div>
             手续费比例:
             <span>
               {{
                 orderInfo.orderCommissionVo.syFeeRate  }}%
             </span>
-          </div>
-          <div v-if="orderInfo.orderCommissionVo&&orderInfo.orderCommissionVo.syFeePremium">
+          </div></el-col>
+            <el-col :span="5" v-if="orderInfo.orderCommissionVo&&orderInfo.orderCommissionVo.syFeePremium"><div>
             手续费金额:
             <span>
               ¥{{orderInfo.orderCommissionVo.syFeePremium }}
             </span>
-          </div>
-          <div v-show="orderInfo.systartdate">
+          </div></el-col>
+            <el-col :span="6"><div v-show="orderInfo.systartdate">
             商业险起保日期:
             <span>{{ orderInfo.systartdate }}</span>
-          </div>
+          </div></el-col>
+            <el-col :span="3"></el-col>
+          </el-row>
         </div>
         <div class="headers headers_Custom" >
-          <div v-if="orderInfo.jypremium">
+          <el-row style="width: 100%">
+            <el-col :span="1"></el-col>
+            <el-col :span="5" v-if="orderInfo.jypremium"><div>
             驾意险:
             <span>¥{{ orderInfo.jypremium }}</span>
-          </div>
+          </div></el-col>
+            <el-col :span="18"></el-col>
+          </el-row>
         </div>
       </div>
       <div class="Enclosure" v-if="orderInfo.extendInfo">
@@ -1137,6 +1148,26 @@
 
     },
     methods: {
+    //公共操作进行校验,是否可以操作
+    commonCheck(orderno,type) {
+      this.$api.task.checkOrdersEdit({ orderNo: orderno }).then((res) => {
+        if (res.code == 200) {
+          //如果校验通过,则按分支去走自己的方法
+          if(type=='1'){//编辑
+              this.CloseEdit(orderno);
+          }else if(type=='2'){//任务转发
+              this.openTaskForward(orderno);
+          }else if(type=='3'){//报价轨迹
+              this.getHistoryList(orderno);
+          }
+        }else{
+          this.$message({
+            message: res.msg,
+            type: 'error'
+          });
+        }
+      })
+    },
 //预览文件
       viewfile(index) {
         let name = index.fileurl.lastIndexOf("\/")
@@ -2699,8 +2730,8 @@
   /* 内容待定 */
   .headers_Custom {
     div {
-      padding: 5px 30px;
-      font-size: 16px;
+      padding: 2px 0px;
+      font-size: 14px;
       &>span {
         color: rgb(226, 118, 10);
       }