更新

src/views/order/index.vue

@@ -112,15 +112,12 @@
               @click="billOfLading(row)"
               >提货单</el-link
             >
-            <el-popconfirm :title="row.orderStatus == 'SUBMITED' ? '是否确认订单锁定？' : '是否确认下单？'" icon-color="red" @confirm="Locked(row)">
-              <el-link
-                v-show="row.orderStatus == 'SUBMITED' || row.orderStatus == 'ORDER_LOCKED'"
-                slot="reference"
-                type="primary"
-                :underline="false"
-                >{{ row.orderStatus == 'SUBMITED' ? '订单锁定' : '下单确认' }}</el-link
-              >
+            <el-popconfirm v-if="row.orderStatus == 'SUBMITED'" title="是否确认订单锁定？" icon-color="red" @confirm="Locked(row)">
+              <el-link slot="reference" type="primary" :underline="false">订单锁定</el-link>
             </el-popconfirm>
+
+            <el-link v-else type="primary" :underline="false" @click="confirmSubmit(row)">下单确认</el-link>
+
             <el-popconfirm
               :title="row.orderStatus == 'SUBMITED' || row.orderStatus == 'ORDER_LOCKED' ? '是否确认取消订单？' : '是否确认退款？'"
               icon-color="red"
@@ -160,19 +157,28 @@
     </el-drawer>
     <!-- 提货单 -->
     <billOfLading :billData="billData" :controlWindows="controlWindows" @closeWindow="handleCurrentChange" />
+    <confirmSubmit :controlWindows="controlWindows" @closeWindow="() => {}" />
   </div>
 </template>
 
 <script>
 import serve from 'api/refineryInfo.js'
-import commonServe from 'api/common.js'
+import commonServe from '@/api/common.js'
 import productApi from 'api/product.js'
-import order from 'api/order.js'
+import order from '@/api/order.js'
+
 import generalDetails from 'components/generalDetails/index.vue'
 import autocomplete from 'components/autocomplete/index.vue'
 import billOfLading from './components/billOfLading.vue'
+import confirmSubmit from './components/confirmSubmit.vue'
 
 export default {
+  components: {
+    generalDetails,
+    autocomplete,
+    billOfLading,
+    confirmSubmit
+  },
   filters: {
     toNumberFixed(val) {
       if (val) {
@@ -188,7 +194,8 @@ export default {
         add: false,
         addInfo: {},
         detail: false,
-        bill: false
+        bill: false,
+        confirmSubmit: false
       },
       configAutocomplete: {
         serveTarget: commonServe.getRefineryCompanyList,
@@ -250,12 +257,7 @@ export default {
       ]
     }
   },
-  components: {
-    generalDetails,
-    billOfLading,
-    autocomplete,
-    productApi
-  },
+
   mounted() {
     this.$nextTick(() => {
       this.heightHandle()
@@ -305,6 +307,7 @@ export default {
       }
       return { label: val ? val : '暂无数据', type: 'info' }
     },
+
     // currentPage change
     handleCurrentChange(page) {
       this.parameter.currentPage = page
@@ -369,12 +372,13 @@ export default {
     },
     //订单锁定
     Locked(row) {
+      order.orderLock({ id: row.id }).then(res => {
+        if (res.code == 20000) {
+          this.getByPage()
+        }
+      })
+      return
       if (row.orderStatus == 'SUBMITED') {
-        order.orderLock({ id: row.id }).then(res => {
-          if (res.code == 20000) {
-            this.getByPage()
-          }
-        })
       } else {
         order.orderSuccess({ id: row.id }).then(res => {
           if (res.code == 20000) {
@@ -383,6 +387,11 @@ export default {
         })
       }
     },
+    // 下单确认
+    confirmSubmit(row) {
+      this.controlWindows.addInfo = row
+      this.controlWindows.confirmSubmit = true
+    },
     //启用禁用
     switchTrigger(val, row) {
       row.enableMark = row.enableMark