Prechádzať zdrojové kódy

Merge remote-tracking branch 'origin/master'

yu.jie 4 rokov pred
rodič
commit
1ab784807c

+ 9 - 0
src/assets/styles/mixin.less

@@ -613,6 +613,15 @@
         .ant-upload-list-item-name {
             color: @m-white0;
         }
+        &:hover {
+            background: transparent;
+            .anticon-loading,.anticon-paper-clip {
+                color: @m-blue0;
+            }
+            .ant-upload-list-item-name {
+                color: @m-blue0;
+            }
+        }
     }
     .look {
         color: @m-blue0;

+ 1 - 1
src/views/information/spot-contract/components/modify/index.vue

@@ -466,7 +466,6 @@ export default defineComponent({
             // // formState.ContractAttachment = props.selectedRow.attachment
             // formState.ContractAttachment = new Uint8Array()
             if (visible.value) {
-                contractChange(formState.ContractType);
                 queryCustomList();
                 getDeliveryGoods();
                 goodsList.value = getGoodsList();
@@ -476,6 +475,7 @@ export default defineComponent({
                 });
                 queryTradeManager();
                 mergeTwoObj(formState, props.selectedRow);
+                isSell.value = formState.ContractType === 1 ? false : true;
                 const { deliverygoodsid, qty, price, wrstandardid, spotgoodsbrandid } = props.selectedRow;
                 if (deliverygoodsid) {
                     deliveryGoodsChange(deliverygoodsid);