2/27 界面 优化1.3

src/views/collect/IoCreateOrder.vue

@@ -1746,10 +1746,15 @@ export default {
       }
       this.saveLoading = true
       if (this.orderFormData.billNo != null) {
+        this.$confirm('是否确定取消此次上货?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
           deleteByOrderId(tQuery).then((response) => {
             this.saveLoading = false
             if (response.code === 20000) {
-            this.$message.success('放弃成功')
+              this.$message.success('取消上货成功')
               this.successCloseData()
               this.result = ''
               this.$refs.inputRef.focus()
@@ -1759,6 +1764,10 @@ export default {
             this.loading = false
             this.saveLoading = false
           })
+        }).catch(() => {
+
+        })
+
       } else {
         this.successCloseData()
         this.result = ''

src/views/collect/device/DevicesDealOrderPre.vue

@@ -585,7 +585,6 @@ export default {
     selectPrescribeDialog,
     prescribeCodePanel,
     PanelOrderManuTagCode, prescribeOriginPanel,
-    PannelOrderBiz,
     DialogCreateOrderSelect,
     PanelOrderAllDetail
   },

src/views/collect/device/DevicesIoCreateOrder.vue

@@ -47,7 +47,7 @@
             <el-button size="mini" type="primary" @click.native="delOrder()" :loading="submitLoading"
                        style="margin-right: 8px;border-radius: 5%;" v-show="isLinkDisabled"
                        :disabled="orderFormData.billNo == null && curQueueName == ''  "
-            >放弃
+            >取消上货
             </el-button>
             <!--<el-button size="mini" type="primary" @click.native="draftOrder()" :loading="submitLoading"-->
             <!--           v-show="isLinkDisabled" style="margin-right: 8px;border-radius: 5%;"-->
@@ -1746,10 +1746,15 @@ export default {
       }
       this.saveLoading = true
       if (this.orderFormData.billNo != null) {
+        this.$confirm('是否确定取消此次上货?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
           deleteByOrderId(tQuery).then((response) => {
             this.saveLoading = false
             if (response.code === 20000) {
-            this.$message.success('放弃成功')
+              this.$message.success('取消上货成功')
               this.successCloseData()
               this.result = ''
               this.$refs.inputRef.focus()
@@ -1759,12 +1764,18 @@ export default {
             this.loading = false
             this.saveLoading = false
           })
+        }).catch(() => {
+
+        })
+
       } else {
         this.successCloseData()
         this.result = ''
         this.$refs.inputRef.focus()
       }
-
+      this.sharedData = 'over'
+      //上货页面完成 发送 over 给tabs 页面
+      EventBus.$emit('update-data', { message: this.sharedData });
     },
     // 刷新表单
     resetForm() {