From 1014ba019f0d868fc3dd6ef0a0f37029d0084dd5 Mon Sep 17 00:00:00 2001
From: "ZHOUZ\\Noble'lift" <1014987728@qq.com>
Date: Wed, 30 Aug 2023 17:34:39 +0800
Subject: [PATCH] =?UTF-8?q?rev:=E8=B4=A8=E9=87=8F=E6=8A=A5=E5=91=8A?=
 =?UTF-8?q?=E5=9B=9E=E4=BC=A0=E6=8C=89=E9=92=AE=E6=96=B0=E5=A2=9E=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lms/nladmin-ui/src/views/wms/st/outbill/index.vue | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/lms/nladmin-ui/src/views/wms/st/outbill/index.vue b/lms/nladmin-ui/src/views/wms/st/outbill/index.vue
index 07dcd76a1..d85b33d7e 100644
--- a/lms/nladmin-ui/src/views/wms/st/outbill/index.vue
+++ b/lms/nladmin-ui/src/views/wms/st/outbill/index.vue
@@ -38,7 +38,7 @@
             </el-select>
           </el-form-item>
 
-    <!--      <el-form-item label="生成方式">
+          <!--      <el-form-item label="生成方式">
             <el-select
               v-model="query.create_mode"
               clearable
@@ -194,13 +194,13 @@
         </el-button>
         <el-button
           slot="right"
+          v-permission="permission.confirm"
           class="filter-item"
           :loading="loadingConfirm"
           type="warning"
           :disabled="confirm_flag"
           icon="el-icon-check"
           size="mini"
-          v-permission="permission.confirm"
           @click="confirm"
         >
           强制确认
@@ -287,7 +287,7 @@
         <el-table-column show-overflow-tooltip label="客户" align="center" prop="cust_simple_name" width="100" />
         <el-table-column show-overflow-tooltip label="客户编码" align="center" prop="cust_code" width="100" />
         <el-table-column show-overflow-tooltip label="交货单号" align="center" prop="vbeln" width="100" />
-        <el-table-column show-overflow-tooltip label="是否回传" align="center" prop="is_upload" width="80" :formatter="formatIsUpload"/>
+        <el-table-column show-overflow-tooltip label="是否回传" align="center" prop="is_upload" width="80" :formatter="formatIsUpload" />
         <el-table-column show-overflow-tooltip :formatter="create_modeFormat" prop="create_mode" label="生成方式" width="100" />
         <el-table-column show-overflow-tooltip label="备注" align="center" prop="remark" width="100" />
         <el-table-column show-overflow-tooltip label="制单人" align="center" prop="input_optname" />
@@ -306,7 +306,7 @@
     <ViewDialog :dialog-show.sync="viewShow" :rowmst="mstrow" @AddChanged="querytable" />
     <DivDialog :dialog-show.sync="divShow" :open-array="openParam" :stor-id="storId" :rowmst="mstrow" @DivChanged="querytable" />
     <TaskDialog :dialog-show.sync="taskShow" :open-array="openParam" :rowmst="mstrow" @TaskChanged="querytable" />
-    <MoneyDialog :dialog-show.sync="openMoneyDialog" :open-param-money="openParamMoney"/>
+    <MoneyDialog :dialog-show.sync="openMoneyDialog" :open-param-money="openParamMoney" />
   </div>
 </template>
 
@@ -480,6 +480,7 @@ export default {
       })
     },
     outReturn() {
+      alert('点击确认按钮后，单据进行回传！')
       checkoutbill.outReturn({ 'iostorinv_id': this.currentRow.iostorinv_id }).then(res => {
         this.crud.notify('回传成功！', CRUD.NOTIFICATION_TYPE.SUCCESS)
         this.querytable()
@@ -525,7 +526,7 @@ export default {
       })
     },
     downdtl() {
-   /*   const data = {
+      /*   const data = {
         'bill_code': this.crud.query.bill_code,
         'buss_type': this.crud.query.buss_type,
         'io_type': this.crud.query.io_type,