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

src/assets/styles/mixin.less

@@ -2680,4 +2680,9 @@ input:-internal-autofill-selected {
     .right {
         text-align: right;
     }
+}
+
+// 朋友搜索框
+.ant-input-search.searchFriendInput {
+
 }

src/common/components/drawer/index.vue

@@ -90,6 +90,13 @@ export default defineComponent({
     z-index: 10;
     .ant-drawer-content-wrapper {
         width: 486px !important;
+        .ant-drawer-body {
+            .collapseCont {
+                .highContent {
+                    max-width: 486px;
+                }
+            }
+        }
     }
 }
 .delistingBottom {

src/views/order/commodity_contract/components/commodity_contract_summary/components/commodity_contract_summary_settlement/index.vue

@@ -1,97 +1,108 @@
 <template>
-  <!-- 交收-->
-  <Drawer :title="'交收'"
-          :placement="'right'"
-          class="bottom486"
-          :visible="visible"
-          @cancel="cancel">
-    <div class="listed c_c_s_s">
-      <a-form class="inlineForm dialogForm"
-              ref="formRef">
-        <div class="formBar">
-          <div class="formtop">
-            <div class="firstTitle">
-              <span>合约数量 {{selectedRow.enableqty}}</span>
-              <span>可交收数量 {{getCanSettlementNum()}} {{selectedRow.goodunit}}</span>
-            </div>
-            <div class="secondLine">
-              <div class="left">持有人/商品/仓库</div>
-              <div class="middle">升贴水/数量</div>
-              <div class="right">选择数量</div>
-            </div>
-            <a-checkbox-group class="commonCheckboxGroup"
-                              v-model:value="checked"
-                              @change="checkGroupChange">
-              <div class="lineBar"
-                   v-for="(item, index) in tableList"
-                   :key="index + '11'">
-                <div class="line1">
-                  <div class>
-                    <a-checkbox @change="checkboxChange(item)"
-                                :value="item.ladingbillid"></a-checkbox>
-                  </div>
-                  <div class="name">{{item.username}}</div>
+    <!-- 交收-->
+    <Drawer
+        :title="'交收'"
+        :placement="'right'"
+        class="bottom486"
+        :visible="visible"
+        @cancel="cancel"
+    >
+        <div class="listed c_c_s_s">
+            <a-form class="inlineForm dialogForm" ref="formRef">
+                <div class="formBar">
+                    <div class="formtop">
+                        <div class="firstTitle">
+                            <span>合约数量 {{selectedRow.enableqty}}</span>
+                            <span>可交收数量 {{getCanSettlementNum()}} {{selectedRow.goodunit}}</span>
+                        </div>
+                        <div class="secondLine">
+                            <div class="left">持有人/商品/仓库</div>
+                            <div class="middle">升贴水/数量</div>
+                            <div class="right">选择数量</div>
+                        </div>
+                        <a-checkbox-group
+                            class="commonCheckboxGroup"
+                            v-model:value="checked"
+                            @change="checkGroupChange"
+                        >
+                            <div
+                                class="lineBar"
+                                v-for="(item, index) in tableList"
+                                :key="index + '11'"
+                            >
+                                <div class="line1">
+                                    <div class>
+                                        <a-checkbox
+                                            @change="checkboxChange(item)"
+                                            :value="item.ladingbillid"
+                                        ></a-checkbox>
+                                    </div>
+                                    <div class="name">{{item.username}}</div>
+                                </div>
+                                <div class="line2">
+                                    <div class="left">
+                                        <div>{{item.wrtypename}}</div>
+                                        <div>{{item.warehousename}}</div>
+                                    </div>
+                                    <div class="middle">
+                                        <div>{{item.pricemove}}</div>
+                                        <div>{{item.avalidqty}}{{item.enumdicname}}</div>
+                                    </div>
+                                    <div class="right">
+                                        <template
+                                            class="inputNumberBlock"
+                                            :class="isChecked(item.ladingbillid) ? '' : 'disabled'"
+                                        >
+                                            <a-input-number
+                                                class="dialogInput dialogInput34"
+                                                v-model:value="item.num"
+                                                style="width: 130px !important; height: 34px;"
+                                                :disabled="!isChecked(item.ladingbillid)"
+                                                :max="item.avalidqty"
+                                                :min="0"
+                                            ></a-input-number>
+                                            <MinusOutlined @click="decrease(item)" />
+                                            <PlusOutlined @click="increase(item)" />
+                                        </template>
+                                    </div>
+                                </div>
+                            </div>
+                        </a-checkbox-group>
+                    </div>
                 </div>
-                <div class="line2">
-                  <div class="left">
-                    <div>{{item.wrtypename}}</div>
-                    <div>{{item.warehousename}}</div>
-                  </div>
-                  <div class="middle">
-                    <div>{{item.pricemove}}</div>
-                    <div>{{item.avalidqty}}{{item.enumdicname}}</div>
-                  </div>
-                  <div class="right">
-                    <template class="inputNumberBlock"
-                              :class="isChecked(item.ladingbillid) ? '' : 'disabled'">
-                      <a-input-number class="dialogInput dialogInput34"
-                                      v-model:value="item.num"
-                                      style="width: 130px !important; height: 34px;"
-                                      :disabled="!isChecked(item.ladingbillid)"
-                                      :max="item.avalidqty"
-                                      :min="0"></a-input-number>
-                      <MinusOutlined @click="decrease(item)" />
-                      <PlusOutlined @click="increase(item)" />
-                    </template>
-                  </div>
-                </div>
-              </div>
-            </a-checkbox-group>
-          </div>
-        </div>
-        <div class="fixedBtns">
-          <div class="formbottom">
-            <div class="line1">
-              <div>
-                <span>已点选数量</span>
-                <span class="white">{{selctedNum()}} {{selectedRow.goodunit}}</span>
-                <span>，需合约数量</span>
-                <span class="white">{{getNeedContractNum()}}</span>
-              </div>
-              <div class="yellow">升贴水1100</div>
-            </div>
-            <div class="line2"
-                 v-if="isBaseSpread()">
-              <div>点价合约</div>
-              <div class="right">
-                <div>{{selectedRow.goodscode}}</div>
-                <div>{{getDeliveryGoodsPrice()}}</div>
-              </div>
-            </div>
-            <div v-if="isBaseSpread()"
-                 class="line3">预估贷款：{{getEstimatedPayment()}}</div>
-          </div>
+                <div class="fixedBtns">
+                    <div class="formbottom">
+                        <div class="line1">
+                            <div>
+                                <span>已点选数量</span>
+                                <span class="white">{{selctedNum()}} {{selectedRow.goodunit}}</span>
+                                <span>，需合约数量</span>
+                                <span class="white">{{getNeedContractNum()}}</span>
+                            </div>
+                            <div class="yellow">升贴水1100</div>
+                        </div>
+                        <div class="line2" v-if="isBaseSpread()">
+                            <div>点价合约</div>
+                            <div class="right">
+                                <div>{{selectedRow.goodscode}}</div>
+                                <div>{{getDeliveryGoodsPrice()}}</div>
+                            </div>
+                        </div>
+                        <div v-if="isBaseSpread()" class="line3">预估贷款：{{getEstimatedPayment()}}</div>
+                    </div>
 
-          <a-form-item class="btnCenter mt10">
-            <a-button class="listedBtn"
-                      :loading="loading"
-                      :disabled="loading"
-                      @click="submit">提交</a-button>
-          </a-form-item>
+                    <a-form-item class="btnCenter mt10">
+                        <a-button
+                            class="listedBtn"
+                            :loading="loading"
+                            :disabled="loading"
+                            @click="submit"
+                        >提交</a-button>
+                    </a-form-item>
+                </div>
+            </a-form>
         </div>
-      </a-form>
-    </div>
-  </Drawer>
+    </Drawer>
 </template>
 
 <script lang="ts">

src/views/setting/friends/index.vue

@@ -1,26 +1,27 @@
 <template>
-  <!-- 我的好友 -->
-  <a-spin :spinning="loading">
-    <div class="my-friend">
-      <a-input-search placeholder="输入好友代码进行搜索"
-                      enter-button
-                      @search="handleSearch" />
-      <div v-for="(item, index) in searchFriend"
-           :key="index + '11'">
-        <a-row type="flex">
-          <a-col :span="12">
-            <span>{{item.frienduserid}} {{ item.friendname }}</span>
-          </a-col>
-          <a-col :span="6"
-                 @click="operate(item)">
-            <span v-if="item.isfriend">删除</span>
-            <span v-else>添加</span>
-          </a-col>
-        </a-row>
-        <a-divider />
-      </div>
-    </div>
-  </a-spin>
+    <!-- 我的好友 -->
+    <a-spin :spinning="loading">
+        <div class="my-friend">
+            <a-input-search
+                placeholder="输入好友代码进行搜索"
+                enter-button
+                class="searchFriendInput"
+                @search="handleSearch"
+            />
+            <div v-for="(item, index) in searchFriend" :key="index + '11'">
+                <a-row type="flex">
+                    <a-col :span="12">
+                        <span>{{item.frienduserid}} {{ item.friendname }}</span>
+                    </a-col>
+                    <a-col :span="6" @click="operate(item)">
+                        <span v-if="item.isfriend">删除</span>
+                        <span v-else>添加</span>
+                    </a-col>
+                </a-row>
+                <a-divider />
+            </div>
+        </div>
+    </a-spin>
 </template>
 
 <script lang="ts">