shish 2 tahun lalu
induk
melakukan
88121c8cc9
2 mengubah file dengan 3 tambahan dan 3 penghapusan
  1. 1 1
      ghs/package.json
  2. 2 2
      ghs/src/views/order/list.vue

+ 1 - 1
ghs/package.json

@@ -15,7 +15,7 @@
     "core-js": "^3.4.3",
     "dayjs": "^1.8.18",
     "echarts": "^4.5.0",
-    "element-ui": "2.15.1",
+    "element-ui": "^2.13.0",
     "js-beautify": "^1.10.2",
     "mockjs": "^1.1.0",
     "nprogress": "^0.2.0",

+ 2 - 2
ghs/src/views/order/list.vue

@@ -28,7 +28,7 @@
 
       <template #table-column-clearSign="{scope}">
         <div v-if="scope.row.clearSign == 0">
-          <el-popconfirm title="确认已结算?" @confirm="updateClearSign(scope.row)">
+          <el-popconfirm title="确认已结算?" @confirm="updateClearSign(scope.row)" @onConfirm="updateClearSign(scope.row)">
             <i class="el-icon-edit" style="color:#409eff;font-size:17px;cursor:pointer;" slot="reference"></i>
           </el-popconfirm>
         </div>
@@ -104,7 +104,7 @@
         <el-button size="small" v-else>全下载</el-button>
 
 <template v-if="scope.row.status!=5 && scope.row.status==2">
-        <el-popconfirm title="确认已发货?" @confirm="confirmSend(scope.row)" style="margin-left:10px;">
+        <el-popconfirm title="确认已发货?" @confirm="confirmSend(scope.row)" @onConfirm="confirmSend(scope.row)" style="margin-left:10px;">
           <el-button size="small" type="primary" slot="reference">发货</el-button>
         </el-popconfirm>
 </template>