更新拆单

src/views/ecw/order/singleApply.vue

@@ -144,9 +144,23 @@
         <el-button  v-if="orderData.status!=16" type="primary" @click="submitForm">提交申请</el-button>
         <el-button v-if="orderData.status!=16" plain type="primary" @click="$router.back()">取消</el-button>
         <el-button v-if="orderData.status==16"  type="primary" disabled>审核中</el-button>
-        <el-button v-if="orderData.status==16" plain type="primary" @click="cancelMerge">取消审核</el-button>
+        <el-button v-if="orderData.status==16" plain type="primary" @click="dialogVisible = true">取消审核</el-button>
         <el-button v-if="orderData.status==16" plain type="primary" @click="$router.back()">返回</el-button>
     </div>
+    <el-dialog
+      title="提示"
+      :visible.sync="dialogVisible"
+      width="30%">
+       <span class="cancel_notice">合单申请正在审核中，你确定取消合单申请吗？</span>
+       <div class="cancel_content">
+         <span>取消原因：</span>
+         <el-input v-model="reason" placeholder="请输入取消原因"></el-input>
+       </div>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="dialogVisible = false">取 消</el-button>
+        <el-button type="primary" @click="cancelMerge">确 定</el-button>
+      </span>
+    </el-dialog>
   </div>
 </template> 
 
@@ -180,7 +194,9 @@ export default {
       },
       selectedUsers:[],
       total:0,
-      orderNos:''
+      orderNos:'',
+      reason:'',
+      dialogVisible:false
     };
   },
   created() {
@@ -227,14 +243,17 @@ export default {
     },
     cancelMerge(){
       let that = this
-      if(!that.orderNos){
-        that.$message.error("请选择取消合单的订单");
+      // if(!that.orderNos){
+      //   that.$message.error("请选择取消合单的订单");
+      //   return
+      // }
+      if(!that.reason){
+        that.$message.error("请输入取消原因");
         return
       }
       var  params = {
         id:that.orderData.orderId,
-        copyUserId:that.selectedUsers,
-        orderNos:that.orderNos,
+        reason:that.reason
       }
       cancelMerge(params).then(res=>{
           that.$message.success("取消成功");
@@ -273,4 +292,16 @@ export default {
   .footer_btn{
     padding-bottom: 60px;
   }
+  .cancel_notice{
+    font-size: 16px;
+    font-weight: 600;
+  }
+  .cancel_content{
+    display: flex;
+    align-items: center;
+    padding-top: 20px;
+  }
+  .cancel_content span{
+    width: 100px;
+  }
 </style>

src/views/ecw/order/splitApply.vue

@@ -183,7 +183,7 @@
         <el-button  v-if="orderData.status!=19" type="primary" @click="submitForm">提交申请</el-button>
         <el-button v-if="orderData.status!=19" plain type="primary" @click="$router.back()">取消</el-button>
         <el-button v-if="orderData.status==19" type="primary" disabled>审核中</el-button>
-        <el-button v-if="orderData.status==19" plain type="primary" @click="cancelSplit">取消审核</el-button>
+        <el-button v-if="orderData.status==19" plain type="primary" @click="dialogVisible = true">取消审核</el-button>
         <el-button v-if="orderData.status==19" plain type="primary" @click="$router.back()">返回</el-button>
     </div>
      <!-- 对话框(添加 / 修改) -->
@@ -245,6 +245,21 @@
                <el-button @click="shopCancel">取 消</el-button>
              </div>
            </el-dialog>
+           <el-dialog
+             title="提示"
+             :visible.sync="dialogVisible"
+             width="30%">
+             <span class="cancel_notice">拆单申请正在审核中，你确定取消拆单申请吗？</span>
+             <div class="cancel_content">
+               <span>取消原因：</span>
+               <el-input v-model="reason" placeholder="请输入取消原因"></el-input>
+             </div>
+
+             <span slot="footer" class="dialog-footer">
+               <el-button @click="dialogVisible = false">取 消</el-button>
+               <el-button type="primary" @click="cancelSplit">确 定</el-button>
+             </span>
+           </el-dialog>
   </div>
 </template>
 
@@ -265,6 +280,8 @@ export default {
   data() {
     return {
       checked:false,
+      reason:'',
+      dialogVisible:false,
       orderData:{},
       splitData:[],
       splitIndex:0,
@@ -292,7 +309,7 @@ export default {
         prodTitleEn: [{ required: true, message: "请选择英文品名", trigger: "change" }],
       },
       queryParams:{
-        orderId:176,
+        orderId:7,
         lang:0
       },
       query:{
@@ -503,13 +520,14 @@ export default {
     },
     cancelSplit(){
       let that = this
-      that.$confirm('是否取消审核吗?').then(function () {
-        cancelApply({orderId:that.queryParams.orderId}).then(res=>{
+      if(!that.reason){
+        that.$message.error("请输入取消原因");
+        return
+      }
+        cancelApply({orderId:that.queryParams.orderId,reason:that.reason}).then(res=>{
           that.$message.success("取消成功");
           that.$router.back()
         })
-      })
-
     },
     shopCancel(){
       this.shopOpen = false
@@ -554,4 +572,16 @@ export default {
   .footer_btn{
     padding-bottom: 60px;
   }
+  .cancel_notice{
+    font-size: 16px;
+    font-weight: 600;
+  }
+  .cancel_content{
+    display: flex;
+    align-items: center;
+    padding-top: 20px;
+  }
+  .cancel_content span{
+    width: 100px;
+  }
 </style>