提货

src/views/order/spot_warran/components/spot_warrant_spot_details/components/listing/index.vue

@@ -2,7 +2,6 @@
   <!-- 现货仓单 现货明细 挂牌 -->
   <Drawer :title="'挂牌'"
           :placement="'bottom'"
-          v-if="visible"
           :visible="visible"
           @cancel="cancel">
     <div class="listed">

src/views/order/spot_warran/components/spot_warrant_spot_details/components/pick_up/index.vue

@@ -1,71 +1,86 @@
 <template>
-    <!-- 现货仓单 现货明细 提货 true -->
-    <Drawer :title="'提货'" :placement="'bottom'" :visible="visible">
-        <!-- 挂牌 -->
-        <div class="listed">
-            <div class="condition">
-                <a-button class="conditionBtn">螺纹钢</a-button>
-                <a-button class="conditionBtn">12mm-江铜</a-button>
-                <a-button class="conditionBtn">华南仓库</a-button>
-            </div>
-            <div class="formBar">
-                <a-form class="inlineForm dialogForm" :form="form" @submit="handleSearch">
-                    <a-row :gutter="24">
-                        <a-col :span="12">
-                            <a-form-item label="提货数量">
-                                <a-input class="commonInput" suffix="吨" style="width: 140px" />
-                            </a-form-item>
-                        </a-col>
-                        <a-col :span="12">
-                            <a-form-item label="提货人">
-                                <a-input class="commonInput" style="width: 140px" />
-                            </a-form-item>
-                        </a-col>
-                    </a-row>
-                    <a-row :gutter="24">
-                        <a-col :span="12" class="mt-20">
-                            <a-form-item>
-                                <a-progress class="formProgress" :percent="30" />
-                                <div class="unit">
-                                    <span>0</span>
-                                    <span>300吨</span>
-                                </div>
-                            </a-form-item>
-                        </a-col>
-                        <a-col :span="12">&nbsp;</a-col>
-                    </a-row>
-                    <a-row :gutter="24">
-                        <a-col :span="12">
-                            <a-form-item label="联系方式">
-                                <a-input class="commonInput" style="width: 140px" />
-                            </a-form-item>
-                        </a-col>
-                        <a-col :span="12">
-                            <a-form-item label="预约日期">
-                                <a-date-picker class="commonDatePicker" style="width: 140px" />
-                            </a-form-item>
-                        </a-col>
-                    </a-row>
-                    <a-row :gutter="24">
-                        <a-col :span="12">
-                            <a-form-item label="备注">
-                                <a-input class="commonInput" style="width: 140px" />
-                            </a-form-item>
-                        </a-col>
-                        <a-col :span="12">&nbsp;</a-col>
-                    </a-row>
-                    <a-row :gutter="24" type="flex" justify="center">
-                        <a-col :span="24">
-                            <a-form-item class="tc">
-                                <a-button class="listedBtn">提货</a-button>
-                                <a-button class="ml10 cancelBtn">取消</a-button>
-                            </a-form-item>
-                        </a-col>
-                    </a-row>
-                </a-form>
-            </div>
-        </div>
-    </Drawer>
+  <!-- 现货仓单 现货明细 提货 true -->
+  <Drawer :title="'提货'"
+          :placement="'bottom'"
+          :visible="visible"
+          @cancel="cancel">
+    <!-- 挂牌 -->
+    <div class="listed">
+      <div class="condition">
+        <a-button class="conditionBtn">{{selectedRow.deliverygoodsname}}</a-button>
+        <a-button class="conditionBtn">{{selectedRow.wrtypename}}</a-button>
+        <a-button class="conditionBtn">{{selectedRow.warehousename}}</a-button>
+      </div>
+      <div class="formBar">
+        <a-form class="inlineForm dialogForm"
+                :form="form"
+                @submit="handleSearch">
+          <a-row :gutter="24">
+            <a-col :span="12">
+              <a-form-item label="提货数量">
+                <a-input class="commonInput"
+                         suffix="吨"
+                         style="width: 140px" />
+              </a-form-item>
+            </a-col>
+            <a-col :span="12">
+              <a-form-item label="提货人">
+                <a-input class="commonInput"
+                         style="width: 140px" />
+              </a-form-item>
+            </a-col>
+          </a-row>
+          <a-row :gutter="24">
+            <a-col :span="12"
+                   class="mt-20">
+              <a-form-item>
+                <a-progress class="formProgress"
+                            :percent="30" />
+                <div class="unit">
+                  <span>0</span>
+                  <span>300吨</span>
+                </div>
+              </a-form-item>
+            </a-col>
+            <a-col :span="12">&nbsp;</a-col>
+          </a-row>
+          <a-row :gutter="24">
+            <a-col :span="12">
+              <a-form-item label="联系方式">
+                <a-input class="commonInput"
+                         style="width: 140px" />
+              </a-form-item>
+            </a-col>
+            <a-col :span="12">
+              <a-form-item label="预约日期">
+                <a-date-picker class="commonDatePicker"
+                               style="width: 140px" />
+              </a-form-item>
+            </a-col>
+          </a-row>
+          <a-row :gutter="24">
+            <a-col :span="12">
+              <a-form-item label="备注">
+                <a-input class="commonInput"
+                         style="width: 140px" />
+              </a-form-item>
+            </a-col>
+            <a-col :span="12">&nbsp;</a-col>
+          </a-row>
+          <a-row :gutter="24"
+                 type="flex"
+                 justify="center">
+            <a-col :span="24">
+              <a-form-item class="tc">
+                <a-button class="listedBtn">提货</a-button>
+                <a-button class="ml10 cancelBtn">取消</a-button>
+              </a-form-item>
+            </a-col>
+          </a-row>
+        </a-form>
+      </div>
+    </div>
+  </Drawer>
 </template>
 
 <script lang="ts">
@@ -79,26 +94,29 @@ import { hdWROrder } from '@/services/proto/warehousetrade';
 import { v4 as uuidv4 } from 'uuid';
 import moment from 'moment';
 import { ModalEnum } from '@/common/constants/modalNameEnum';
+import { _closeModal } from '@/common/setup/modal/modal';
 
 export default defineComponent({
     name: ModalEnum.spot_warrant_spot_details_pick_up,
     components: { Drawer },
+    emits: ['cancel'],
     props: {
         selectedRow: {
             type: Object as PropType<WrPosition>,
             default: {},
         },
     },
-    setup(props) {
+    setup(props, context) {
         const data = props.selectedRow;
         const loading = ref<boolean>(false);
-
+        const { visible, cancel } = _closeModal(context);
         // console.log(param);
         // requestResultLoadingAndInfo(hdWROrder, param, loading, ['挂牌成功', '挂牌失败:']).then(() => {
         //     // cancel(true);
         // });
         return {
-            visible: true,
+            visible,
+            cancel,
         };
     },
 });