update

src/common/components/permanceTemp/choosePermancePlanTmp.vue

@@ -1,103 +1,108 @@
 <template>
-    <!--选择履约模板-->
-    <Drawer :title="'选择履约模板'" :placement="'right'" :visible="visible" @cancel="cancel" :class="[position === 'top' ? 'top486' : 'delistingBottom']">
-        <span class="add-permance" @click="open">
-            <svg class="icon svg-icon" aria-hidden="true">
-                <use xlink:href="#icon-xinjianzengjiaxinzeng-20" />
-            </svg>
-        </span>
-        <a-spin :spinning="loading">
-            <div class="moduleContent">
-                <div class="itemBar" v-for="item in tableList" :key="item.autoid" @click="chooseTemp(item)">
-                    <div class="itemName">{{ item.templatename }}</div>
-                    <div class="rulesCont">
-                        <a-row>
-                            <a-col :span="24" class="ruleCol">
-                                <div class="line" v-for="sub in item.LstStep" :key="sub.autoid">
-                                    <div class="name">{{ sub.steptypename }}</div>
-                                    <div class="time">{{ sub.stepdate }}</div>
-                                </div>
-                            </a-col>
-                        </a-row>
-                    </div>
+  <!--选择履约模板-->
+  <Drawer :title="'选择履约模板'" :placement="'right'" :visible="visible" @cancel="cancel" :class="[position === 'top' ? 'top486' : 'delistingBottom']">
+    <!-- <span class="add-permance" @click="open">
+      <svg class="icon svg-icon" aria-hidden="true">
+        <use xlink:href="#icon-xinjianzengjiaxinzeng-20" />
+      </svg>
+    </span> -->
+    <a-spin :spinning="loading">
+      <div class="moduleContent">
+        <div class="itemBar" v-for="item in tableList" :key="item.autoid" @click="chooseTemp(item)">
+          <div class="itemName">{{ item.templatename }}</div>
+          <div class="rulesCont">
+            <a-row>
+              <a-col :span="24" class="ruleCol">
+                <div class="line" v-for="sub in item.LstStep" :key="sub.autoid">
+                  <div class="name">{{ sub.steptypename }}</div>
+                  <div class="time">{{ sub.stepdate }}</div>
                 </div>
-            </div>
-        </a-spin>
-    </Drawer>
-    <Add v-if="show" :position="position" @cancel="closeAddTemp" />
+              </a-col>
+            </a-row>
+          </div>
+        </div>
+      </div>
+    </a-spin>
+  </Drawer>
+  <Add v-if="show" :position="position" @cancel="closeAddTemp" />
 </template>
 
 <script lang="ts">
-import { defineComponent, PropType, ref } from 'vue';
+import { defineComponent, ref } from 'vue';
 import { Des } from '@/common/components/commonDes';
 import { _closeModal } from '@/common/setup/modal/modal';
 import Drawer from '@/common/components/drawer/index.vue';
 import { QueryPermancePlanTmpReq, QueryPermancePlanTmpRsp } from '@/services/go/wrtrade/interface';
 import { queryQueryPermancePlanTmp } from '@/services/go/wrtrade';
-import { getUserId } from '@/services/bus/user';
 import { queryTableList } from '@/common/setup/table';
 import Add from '@/common/components/permanceTemp/addPermanceTemp.vue';
 
 function hanldeOpenAndCloseComponent<T>() {
-    const show = ref<boolean>(false);
-    const selected = ref<T>(); // 选中的朋友 id 列表
-    function close(value: any) {
-        if (value) {
-            selected.value = value;
-        }
-        show.value = false;
-    }
-    function open() {
-        show.value = true;
+  const show = ref<boolean>(false);
+  const selected = ref<T>(); // 选中的朋友 id 列表
+  function close(value: any) {
+    if (value) {
+      selected.value = value;
     }
-    return { show, selected, close, open };
+    show.value = false;
+  }
+  function open() {
+    show.value = true;
+  }
+  return { show, selected, close, open };
 }
 
 export default defineComponent({
-    emits: ['cancel', 'update'],
-    name: 'queryQueryPermancePlanTmp',
-    components: { Des, Drawer, Add },
-    props: {
-        position: {
-            type: String,
-            default: 'top',
-        },
+  emits: ['cancel', 'update'],
+  name: 'queryQueryPermancePlanTmp',
+  components: { Des, Drawer, Add },
+  props: {
+    position: {
+      type: String,
+      default: 'top',
     },
-    setup(props, context) {
-        const { visible, cancel } = _closeModal(context);
-        // 新增模板
-        const { show, close, open } = hanldeOpenAndCloseComponent();
+    marketid: {
+      type: Number,
+      default: 0,
+    }
+  },
+  setup(props, context) {
+    const { visible, cancel } = _closeModal(context);
+    // 新增模板
+    const { show, close, open } = hanldeOpenAndCloseComponent();
 
-        const param: QueryPermancePlanTmpReq = {
-            userid: getUserId(),
-            tmptype: '0,2',
-        };
-        const { loading, tableList, queryTable } = queryTableList<QueryPermancePlanTmpRsp>();
-        queryTable(queryQueryPermancePlanTmp, param);
+    const param: QueryPermancePlanTmpReq = {}
+    if (props.marketid) {
+      param.marketid = props.marketid
+    } else {
+      param.tmptype = '0,2'
+    }
+    const { loading, tableList, queryTable } = queryTableList<QueryPermancePlanTmpRsp>();
+    queryTable(queryQueryPermancePlanTmp, param);
 
-        function closeAddTemp(isRefresh: boolean) {
-            if (isRefresh) {
-                queryTable(queryQueryPermancePlanTmp, param);
-            }
-            close(null);
-        }
-        // 选择履约模板
-        function chooseTemp(item: QueryPermancePlanTmpRsp) {
-            context.emit('update', item);
-            cancel();
-        }
-        return {
-            loading,
-            cancel,
-            visible,
-            tableList,
-            show,
-            close,
-            open,
-            chooseTemp,
-            closeAddTemp,
-        };
-    },
+    function closeAddTemp(isRefresh: boolean) {
+      if (isRefresh) {
+        queryTable(queryQueryPermancePlanTmp, param);
+      }
+      close(null);
+    }
+    // 选择履约模板
+    function chooseTemp(item: QueryPermancePlanTmpRsp) {
+      context.emit('update', item);
+      cancel();
+    }
+    return {
+      loading,
+      cancel,
+      visible,
+      tableList,
+      show,
+      close,
+      open,
+      chooseTemp,
+      closeAddTemp,
+    };
+  },
 });
 </script>
 

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

@@ -449,8 +449,7 @@ export default defineComponent({
 
 <style lang="less" scoped>
 .inputIconBox .input-enumdicname {
-    right: 82px;
-    top: 5px;
+    right: 100px;
 }
 .ant-form.inlineForm .relative.ant-form-item .tip {
     top: -5px;
@@ -495,10 +494,6 @@ export default defineComponent({
         }
     }
     /deep/.ant-form {
-        .ant-form-item-control-input-content {
-            position: absolute;
-            width: 100%;
-        }
         .formBar {
             height: calc(100% - 98px);
             .clickBox {
@@ -563,4 +558,4 @@ export default defineComponent({
 .ml5 {
     margin-left: 5px;
 }
-</style>
+</style>;

src/views/order/spot_warran/components/spot_warrant_spot_details/components/listing/setup.ts

@@ -102,11 +102,13 @@ export function handleNumAndPrice() {
         let result = 0
         if (isFloat()) {
             if (hasRules()) {
-                const goodsCode = goodsList.value.find(e => e.goodsid === formState.goodsid)?.goodscode as string
-                const goodsPrice = getQuoteDayInfoByCodeFindPrice(goodsCode);
-                if (goodsPrice && goodsPrice !== '--') {
-                    // 浮动价挂牌金额=（基差价格+期货合约最新价）*挂牌数量
-                    result = (formState.PriceMove + (goodsPrice as number)) * formState.OrderQty
+                const goods = goodsList.value.find(e => e.goodsid === formState.goodsid);
+                if (goods) {
+                    const goodsPrice = getQuoteDayInfoByCodeFindPrice(goods.goodscode);
+                    if (goodsPrice && goodsPrice !== '--') {
+                        // 浮动价挂牌金额=（基差价格+期货合约最新价）*挂牌数量
+                        result = (formState.PriceMove + (goodsPrice as number)) * formState.OrderQty
+                    }
                 }
             }
         } else {

src/views/report/spot-report/list/spot_report/index.vue

@@ -108,6 +108,7 @@ export default defineComponent({
         cycletype: getInitType(),
         cycletime,
         querytype: 1,
+        sumflag: 1,
       };
       // 获取列表数据
       queryTable(QryAreaSpotplReport, param).then((res) => {
@@ -165,6 +166,7 @@ export default defineComponent({
           cycletime,
           deliverygoodsid,
           currencyid,
+          sumflag: 1,
           userid: chaceSearchValue.value?.userid,
         };
         // 查询明细数据