Merge branch 'master' of http://47.101.159.18:3000/Muchinfo/MTP2.0_WEB

src/assets/styles/mixin.less

@@ -256,6 +256,12 @@
         background-color: transparent;
         color:  @m-grey17;
     }
+    .operBtn.ant-btn {
+        margin-top: 0;
+        margin-bottom: 0;
+        height: 26px;
+        line-height: 26px;
+    }
 }
 // 展开行操作按钮显示问题
 .topOrderTable {

src/views/platinum/platinum_pick_query/list/tab/compoments/upload_logistics/index.vue

@@ -1,19 +1,47 @@
 <template>
   <!-- 提货查询 上传物流-->
-  <a-modal class="add-custom custom-detail"
+  <a-modal class="add-custom upload_logistics"
            title="上传物流"
            centered
            v-model:visible="visible"
            :maskClosable="false"
            @cancel="cancel"
-           width="890px">
+           width="600px">
     <template #footer>
       <a-button key="submit"
                 type="primary"
                 :loading="loading.loading"
-                @click="cancel">关闭</a-button>
+                @click="cancel">完成</a-button>
     </template>
-    <CommomDetail :selectedRow="selectedRow" />
+    <a-form class="inlineForm mt10"
+            ref="formRef"
+            >
+      <a-row :gutter="24">
+        <a-col :span="24">
+          <a-form-item label="物流公司"
+                       name="">
+            <a-select class="inlineFormSelect"
+                      style="width: 200px"
+                      placeholder="请选择物流公司">
+              <a-select-option value="顺丰快递">
+                顺丰快递
+              </a-select-option>
+            </a-select>
+          </a-form-item>
+        </a-col>
+      </a-row>
+      <a-row :gutter="24">
+        <a-col :span="24">
+          <a-form-item label="物流单号"
+                       name="">
+            <a-input class="dialogInput"
+                     style="width: 200px"
+                     placeholder="请输入物流单号" />
+          </a-form-item>
+        </a-col>
+      </a-row>
+    </a-form>
+    <!-- <CommomDetail :selectedRow="selectedRow" /> -->
   </a-modal>
 </template>
 <script lang="ts">
@@ -42,3 +70,12 @@ export default defineComponent({
     },
 });
 </script>
+
+<style lang="less">
+.upload_logistics {
+    .ant-form.inlineForm .ant-row.ant-form-item .ant-form-item-label {
+        width: 200px;
+        text-align: right;
+    }
+}
+</style>