立即发货 修改

src/views/businessOrder/index.vue

@@ -83,9 +83,9 @@
               <el-select v-model="form.expressCompany" size="30px">
               <el-select v-model="form.expressCompany" size="30px">
                 <el-option
                 <el-option
                   v-for="item in options"
                   v-for="item in options"
-                  :key="item.value"
+                  :key="item.valueStr"
                   :label="item.label"
                   :label="item.label"
-                  :value="item.value">
+                  :value="item.valueStr">
                 </el-option>
                 </el-option>
               </el-select>
               </el-select>
             </el-form-item>
             </el-form-item>
@@ -149,7 +149,7 @@
         },
         },
         computed: {
         computed: {
           initDropDownBox(){
           initDropDownBox(){
-            this.$axios.get("/general/mallExpressCompany/dropDownBox/courierCompany").then(e =>{
+            this.$axios.get("/admin/mallOrder/dropDownBox/courierCompany").then(e =>{
               this.options=Object.values(e.data)
               this.options=Object.values(e.data)
             })
             })
           },
           },
@@ -221,34 +221,25 @@
           },
           },
           // 立即发货-对话框
           // 立即发货-对话框
           shipsImmediately(row){
           shipsImmediately(row){
-            // this.form.orderNo=row.orderNo
             this.form.id=row.id
             this.form.id=row.id
-            this.$axios.get("/admin/merchantMallOrder/isNeedMailed",{
-              params:{orderNo:row.orderNo},
-            }).then(response => {
-              console.log(JSON.stringify(response.data.data))
-              if(response.data.data===true){
-                console.log("需邮寄，填写信息")
-                this.dialogVisibleShipsImmediately = true
-              } else {
-                console.log("无需邮寄，二次确认即可")
-                this.$confirm('是否确认发货？', '提示', {
-                  confirmButtonText: '确定',
-                  cancelButtonText: '取消',
-                  type: 'warning'
-                }).then(data => {
-                  shipsImmediatelyApi(this.form).then(r => {
-                    this.$message.success('发货成功')
-                    this.getList(this.page)
-                  }).catch(e => {
-                    console.log('错误', e.message)
-                  })
+            this.form.waybillNo = '';
+            this.form.expressCompany = '';
+            if(row['isLogistics']==1){
+              this.dialogVisibleShipsImmediately = true
+            }else{
+              this.$confirm('是否确认发货？', '提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning'
+              }).then(data => {
+                shipsImmediatelyApi(this.form).then(r => {
+                  this.$message.success('发货成功')
+                  this.getList(this.page)
+                }).catch(e => {
+                  console.log('错误', e.message)
                 })
                 })
-              }
-            }, error => {
-              console.log('错误', error.message)
-            })
-
+              })
+            }
           },
           },
           // 确认发货-提交按钮
           // 确认发货-提交按钮
           confirmDelivery(){
           confirmDelivery(){