update

src/common/components/capitalInfo/index.vue

@@ -1,53 +1,51 @@
 <template>
-  <div class="capital-info">
+  <div class="capital-info" v-if="tradeAccount">
     <!-- 资金信息 -->
-    <template v-if="tradeAccount">
-      <div class="capital-info__header">
-        <div class="capital-info__header-content">
-          <span>{{tradeAccount.accountid}}</span>
-          <span>({{getPayCurrencyTypeEnumItemName(tradeAccount.currencyid)}})</span>
-        </div>
-        <div class="capital-info__header-icon">
-          <i class="iconfont icon-zhengyan" @click="showAction"></i>
-        </div>
+    <div class="capital-info__header">
+      <div class="capital-info__header-content">
+        <span>{{tradeAccount.accountid}}</span>
+        <span>({{getPayCurrencyTypeEnumItemName(tradeAccount.currencyid)}})</span>
       </div>
-      <table class="capital-info__table">
-        <colgroup>
-          <col width="64px" />
-          <col width="auto" />
-        </colgroup>
-        <tbody>
-          <tr>
-            <td>权益</td>
-            <td>{{showValue(formatAmount(tradeAccount.equity))}}</td>
-          </tr>
-          <tr>
-            <td>余额</td>
-            <td>{{showValue(formatAmount(tradeAccount.currentbalance))}}</td>
-          </tr>
-          <tr>
-            <td>可用</td>
-            <td>{{showValue(formatAmount(tradeAccount.availableBalance))}}</td>
-          </tr>
-          <tr>
-            <td>占用</td>
-            <td>{{showValue(formatAmount(tradeAccount.usedmargin))}}</td>
-          </tr>
-          <tr>
-            <td>冻结</td>
-            <td>{{showValue(formatAmount(tradeAccount.freezeAmount))}}</td>
-          </tr>
-          <tr>
-            <td>浮盈</td>
-            <td :class="{ 'up-quote-color': tradeAccount.positionProfitAndLoss > 0, 'down-quote-color': tradeAccount.positionProfitAndLoss < 0 } ">{{showValue(formatAmount(tradeAccount.positionProfitAndLoss))}}</td>
-          </tr>
-          <tr>
-            <td>风险率</td>
-            <td>{{showValue(tradeAccount.hazardRatio > 0 ? (tradeAccount.hazardRatio * 100).toFixed(2)+'%' : 0)}}</td>
-          </tr>
-        </tbody>
-      </table>
-    </template>
+      <div class="capital-info__header-icon">
+        <i class="iconfont icon-zhengyan" @click="showAction"></i>
+      </div>
+    </div>
+    <table class="capital-info__table">
+      <colgroup>
+        <col width="64px" />
+        <col width="auto" />
+      </colgroup>
+      <tbody>
+        <tr>
+          <td>权益</td>
+          <td>{{showValue(formatAmount(tradeAccount.equity))}}</td>
+        </tr>
+        <tr>
+          <td>余额</td>
+          <td>{{showValue(formatAmount(tradeAccount.currentbalance))}}</td>
+        </tr>
+        <tr>
+          <td>可用</td>
+          <td>{{showValue(formatAmount(tradeAccount.availableBalance))}}</td>
+        </tr>
+        <tr>
+          <td>占用</td>
+          <td>{{showValue(formatAmount(tradeAccount.usedmargin))}}</td>
+        </tr>
+        <tr>
+          <td>冻结</td>
+          <td>{{showValue(formatAmount(tradeAccount.freezeAmount))}}</td>
+        </tr>
+        <tr>
+          <td>浮盈</td>
+          <td :class="{ 'up-quote-color': tradeAccount.positionProfitAndLoss > 0, 'down-quote-color': tradeAccount.positionProfitAndLoss < 0 } ">{{showValue(formatAmount(tradeAccount.positionProfitAndLoss))}}</td>
+        </tr>
+        <tr>
+          <td>风险率</td>
+          <td>{{showValue(tradeAccount.hazardRatio > 0 ? (tradeAccount.hazardRatio * 100).toFixed(2)+'%' : 0)}}</td>
+        </tr>
+      </tbody>
+    </table>
   </div>
 </template>
 

src/layout/index.vue

@@ -1,13 +1,13 @@
 <template>
-    <div class="layout">
-        <LayoutTop />
-        <template v-if="isBottom">
-            <div class="sliderLayout">
-                <div class="shortLine"></div>
-            </div>
-            <LayoutBottom />
-        </template>
-    </div>
+  <div class="layout">
+    <LayoutTop />
+    <template v-if="isBottom">
+      <div class="sliderLayout">
+        <div class="shortLine"></div>
+      </div>
+      <LayoutBottom />
+    </template>
+  </div>
 </template>
 <script lang="ts">
 import LayoutTop from './components/top.vue';
@@ -17,23 +17,23 @@ import { handleOrderData } from '@/common/setup/order/orderData';
 
 // 控制下半部分是否显示
 function submitBottomIsShow() {
-    const isShowBottomPart = ref<boolean>(false);
-    function chooseMenu(value: boolean) {
-        isShowBottomPart.value = value;
-    }
-    return { isShowBottomPart, chooseMenu };
+  const isShowBottomPart = ref<boolean>(false);
+  function chooseMenu(value: boolean) {
+    isShowBottomPart.value = value;
+  }
+  return { isShowBottomPart, chooseMenu };
 }
 
 export default defineComponent({
-    name: 'layout',
-    components: {
-        LayoutTop,
-        LayoutBottom,
-    },
-    setup() {
-        const { isBottom } = handleOrderData();
-        return { isBottom };
-    },
+  name: 'layout',
+  components: {
+    LayoutTop,
+    LayoutBottom,
+  },
+  setup() {
+    const { isBottom } = handleOrderData();
+    return { isBottom };
+  },
 });
 </script>
 <style lang="less">

src/views/business/purchase/components/funds/index.vue

@@ -158,7 +158,7 @@ export default defineComponent({
     const loading = ref<boolean>(false);
     const { rules, formState, formRef } = handleForm();
 
-    // 处理 空值  或者 0的时候，显示 --  的情况，
+    // 处理价格小于0的情况，
     function handleNoneValue(value: number | string, suffix = '') {
       return value < 0 ? '--' : value.toString() + suffix
     }

src/views/business/purchase/components/invoice/index.vue

@@ -72,7 +72,7 @@
           </a-col>
           <a-col :span="24">
             <a-form-item label="预收票额">
-              <span class="white">{{ selectedRow.preinvoiceamount + " 元" }}</span>
+              <span class="white">{{ handleNoneValue(selectedRow.preinvoiceamount, ' 元') }}</span>
             </a-form-item>
           </a-col>
         </a-row>
@@ -86,7 +86,7 @@
             <a-form-item label="收票金额" class="relative mb40" name="InvoiceAmount">
               <a-input-number v-model:value="formState.InvoiceAmount" class="dialogInput" style="width: 200px" :min="1" suffix="元" placeholder="请输入收票金额" />
               <div class="tip">
-                <div>应收票额：{{ selectedRow.daikaiamount + " 元" }} </div>
+                <div>应收票额：{{ handleNoneValue(selectedRow.daikaiamount, ' 元') }} </div>
                 <div><a class="blue fr">全部登记</a></div>
               </div>
             </a-form-item>
@@ -129,6 +129,12 @@ export default defineComponent({
     const { getFirstImg, uploadImgAction } = getUploadImg();
     const loading = ref<boolean>(false);
     const { rules, formState, formRef } = handleForm();
+
+    // 处理价格小于0的情况，
+    function handleNoneValue(value: number | string, suffix = '') {
+      return value < 0 ? '--' : value.toString() + suffix
+    }
+
     function submit() {
       const wrapEl = unref(formRef);
       wrapEl.validate().then(() => {
@@ -156,6 +162,7 @@ export default defineComponent({
       rules,
       getPriceTypeName,
       uploadImgAction,
+      handleNoneValue,
     };
   },
 });

src/views/business/purchase/list/all/index.vue

@@ -69,6 +69,7 @@ import { formatTime, formatValue } from '@/common/methods';
 import { getTableButton } from '@/common/setup/table/button';
 import { useRoute } from 'vue-router';
 import { getBizTypeName, getPriceTypeName } from '@/common/constants/enumsName';
+import { useTradeAccount } from '@/hooks/account'
 
 export default defineComponent({
   name: EnumRouterName.purchase_pending,
@@ -121,14 +122,15 @@ export default defineComponent({
       }
     };
 
+    const { tradeAccountList } = useTradeAccount();
     // 处理按钮显示
     function handleBtnList(item: Ermcp3SellBuyContract) {
-      if (item) {
+      if (item && tradeAccountList.length) {
         if (item.goodsid) {
           return buttons;
         }
-        return buttons.filter((e) => e.code !== 'purchase_pending_trade');
       }
+      return buttons.filter((e) => e.code !== 'purchase_pending_trade');
     }
 
     // 表格通用逻辑

src/views/business/sell/components/funds/index.vue

@@ -159,7 +159,7 @@ export default defineComponent({
     const loading = ref<boolean>(false);
     const { rules, formState, formRef } = handleForm();
 
-    // 处理 空值  或者 0的时候，显示 --  的情况，
+    // 处理价格小于0的情况
     function handleNoneValue(value: number | string, suffix = '') {
       return value < 0 ? '--' : value.toString() + suffix
     }

src/views/business/sell/components/invoice/index.vue

@@ -72,7 +72,7 @@
           </a-col>
           <a-col :span="24">
             <a-form-item label="预开票额">
-              <span class="white">{{ selectedRow.preinvoiceamount+ " 元"}}</span>
+              <span class="white">{{ handleNoneValue(selectedRow.preinvoiceamount, ' 元') }}</span>
             </a-form-item>
           </a-col>
         </a-row>
@@ -86,8 +86,7 @@
             <a-form-item label="开票金额" class="relative mb40" name="InvoiceAmount">
               <a-input-number v-model:value="formState.InvoiceAmount" class="dialogInput" style="width: 200px" suffix="元" :min="1" placeholder="请输入开票金额" />
               <div class="tip">
-                <div>应开票额：{{ selectedRow.daikaiamount + " 元" }}
-                  {{ handleCurrencyname(selectedRow.currencyname) }}</div>
+                <div>应开票额：{{ handleNoneValue(selectedRow.daikaiamount, ' 元') }}</div>
                 <div><a class="blue fr">全部登记</a></div>
               </div>
             </a-form-item>
@@ -130,6 +129,12 @@ export default defineComponent({
     const loading = ref<boolean>(false);
     const { rules, formState, formRef } = handleForm();
     const { getFirstImg, uploadImgAction } = getUploadImg();
+
+    // 处理价格小于0的情况，
+    function handleNoneValue(value: number | string, suffix = '') {
+      return value < 0 ? '--' : value.toString() + suffix
+    }
+
     function submit() {
       const wrapEl = unref(formRef);
       wrapEl.validate().then(() => {
@@ -160,6 +165,7 @@ export default defineComponent({
       getPriceTypeName,
       handleCurrencyname,
       uploadImgAction,
+      handleNoneValue,
     };
   },
 });

src/views/manage/finance-review/components/invoiceAudit/index.vue

@@ -1,29 +1,12 @@
 <template>
   <!-- 发票审核-->
-  <a-modal class="add-custom custom-detail"
-           title="发票审核"
-           v-model:visible="visible"
-           centered
-           :maskClosable="false"
-           @cancel="cancel"
-           width="890px">
+  <a-modal class="add-custom custom-detail" title="发票审核" v-model:visible="visible" centered :maskClosable="false" @cancel="cancel" width="890px">
     <template #footer>
-      <a-button key="submit"
-                type="primary"
-                :loading="loading"
-                @click="cancel">关闭
+      <a-button key="submit" type="primary" :loading="loading" @click="cancel">关闭
       </a-button>
-      <a-button key="submit"
-                type="primary"
-                v-if="isShowContractCheck(selectedRow.applystatus)"
-                :loading="loading"
-                @click="pass">审核通过
+      <a-button key="submit" type="primary" v-if="isShowContractCheck(selectedRow.applystatus)" :loading="loading" @click="pass">审核通过
       </a-button>
-      <a-button key="submit"
-                type="primary"
-                v-if="isShowContractCheck(selectedRow.applystatus)"
-                :loading="loading"
-                @click="refuse">审核拒绝
+      <a-button key="submit" type="primary" v-if="isShowContractCheck(selectedRow.applystatus)" :loading="loading" @click="refuse">审核拒绝
       </a-button>
     </template>
     <a-form class="inlineForm">
@@ -43,9 +26,12 @@
         </a-row>
         <a-row :gutter="24">
           <a-col :span="12">
-            <a-form-item label="销售方">
+            <a-form-item label="销售方" v-if="selectedRow.contracttype === 1">
               <span class="white">{{ formatValue(selectedRow.sellusername) }}</span>
             </a-form-item>
+            <a-form-item label="采购方" v-else>
+              <span class="white">{{ formatValue(selectedRow.buyusername) }}</span>
+            </a-form-item>
           </a-col>
           <a-col :span="12">
             <a-form-item label="现货品种">
@@ -71,11 +57,8 @@
         <a-row :gutter="24">
           <a-col :span="12">
             <a-form-item label="发票附件">
-              <span class="blue"
-                    v-if="selectedRow.attachurl"
-                    @click="previewImg(selectedRow.attachurl )">查看</span>
-              <span class="white"
-                    v-else>--</span>
+              <span class="blue" v-if="selectedRow.attachurl" @click="previewImg(selectedRow.attachurl )">查看</span>
+              <span class="white" v-else>--</span>
             </a-form-item>
           </a-col>
           <a-col :span="12">
@@ -94,12 +77,8 @@
       </fieldset>
     </a-form>
   </a-modal>
-  <a-modal :visible="previewVisible"
-           :footer="null"
-           @cancel="cancelImg">
-    <img alt="预览附件"
-         style="width: 100%"
-         :src="previewImage" />
+  <a-modal :visible="previewVisible" :footer="null" @cancel="cancelImg">
+    <img alt="预览附件" style="width: 100%" :src="previewImage" />
   </a-modal>
 </template>
 
@@ -123,89 +102,89 @@ import { handlePreviewImg } from '@/common/setup/upload';
 import { _closeModal } from '@/common/setup/modal/modal';
 
 export default defineComponent({
-    name: 'finance_review_invoice_audit',
-    emits: ['cancel', 'update'],
-    props: {
-        selectedRow: {
-            type: Object as PropType<QryBussinessFpRsp>,
-            default: {},
-        },
+  name: 'finance_review_invoice_audit',
+  emits: ['cancel', 'update'],
+  props: {
+    selectedRow: {
+      type: Object as PropType<QryBussinessFpRsp>,
+      default: {},
     },
-    setup(props, context) {
-        const { visible, cancel } = _closeModal(context);
-        const loading = ref<boolean>(false);
-        const maskClosableFlag = ref<boolean>(false);
-        // 预览附件
-        const { previewVisible, previewImage, cancelImg, previewImg } = handlePreviewImg();
-        function submit() {
-            loading.value = true;
-            setTimeout(() => {
-                loading.value = false;
-                cancel();
-            }, 200);
-        }
+  },
+  setup(props, context) {
+    const { visible, cancel } = _closeModal(context);
+    const loading = ref<boolean>(false);
+    const maskClosableFlag = ref<boolean>(false);
+    // 预览附件
+    const { previewVisible, previewImage, cancelImg, previewImg } = handlePreviewImg();
+    function submit() {
+      loading.value = true;
+      setTimeout(() => {
+        loading.value = false;
+        cancel();
+      }, 200);
+    }
 
-        // 审核通过
-        function pass() {
-            Modal.confirm({
-                title: '是否确认审核通过',
-                okText: '审核通过',
-                cancelText: '取消',
-                onOk() {
-                    const param: ContractOperateApplyReq = {
-                        OperateApplyID: Long.fromString(props.selectedRow.operateapplyid),
-                        OperateType: 2,
-                    };
-                    financeControl(param, loading)
-                        .then((res) => {
-                            cancel(true);
-                        })
-                        .catch((err) => {});
-                },
-                onCancel() {},
-            });
-        }
+    // 审核通过
+    function pass() {
+      Modal.confirm({
+        title: '是否确认审核通过',
+        okText: '审核通过',
+        cancelText: '取消',
+        onOk() {
+          const param: ContractOperateApplyReq = {
+            OperateApplyID: Long.fromString(props.selectedRow.operateapplyid),
+            OperateType: 2,
+          };
+          financeControl(param, loading)
+            .then((res) => {
+              cancel(true);
+            })
+            .catch((err) => { });
+        },
+        onCancel() { },
+      });
+    }
 
-        // 审核拒绝
-        function refuse() {
-            Modal.confirm({
-                title: '是否确认审核拒绝',
-                okText: '审核拒绝',
-                cancelText: '取消',
-                onOk() {
-                    const param: ContractOperateApplyReq = {
-                        OperateApplyID: Long.fromString(props.selectedRow.operateapplyid),
-                        OperateType: 3,
-                    };
-                    financeControl(param, loading)
-                        .then((res) => {
-                            cancel(true);
-                        })
-                        .catch((err) => {});
-                },
-                onCancel() {},
-            });
-        }
+    // 审核拒绝
+    function refuse() {
+      Modal.confirm({
+        title: '是否确认审核拒绝',
+        okText: '审核拒绝',
+        cancelText: '取消',
+        onOk() {
+          const param: ContractOperateApplyReq = {
+            OperateApplyID: Long.fromString(props.selectedRow.operateapplyid),
+            OperateType: 3,
+          };
+          financeControl(param, loading)
+            .then((res) => {
+              cancel(true);
+            })
+            .catch((err) => { });
+        },
+        onCancel() { },
+      });
+    }
 
-        return {
-            visible,
-            cancel,
-            submit,
-            loading,
-            formatValue,
-            getStatusName,
-            maskClosableFlag,
-            invoiceStatusName,
-            getPriceTypeName,
-            pass,
-            refuse,
-            isShowContractCheck,
-            previewVisible,
-            previewImage,
-            cancelImg,
-            previewImg,
-        };
-    },
+    return {
+      visible,
+      cancel,
+      submit,
+      loading,
+      formatValue,
+      getStatusName,
+      maskClosableFlag,
+      invoiceStatusName,
+      getPriceTypeName,
+      pass,
+      refuse,
+      isShowContractCheck,
+      previewVisible,
+      previewImage,
+      cancelImg,
+      previewImg,
+    };
+  },
 });
 </script>
 

src/views/manage/finance-review/components/invoiceCancel/index.vue

@@ -1,23 +1,11 @@
 <template>
   <!-- 撤销发票登记-->
-  <a-modal class="add-custom custom-detail"
-           title="撤销发票登记"
-           v-model:visible="visible"
-           centered
-           :maskClosable="false"
-           @cancel="cancel"
-           width="890px">
+  <a-modal class="add-custom custom-detail" title="撤销发票登记" v-model:visible="visible" centered :maskClosable="false" @cancel="cancel" width="890px">
     <template #footer>
-      <a-button key="submit"
-                type="primary"
-                :loading="loading"
-                @click="cancel">关闭
+      <a-button key="submit" type="primary" :loading="loading" @click="cancel">关闭
       </a-button>
 
-      <a-button key="submit"
-                type="primary"
-                :loading="loading"
-                @click="back">撤销
+      <a-button key="submit" type="primary" :loading="loading" @click="back">撤销
       </a-button>
     </template>
     <a-form class="inlineForm">
@@ -37,9 +25,12 @@
         </a-row>
         <a-row :gutter="24">
           <a-col :span="12">
-            <a-form-item label="销售方">
+            <a-form-item label="销售方" v-if="selectedRow.contracttype === 1">
               <span class="white">{{ formatValue(selectedRow.sellusername) }}</span>
             </a-form-item>
+            <a-form-item label="采购方" v-else>
+              <span class="white">{{ formatValue(selectedRow.buyusername) }}</span>
+            </a-form-item>
           </a-col>
           <a-col :span="12">
             <a-form-item label="现货品种">
@@ -104,55 +95,55 @@ import { financeControl } from '@/views/manage/finance-review/components/setup';
 import { _closeModal } from '@/common/setup/modal/modal';
 
 export default defineComponent({
-    name: 'finance_review_invoice_cancel',
-    emits: ['cancel', 'update'],
-    components: {},
-    props: {
-        selectedRow: {
-            type: Object as PropType<QryBussinessFpRsp>,
-            default: {},
-        },
+  name: 'finance_review_invoice_cancel',
+  emits: ['cancel', 'update'],
+  components: {},
+  props: {
+    selectedRow: {
+      type: Object as PropType<QryBussinessFpRsp>,
+      default: {},
     },
-    setup(props, context) {
-        const { visible, cancel } = _closeModal(context);
-        const loading = ref<boolean>(false);
-        const maskClosableFlag = ref<boolean>(false);
+  },
+  setup(props, context) {
+    const { visible, cancel } = _closeModal(context);
+    const loading = ref<boolean>(false);
+    const maskClosableFlag = ref<boolean>(false);
 
-        function submit() {}
+    function submit() { }
 
-        function back() {
-            Modal.confirm({
-                title: '是否确认撤销',
-                okText: '确认撤销',
-                cancelText: '取消',
-                onOk() {
-                    const param: ContractOperateApplyReq = {
-                        OperateApplyID: Long.fromString(props.selectedRow.operateapplyid),
-                        OperateType: 4,
-                    };
-                    financeControl(param, loading)
-                        .then((res) => {
-                            cancel(true);
-                        })
-                        .catch((err) => {});
-                },
-                onCancel() {},
-            });
-        }
+    function back() {
+      Modal.confirm({
+        title: '是否确认撤销',
+        okText: '确认撤销',
+        cancelText: '取消',
+        onOk() {
+          const param: ContractOperateApplyReq = {
+            OperateApplyID: Long.fromString(props.selectedRow.operateapplyid),
+            OperateType: 4,
+          };
+          financeControl(param, loading)
+            .then((res) => {
+              cancel(true);
+            })
+            .catch((err) => { });
+        },
+        onCancel() { },
+      });
+    }
 
-        return {
-            visible,
-            cancel,
-            submit,
-            loading,
-            formatValue,
-            getStatusName,
-            maskClosableFlag,
-            invoiceStatusName,
-            getPriceTypeName,
-            back,
-        };
-    },
+    return {
+      visible,
+      cancel,
+      submit,
+      loading,
+      formatValue,
+      getStatusName,
+      maskClosableFlag,
+      invoiceStatusName,
+      getPriceTypeName,
+      back,
+    };
+  },
 });
 </script>
 

src/views/manage/finance-review/components/invoiceDetail/index.vue

@@ -21,9 +21,12 @@
         </a-row>
         <a-row :gutter="24">
           <a-col :span="12">
-            <a-form-item :label="selectedRow.contracttype === 1 ? '销售方' : '采购方'">
+            <a-form-item label="销售方" v-if="selectedRow.contracttype === 1">
               <span class="white">{{ formatValue(selectedRow.sellusername) }}</span>
             </a-form-item>
+            <a-form-item label="采购方" v-else>
+              <span class="white">{{ formatValue(selectedRow.buyusername) }}</span>
+            </a-form-item>
           </a-col>
           <a-col :span="12">
             <a-form-item label="现货品种">

src/views/manage/inventory-review/components/checkinAudit/index.vue

@@ -1,34 +1,16 @@
 <template>
   <!-- 入库审核-->
-  <a-modal class="add-custom custom-detail"
-           title="入库审核"
-           v-model:visible="visible"
-           centered
-           :maskClosable="false"
-           @cancel="cancel"
-           width="890px">
+  <a-modal class="add-custom custom-detail" title="入库审核" v-model:visible="visible" centered :maskClosable="false" @cancel="cancel" width="890px">
     <template #footer>
-      <a-button key="submit"
-                type="primary"
-                :loading="loading"
-                @click="cancel">关闭
+      <a-button key="submit" type="primary" :loading="loading" @click="cancel">关闭
       </a-button>
-      <a-button key="submit"
-                type="primary"
-                :loading="loading"
-                v-if="isShowContractCheck(selectedRow.applystatus)"
-                @click="pass">审核通过
+      <a-button key="submit" type="primary" :loading="loading" v-if="isShowContractCheck(selectedRow.applystatus)" @click="pass">审核通过
       </a-button>
-      <a-button key="submit"
-                type="primary"
-                :loading="loading"
-                v-if="isShowContractCheck(selectedRow.applystatus)"
-                @click="refuse">审核拒绝
+      <a-button key="submit" type="primary" :loading="loading" v-if="isShowContractCheck(selectedRow.applystatus)" @click="refuse">审核拒绝
       </a-button>
     </template>
     <a-form class="inlineForm">
-      <fieldset class="formFieldSet"
-                v-if="isShowContractInfo(selectedRow.inouttype)">
+      <fieldset class="formFieldSet" v-if="isShowContractInfo(selectedRow.inouttype)">
         <legend>合同基本信息</legend>
         <a-row :gutter="24">
           <a-col :span="12">
@@ -64,8 +46,7 @@
           </a-col>
           <a-col :span="12">
             <a-form-item label="合同签署量">
-              <span
-                    class="white">{{ formatValue(selectedRow.contractqty) + " " +  selectedRow.enumdicname }}</span>
+              <span class="white">{{ formatValue(selectedRow.contractqty) + " " +  selectedRow.enumdicname }}</span>
             </a-form-item>
           </a-col>
         </a-row>
@@ -79,7 +60,7 @@
             </a-form-item>
           </a-col>
           <a-col :span="12">
-            <a-form-item label="品类">
+            <a-form-item label="商品">
               <span class="white">{{ formatValue(selectedRow.wrstandardname) }}</span>
             </a-form-item>
           </a-col>
@@ -170,82 +151,82 @@ import moment from 'moment';
 import { _closeModal } from '@/common/setup/modal/modal';
 
 export default defineComponent({
-    name: 'inventory_review_checkin_audit',
-    emits: ['cancel', 'update'],
-    props: {
-        selectedRow: {
-            type: Object as PropType<Ermcp3AreaStockApply>,
-            default: {},
-        },
+  name: 'inventory_review_checkin_audit',
+  emits: ['cancel', 'update'],
+  props: {
+    selectedRow: {
+      type: Object as PropType<Ermcp3AreaStockApply>,
+      default: {},
     },
-    setup(props, context) {
-        const { visible, cancel } = _closeModal(context);
-        const loading = ref<boolean>(false);
-        const maskClosableFlag = ref<boolean>(false);
+  },
+  setup(props, context) {
+    const { visible, cancel } = _closeModal(context);
+    const loading = ref<boolean>(false);
+    const maskClosableFlag = ref<boolean>(false);
 
-        // 审核通过
-        function pass() {
-            Modal.confirm({
-                title: '是否确认审核通过',
-                okText: '审核通过',
-                cancelText: '取消',
-                onOk() {
-                    const param: AreaInOutApplyAuditPassReq = {
-                        InOutApplyID: Long.fromString(props.selectedRow.inoutapplyid),
-                        AuditID: geLoginID_number()!,
-                        Remark: '',
-                    };
-                    passStockControl(param, loading)
-                        .then((res) => {
-                            cancel(true);
-                        })
-                        .catch((err) => {});
-                },
-                onCancel() {},
-            });
-        }
-        // 审核拒绝
-        function refuse() {
-            Modal.confirm({
-                title: '是否确认审核拒绝',
-                okText: '审核拒绝',
-                cancelText: '取消',
-                onOk() {
-                    const param: AuditERMCPAreaInOutStockApplyReq = {
-                        InOutApplyID: Long.fromString(props.selectedRow.inoutapplyid), // uint64 申请ID
-                        AuditID: geLoginID_number()!, // uint64 审核人
-                        AuditRemark: '', // string 审核备注
-                        AuditTradeDate: moment().format('YYYYMMDD'), // string 审核交易日(yyyyMMdd)
-                        ApplyStatus: 3, // int32 审核状态:3-审核拒绝 5-已撤回
-                    };
-                    refuseStockControl(param, loading)
-                        .then((res) => {
-                            cancel(true);
-                        })
-                        .catch((err) => {});
-                },
-                onCancel() {},
-            });
-        }
-        return {
-            visible,
-            cancel,
-            loading,
-            formatValue,
-            getStatusName,
-            maskClosableFlag,
+    // 审核通过
+    function pass() {
+      Modal.confirm({
+        title: '是否确认审核通过',
+        okText: '审核通过',
+        cancelText: '取消',
+        onOk() {
+          const param: AreaInOutApplyAuditPassReq = {
+            InOutApplyID: Long.fromString(props.selectedRow.inoutapplyid),
+            AuditID: geLoginID_number()!,
+            Remark: '',
+          };
+          passStockControl(param, loading)
+            .then((res) => {
+              cancel(true);
+            })
+            .catch((err) => { });
+        },
+        onCancel() { },
+      });
+    }
+    // 审核拒绝
+    function refuse() {
+      Modal.confirm({
+        title: '是否确认审核拒绝',
+        okText: '审核拒绝',
+        cancelText: '取消',
+        onOk() {
+          const param: AuditERMCPAreaInOutStockApplyReq = {
+            InOutApplyID: Long.fromString(props.selectedRow.inoutapplyid), // uint64 申请ID
+            AuditID: geLoginID_number()!, // uint64 审核人
+            AuditRemark: '', // string 审核备注
+            AuditTradeDate: moment().format('YYYYMMDD'), // string 审核交易日(yyyyMMdd)
+            ApplyStatus: 3, // int32 审核状态:3-审核拒绝 5-已撤回
+          };
+          refuseStockControl(param, loading)
+            .then((res) => {
+              cancel(true);
+            })
+            .catch((err) => { });
+        },
+        onCancel() { },
+      });
+    }
+    return {
+      visible,
+      cancel,
+      loading,
+      formatValue,
+      getStatusName,
+      maskClosableFlag,
 
-            isShowContractInfo,
-            getContractTypeName,
-            getPriceTypeName,
-            InOutTypeName,
-            getGoodsUnitEnumItemName,
-            getApplyStatusName,
-            isShowContractCheck,
-            refuse,
-            pass,
-        };
-    },
+      isShowContractInfo,
+      getContractTypeName,
+      getPriceTypeName,
+      InOutTypeName,
+      getGoodsUnitEnumItemName,
+      getApplyStatusName,
+      isShowContractCheck,
+      refuse,
+      pass,
+    };
+  },
 });
 </script>
 

src/views/manage/inventory-review/components/checkinCancel/index.vue

@@ -1,28 +1,15 @@
 <template>
   <!-- 撤销入库登记-->
-  <a-modal class="add-custom custom-detail"
-           title="撤销入库登记"
-           v-model:visible="visible"
-           centered
-           :maskClosable="false"
-           @cancel="cancel"
-           width="890px">
+  <a-modal class="add-custom custom-detail" title="撤销入库登记" v-model:visible="visible" centered :maskClosable="false" @cancel="cancel" width="890px">
     <template #footer>
-      <a-button key="submit"
-                type="primary"
-                :loading="loading"
-                @click="cancel">关闭
+      <a-button key="submit" type="primary" :loading="loading" @click="cancel">关闭
       </a-button>
 
-      <a-button key="submit"
-                type="primary"
-                :loading="loading"
-                @click="back">撤销
+      <a-button key="submit" type="primary" :loading="loading" @click="back">撤销
       </a-button>
     </template>
     <a-form class="inlineForm">
-      <fieldset class="formFieldSet"
-                v-if="isShowContractInfo(selectedRow.inouttype)">
+      <fieldset class="formFieldSet" v-if="isShowContractInfo(selectedRow.inouttype)">
         <legend>合同基本信息</legend>
         <a-row :gutter="24">
           <a-col :span="12">
@@ -58,8 +45,7 @@
           </a-col>
           <a-col :span="12">
             <a-form-item label="合同签署量">
-              <span
-                    class="white">{{ formatValue(selectedRow.contractqty) + " " +  selectedRow.enumdicname }}</span>
+              <span class="white">{{ formatValue(selectedRow.contractqty) + " " +  selectedRow.enumdicname }}</span>
             </a-form-item>
           </a-col>
         </a-row>
@@ -73,7 +59,7 @@
             </a-form-item>
           </a-col>
           <a-col :span="12">
-            <a-form-item label="品类">
+            <a-form-item label="商品">
               <span class="white">{{ formatValue(selectedRow.wrstandardname) }}</span>
             </a-form-item>
           </a-col>
@@ -164,58 +150,58 @@ import { refuseStockControl } from '@/views/manage/inventory-review/components/s
 import { _closeModal } from '@/common/setup/modal/modal';
 
 export default defineComponent({
-    name: 'inventory_review_checkin_cancel',
-    emits: ['cancel', 'update'],
-    props: {
-        selectedRow: {
-            type: Object as PropType<Ermcp3AreaStockApply>,
-            default: {},
-        },
+  name: 'inventory_review_checkin_cancel',
+  emits: ['cancel', 'update'],
+  props: {
+    selectedRow: {
+      type: Object as PropType<Ermcp3AreaStockApply>,
+      default: {},
     },
-    setup(props, context) {
-        const { visible, cancel } = _closeModal(context);
-        const loading = ref<boolean>(false);
-        const maskClosableFlag = ref<boolean>(false);
-        function back() {
-            Modal.confirm({
-                title: '是否确认撤销',
-                okText: '确认撤销',
-                cancelText: '取消',
-                onOk() {
-                    const param: AuditERMCPAreaInOutStockApplyReq = {
-                        InOutApplyID: Long.fromString(props.selectedRow.inoutapplyid), // uint64 申请ID
-                        AuditID: geLoginID_number()!, // uint64 审核人
-                        AuditRemark: '', // string 审核备注
-                        AuditTradeDate: moment().format('YYYYMMDD'), // string 审核交易日(yyyyMMdd)
-                        ApplyStatus: 5, // int32 审核状态:3-审核拒绝 5-已撤回
-                    };
-                    refuseStockControl(param, loading)
-                        .then((res) => {
-                            cancel(true);
-                        })
-                        .catch((err) => {});
-                },
-                onCancel() {},
-            });
-        }
-        return {
-            visible,
-            cancel,
-            loading,
-            formatValue,
-            getStatusName,
-            maskClosableFlag,
+  },
+  setup(props, context) {
+    const { visible, cancel } = _closeModal(context);
+    const loading = ref<boolean>(false);
+    const maskClosableFlag = ref<boolean>(false);
+    function back() {
+      Modal.confirm({
+        title: '是否确认撤销',
+        okText: '确认撤销',
+        cancelText: '取消',
+        onOk() {
+          const param: AuditERMCPAreaInOutStockApplyReq = {
+            InOutApplyID: Long.fromString(props.selectedRow.inoutapplyid), // uint64 申请ID
+            AuditID: geLoginID_number()!, // uint64 审核人
+            AuditRemark: '', // string 审核备注
+            AuditTradeDate: moment().format('YYYYMMDD'), // string 审核交易日(yyyyMMdd)
+            ApplyStatus: 5, // int32 审核状态:3-审核拒绝 5-已撤回
+          };
+          refuseStockControl(param, loading)
+            .then((res) => {
+              cancel(true);
+            })
+            .catch((err) => { });
+        },
+        onCancel() { },
+      });
+    }
+    return {
+      visible,
+      cancel,
+      loading,
+      formatValue,
+      getStatusName,
+      maskClosableFlag,
 
-            isShowContractInfo,
-            getContractTypeName,
-            getPriceTypeName,
-            InOutTypeName,
-            getGoodsUnitEnumItemName,
-            getApplyStatusName,
+      isShowContractInfo,
+      getContractTypeName,
+      getPriceTypeName,
+      InOutTypeName,
+      getGoodsUnitEnumItemName,
+      getApplyStatusName,
 
-            back,
-        };
-    },
+      back,
+    };
+  },
 });
 </script>
 

src/views/manage/inventory-review/components/checkinDetail/index.vue

@@ -1,124 +1,124 @@
 <template>
-    <!-- 入库详情-->
-    <a-modal class="add-custom custom-detail" title="入库详情" v-model:visible="visible" centered :maskClosable="false" @cancel="cancel" width="890px">
-        <template #footer>
-            <a-button key="submit" type="primary" :loading="loading" @click="cancel">关闭 </a-button>
-        </template>
-        <a-form class="inlineForm">
-            <fieldset class="formFieldSet" v-if="isShowContractInfo(selectedRow.inouttype)">
-                <legend>合同基本信息</legend>
-                <a-row :gutter="24">
-                    <a-col :span="12">
-                        <a-form-item label="合同编号">
-                            <span class="white">{{ getContractTypeName(selectedRow.contracttype) + '/' + formatValue(selectedRow.contractno) }}</span>
-                        </a-form-item>
-                    </a-col>
-                    <a-col :span="12">
-                        <a-form-item label="定价类型">
-                            <span class="white">{{ getPriceTypeName(selectedRow.pricetype) }}</span>
-                        </a-form-item>
-                    </a-col>
-                </a-row>
-                <a-row :gutter="24">
-                    <a-col :span="12">
-                        <a-form-item label="销售方">
-                            <span class="white">{{ formatValue(selectedRow.sellusername) }}</span>
-                        </a-form-item>
-                    </a-col>
-                    <a-col :span="12">
-                        <a-form-item label="现货品种">
-                            <span class="white">{{ formatValue(selectedRow.deliverygoodsname) }}</span>
-                        </a-form-item>
-                    </a-col>
-                </a-row>
-                <a-row :gutter="24">
-                    <a-col :span="12">
-                        <a-form-item label="采购方">
-                            <span class="white">{{ formatValue(selectedRow.buyusername) }}</span>
-                        </a-form-item>
-                    </a-col>
-                    <a-col :span="12">
-                        <a-form-item label="合同签署量">
-                            <span class="white">{{ formatValue(selectedRow.contractqty) + ' ' + selectedRow.enumdicname }}</span>
-                        </a-form-item>
-                    </a-col>
-                </a-row>
-            </fieldset>
-            <fieldset class="formFieldSet">
-                <legend>登记信息</legend>
-                <a-row :gutter="24">
-                    <a-col :span="12">
-                        <a-form-item label="出库类型">
-                            <span class="white">{{ InOutTypeName(selectedRow.inouttype) }}</span>
-                        </a-form-item>
-                    </a-col>
-                    <a-col :span="12">
-                        <a-form-item label="品类">
-                            <span class="white">{{ formatValue(selectedRow.wrstandardname) }}</span>
-                        </a-form-item>
-                    </a-col>
-                </a-row>
-                <a-row :gutter="24">
-                    <a-col :span="12">
-                        <a-form-item label="品牌">
-                            <span class="white">{{ formatValue(selectedRow.brandname) }}</span>
-                        </a-form-item>
-                    </a-col>
-                    <a-col :span="12">
-                        <a-form-item label="入库仓库">
-                            <span class="white">{{ formatValue(selectedRow.warehousecode) }}</span>
-                        </a-form-item>
-                    </a-col>
-                </a-row>
-                <a-row :gutter="24">
-                    <a-col :span="12">
-                        <a-form-item label="入库数量">
-                            <span class="white">{{ formatValue(selectedRow.qty) + getGoodsUnitEnumItemName(selectedRow.unitid) }}</span>
-                        </a-form-item>
-                    </a-col>
-                    <a-col :span="12">
-                        <a-form-item label="登记时间">
-                            <span class="white">{{ formatValue(selectedRow.applytime) }}</span>
-                        </a-form-item>
-                    </a-col>
-                </a-row>
-                <a-row :gutter="24">
-                    <a-col :span="12">
-                        <a-form-item label="登记人">
-                            <span class="white">{{ formatValue(selectedRow.applyname) }}</span>
-                        </a-form-item>
-                    </a-col>
-                    <a-col :span="12">
-                        <a-form-item label="状态">
-                            <span class="white">{{ getApplyStatusName(selectedRow.applystatus) }}</span>
-                        </a-form-item>
-                    </a-col>
-                </a-row>
-            </fieldset>
-            <fieldset class="formFieldSet">
-                <legend>审核信息</legend>
-                <a-row :gutter="24">
-                    <a-col :span="12">
-                        <a-form-item label="审核时间">
-                            <span class="white">{{ formatValue(selectedRow.audittime) }}</span>
-                        </a-form-item>
-                    </a-col>
-                    <a-col :span="12">
-                        <a-form-item label="审核人">
-                            <span class="white">{{ formatValue(selectedRow.auditname) }}</span>
-                        </a-form-item>
-                    </a-col>
-                </a-row>
-                <a-row :gutter="24">
-                    <a-col :span="12">
-                        <a-form-item label="审核意见">
-                            <span class="white">{{ formatValue(selectedRow.auditremark) }}</span>
-                        </a-form-item>
-                    </a-col>
-                </a-row>
-            </fieldset>
-        </a-form>
-    </a-modal>
+  <!-- 入库详情-->
+  <a-modal class="add-custom custom-detail" title="入库详情" v-model:visible="visible" centered :maskClosable="false" @cancel="cancel" width="890px">
+    <template #footer>
+      <a-button key="submit" type="primary" :loading="loading" @click="cancel">关闭 </a-button>
+    </template>
+    <a-form class="inlineForm">
+      <fieldset class="formFieldSet" v-if="isShowContractInfo(selectedRow.inouttype)">
+        <legend>合同基本信息</legend>
+        <a-row :gutter="24">
+          <a-col :span="12">
+            <a-form-item label="合同编号">
+              <span class="white">{{ getContractTypeName(selectedRow.contracttype) + '/' + formatValue(selectedRow.contractno) }}</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="定价类型">
+              <span class="white">{{ getPriceTypeName(selectedRow.pricetype) }}</span>
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-row :gutter="24">
+          <a-col :span="12">
+            <a-form-item label="销售方">
+              <span class="white">{{ formatValue(selectedRow.sellusername) }}</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="现货品种">
+              <span class="white">{{ formatValue(selectedRow.deliverygoodsname) }}</span>
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-row :gutter="24">
+          <a-col :span="12">
+            <a-form-item label="采购方">
+              <span class="white">{{ formatValue(selectedRow.buyusername) }}</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="合同签署量">
+              <span class="white">{{ formatValue(selectedRow.contractqty) + ' ' + selectedRow.enumdicname }}</span>
+            </a-form-item>
+          </a-col>
+        </a-row>
+      </fieldset>
+      <fieldset class="formFieldSet">
+        <legend>登记信息</legend>
+        <a-row :gutter="24">
+          <a-col :span="12">
+            <a-form-item label="出库类型">
+              <span class="white">{{ InOutTypeName(selectedRow.inouttype) }}</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="商品">
+              <span class="white">{{ formatValue(selectedRow.wrstandardname) }}</span>
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-row :gutter="24">
+          <a-col :span="12">
+            <a-form-item label="品牌">
+              <span class="white">{{ formatValue(selectedRow.brandname) }}</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="入库仓库">
+              <span class="white">{{ formatValue(selectedRow.warehousecode) }}</span>
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-row :gutter="24">
+          <a-col :span="12">
+            <a-form-item label="入库数量">
+              <span class="white">{{ formatValue(selectedRow.qty) + getGoodsUnitEnumItemName(selectedRow.unitid) }}</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="登记时间">
+              <span class="white">{{ formatValue(selectedRow.applytime) }}</span>
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-row :gutter="24">
+          <a-col :span="12">
+            <a-form-item label="登记人">
+              <span class="white">{{ formatValue(selectedRow.applyname) }}</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="状态">
+              <span class="white">{{ getApplyStatusName(selectedRow.applystatus) }}</span>
+            </a-form-item>
+          </a-col>
+        </a-row>
+      </fieldset>
+      <fieldset class="formFieldSet">
+        <legend>审核信息</legend>
+        <a-row :gutter="24">
+          <a-col :span="12">
+            <a-form-item label="审核时间">
+              <span class="white">{{ formatValue(selectedRow.audittime) }}</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="审核人">
+              <span class="white">{{ formatValue(selectedRow.auditname) }}</span>
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-row :gutter="24">
+          <a-col :span="12">
+            <a-form-item label="审核意见">
+              <span class="white">{{ formatValue(selectedRow.auditremark) }}</span>
+            </a-form-item>
+          </a-col>
+        </a-row>
+      </fieldset>
+    </a-form>
+  </a-modal>
 </template>
 
 <script lang="ts">
@@ -135,35 +135,35 @@ import { getGoodsUnitEnumItemName, getApplyStatusName } from '@/common/constants
 import { _closeModal } from '@/common/setup/modal/modal';
 
 export default defineComponent({
-    name: 'finance_review_funds_detail',
-    emits: ['cancel', 'update'],
-    props: {
-        selectedRow: {
-            type: Object as PropType<Ermcp3AreaStockApply>,
-            default: {},
-        },
+  name: 'finance_review_funds_detail',
+  emits: ['cancel', 'update'],
+  props: {
+    selectedRow: {
+      type: Object as PropType<Ermcp3AreaStockApply>,
+      default: {},
     },
-    setup(props, context) {
-        const { visible, cancel } = _closeModal(context);
-        const loading = ref<boolean>(false);
-        const maskClosableFlag = ref<boolean>(false);
+  },
+  setup(props, context) {
+    const { visible, cancel } = _closeModal(context);
+    const loading = ref<boolean>(false);
+    const maskClosableFlag = ref<boolean>(false);
 
-        return {
-            visible,
-            cancel,
-            loading,
-            formatValue,
-            getStatusName,
-            maskClosableFlag,
+    return {
+      visible,
+      cancel,
+      loading,
+      formatValue,
+      getStatusName,
+      maskClosableFlag,
 
-            isShowContractInfo,
-            getContractTypeName,
-            getPriceTypeName,
-            InOutTypeName,
-            getGoodsUnitEnumItemName,
-            getApplyStatusName,
-        };
-    },
+      isShowContractInfo,
+      getContractTypeName,
+      getPriceTypeName,
+      InOutTypeName,
+      getGoodsUnitEnumItemName,
+      getApplyStatusName,
+    };
+  },
 });
 </script>
 

src/views/market/market-spot/goods-chart/index.vue

@@ -12,20 +12,12 @@
       <div class="inlineBar">
         <div class="valNums bdf1 ml10">
           <!-- 最新价 -->
-          <div
-            class="firstNum start"
-            :class="handleQuotePriceColor(selectedRow.last, selectedRow.presettle)"
-          >{{ selectedRow.last }}</div>
+          <div class="firstNum start" :class="handleQuotePriceColor(selectedRow.last, selectedRow.presettle)">{{ handleNoneValue(selectedRow.last) }}</div>
           <div class="lastNum start">
             <!-- 涨跌值 -->
-            <div
-              :class="handleQuotePriceColor(selectedRow.last, selectedRow.presettle)"
-            >{{ quoteChange(selectedRow, selectedRow.decimalplace) }}</div>
+            <div :class="handleQuotePriceColor(selectedRow.last, selectedRow.presettle)">{{ quoteChange(selectedRow, selectedRow.decimalplace) }}</div>
             <!-- 涨跌幅 -->
-            <div
-              class="ml20"
-              :class="handleQuotePriceColor(selectedRow.last, selectedRow.presettle)"
-            >{{ quoteAmplitude(selectedRow, selectedRow.decimalplace) }}</div>
+            <div class="ml20" :class="handleQuotePriceColor(selectedRow.last, selectedRow.presettle)">{{ quoteAmplitude(selectedRow, selectedRow.decimalplace) }}</div>
           </div>
         </div>
         <div class="priceBar ml20">
@@ -33,17 +25,11 @@
             <div class="greenBar">
               <div class="numBlock ml15">
                 <div class="first grey">卖价</div>
-                <div
-                  class="last"
-                  :class="handleQuotePriceColor(selectedRow.ask, selectedRow.presettle)"
-                >{{ selectedRow.ask }}</div>
+                <div class="last" :class="handleQuotePriceColor(selectedRow.ask, selectedRow.presettle)">{{ handleNoneValue(selectedRow.ask) }}</div>
               </div>
               <div class="numBlock">
                 <div class="first grey">卖量</div>
-                <div
-                  class="last"
-                  :class="handleQuotePriceColor(selectedRow.ask, selectedRow.presettle)"
-                >{{ selectedRow.askvolume }}</div>
+                <div class="last" :class="handleQuotePriceColor(selectedRow.ask, selectedRow.presettle)">{{ selectedRow.askvolume }}</div>
               </div>
             </div>
           </div>
@@ -51,17 +37,11 @@
             <div class="redBar">
               <div class="numBlock">
                 <div class="first grey">买价</div>
-                <div
-                  class="last"
-                  :class="handleQuotePriceColor(selectedRow.bid, selectedRow.presettle)"
-                >{{ selectedRow.bid }}</div>
+                <div class="last" :class="handleQuotePriceColor(selectedRow.bid, selectedRow.presettle)">{{ handleNoneValue(selectedRow.bid) }}</div>
               </div>
               <div class="numBlock">
                 <div class="first grey">买量</div>
-                <div
-                  class="last"
-                  :class="handleQuotePriceColor(selectedRow.bid, selectedRow.presettle)"
-                >{{ selectedRow.bidvolume }}</div>
+                <div class="last" :class="handleQuotePriceColor(selectedRow.bid, selectedRow.presettle)">{{ selectedRow.bidvolume }}</div>
               </div>
             </div>
           </div>
@@ -72,22 +52,10 @@
       </div>
     </div>
     <!-- 交易图表 -->
-    <Chart
-      v-if="showComponentsId === ComponentType.chart"
-      @update="changeComponent"
-      :selectedRow="selectedRow"
-    />
+    <Chart v-if="showComponentsId === ComponentType.chart" @update="changeComponent" :selectedRow="selectedRow" />
     <!-- 成交明细 -->
-    <StockExchange
-      :selectedRow="selectedRow"
-      v-if="showComponentsId === ComponentType.tradeDetail"
-    />
-    <component
-      :is="componentId"
-      v-if="componentId"
-      :selectedRow="selectedRow"
-      @cancel="closeComponent"
-    ></component>
+    <StockExchange :selectedRow="selectedRow" v-if="showComponentsId === ComponentType.tradeDetail" />
+    <component :is="componentId" v-if="componentId" :selectedRow="selectedRow" @cancel="closeComponent"></component>
   </div>
 </template>
 
@@ -102,6 +70,7 @@ import Chart from './chart/index.vue';
 import { ComponentType } from './setup';
 import StockExchange from './stock-exchange/index.vue';
 import { handleModalComponent } from '@/common/setup/asyncComponent';
+import { handleNoneValue } from '@/common/setup/table/tableQuote';
 
 export default defineComponent({
   emits: ['cancel', 'update'],
@@ -157,43 +126,44 @@ export default defineComponent({
       componentId,
       closeComponent,
       openComponent,
+      handleNoneValue,
     };
   },
 });
 </script>
 <style lang="less">
 .valNums {
-  .flex;
-  flex-direction: column;
-  padding-left: 20px;
-  .firstNum {
-    font-size: 18px;
-    line-height: 18px;
-    font-weight: 400;
-  }
-  .lastNum {
-    margin-top: 2px;
-    display: inline-flex;
-    font-size: 12px;
-    line-height: 12px;
-    font-weight: 300;
-  }
+    .flex;
+    flex-direction: column;
+    padding-left: 20px;
+    .firstNum {
+        font-size: 18px;
+        line-height: 18px;
+        font-weight: 400;
+    }
+    .lastNum {
+        margin-top: 2px;
+        display: inline-flex;
+        font-size: 12px;
+        line-height: 12px;
+        font-weight: 300;
+    }
 }
 .inlineBar {
-  display: inline-flex;
+    display: inline-flex;
 }
 .priceBar {
-  .flex;
-  flex-direction: column;
-  height: 32px;
-  .greenBar,
-  .redBar {
-    height: 16px;
-    line-height: 16px;
-  }
+    .flex;
+    flex-direction: column;
+    height: 32px;
+    .greenBar,
+    .redBar {
+        height: 16px;
+        line-height: 16px;
+    }
 }
 .start {
-  align-self: flex-start !important;
-  align-items: flex-start !important;
+    align-self: flex-start !important;
+    align-items: flex-start !important;
 }
 </style>

src/views/search/inventory/components/add/index.vue

@@ -1,65 +1,65 @@
 <template>
-    <!-- 出入库登记-->
-    <a-modal class="commonModal add-spot-contract" :title="`出入库登记（生产${inOrOut()}）`" v-model:visible="visible" centered :maskClosable="false" @cancel="cancel" width="890px">
-        <template #footer>
-            <a-button key="submit" class="cancelBtn" @click="cancel">取消</a-button>
-            <a-button key="submit" type="primary" :loading="loading" @click="submit(2)">{{ inOrOut() }}登记</a-button>
-        </template>
-        <a-form class="inlineForm" ref="formRef" :model="formState" :rules="rules">
-            <a-row :gutter="24">
-                <a-col :span="12">
-                    <a-form-item label="出入库类型" name="InOutType">
-                        <a-select class="inlineFormSelect" style="width: 200px" v-model:value="formState.InOutType" placeholder="请选择出入库类型">
-                            <a-select-option v-for="item in warehouseType" :key="item.key" :value="item.key">
-                                {{ item.name }}
-                            </a-select-option>
-                        </a-select>
-                    </a-form-item>
-                </a-col>
-                <a-col :span="12">
-                    <a-form-item label="现货品种" name="DeliveryGoodsID">
-                        <a-select class="inlineFormSelect" style="width: 200px" @change="deliveryGoodsChange" :getPopupContainer="(triggerNode) => triggerNode.parentNode" v-model:value="formState.DeliveryGoodsID" placeholder="请选择现货品种">
-                            <a-select-option v-for="item in deliveryGoodsList" :key="item.deliverygoodsid" :value="item.deliverygoodsid">
-                                {{ item.deliverygoodsname }}
-                            </a-select-option>
-                        </a-select>
-                    </a-form-item>
-                </a-col>
-                <a-col :span="12">
-                    <a-form-item label="商品" name="WRStandardID">
-                        <a-select class="inlineFormSelect" style="width: 200px" :getPopupContainer="(triggerNode) => triggerNode.parentNode" @change="WrStandardChange" v-model:value="formState.WRStandardID" placeholder="请选择商品">
-                            <a-select-option v-for="item in gmlist" :key="item.wrstandardid" :value="item.wrstandardid">
-                                {{ item.wrstandardname }}
-                            </a-select-option>
-                        </a-select>
-                    </a-form-item>
-                </a-col>
-                <a-col :span="12">
-                    <a-form-item label="品牌" name="SpotGoodsBrandID">
-                        <a-select class="inlineFormSelect" style="width: 200px" :getPopupContainer="(triggerNode) => triggerNode.parentNode" v-model:value="formState.SpotGoodsBrandID" placeholder="请选择品牌">
-                            <a-select-option v-for="item in gblist" :key="item.brandid" :value="item.brandid">
-                                {{ item.brandname }}
-                            </a-select-option>
-                        </a-select>
-                    </a-form-item>
-                </a-col>
-                <a-col :span="12">
-                    <a-form-item :label="`${inOrOut()}仓库`" name="WarehouseInfo">
-                        <a-select class="inlineFormSelect" style="width: 200px" :placeholder="`请选择${inOrOut()}仓库`" v-model:value="formState.WarehouseInfo">
-                            <a-select-option v-for="option in wareHouseList" :key="option.autoid" :value="option.autoid">
-                                {{ option.warehousecode }}
-                            </a-select-option>
-                        </a-select>
-                    </a-form-item>
-                </a-col>
-                <a-col :span="12">
-                    <a-form-item :label="`${inOrOut()}数量`" name="Qty">
-                        <a-input class="dialogInput" style="width: 200px" v-model:value="formState.Qty" :placeholder="`请输入${inOrOut()}数量`" />
-                    </a-form-item>
-                </a-col>
-            </a-row>
-        </a-form>
-    </a-modal>
+  <!-- 出入库登记-->
+  <a-modal class="commonModal add-spot-contract" :title="`出入库登记（生产${inOrOut()}）`" v-model:visible="visible" centered :maskClosable="false" @cancel="cancel" width="890px">
+    <template #footer>
+      <a-button key="submit" class="cancelBtn" @click="cancel">取消</a-button>
+      <a-button key="submit" type="primary" :loading="loading" @click="submit(2)">{{ inOrOut() }}登记</a-button>
+    </template>
+    <a-form class="inlineForm" ref="formRef" :model="formState" :rules="rules">
+      <a-row :gutter="24">
+        <a-col :span="12">
+          <a-form-item label="出入库类型" name="InOutType">
+            <a-select class="inlineFormSelect" style="width: 200px" v-model:value="formState.InOutType" placeholder="请选择出入库类型">
+              <a-select-option v-for="item in warehouseType" :key="item.key" :value="item.key">
+                {{ item.name }}
+              </a-select-option>
+            </a-select>
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="现货品种" name="DeliveryGoodsID">
+            <a-select class="inlineFormSelect" style="width: 200px" @change="deliveryGoodsChange" :getPopupContainer="(triggerNode) => triggerNode.parentNode" v-model:value="formState.DeliveryGoodsID" placeholder="请选择现货品种">
+              <a-select-option v-for="item in deliveryGoodsList" :key="item.deliverygoodsid" :value="item.deliverygoodsid">
+                {{ item.deliverygoodsname }}
+              </a-select-option>
+            </a-select>
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="商品" name="WRStandardID">
+            <a-select class="inlineFormSelect" style="width: 200px" :getPopupContainer="(triggerNode) => triggerNode.parentNode" @change="WrStandardChange" v-model:value="formState.WRStandardID" placeholder="请选择商品">
+              <a-select-option v-for="item in gmlist" :key="item.wrstandardid" :value="item.wrstandardid">
+                {{ item.wrstandardname }}
+              </a-select-option>
+            </a-select>
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="品牌" name="SpotGoodsBrandID">
+            <a-select class="inlineFormSelect" style="width: 200px" :getPopupContainer="(triggerNode) => triggerNode.parentNode" v-model:value="formState.SpotGoodsBrandID" placeholder="请选择品牌">
+              <a-select-option v-for="item in gblist" :key="item.brandid" :value="item.brandid">
+                {{ item.brandname }}
+              </a-select-option>
+            </a-select>
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item :label="`${inOrOut()}仓库`" name="WarehouseInfo">
+            <a-select class="inlineFormSelect" style="width: 200px" :placeholder="`请选择${inOrOut()}仓库`" v-model:value="formState.WarehouseInfo">
+              <a-select-option v-for="option in wareHouseList" :key="option.autoid" :value="option.autoid">
+                {{ option.warehousecode }}
+              </a-select-option>
+            </a-select>
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item :label="`${inOrOut()}数量`" name="Qty">
+            <a-input-number class="dialogInput" style="width: 200px" v-model:value="formState.Qty" :min="1" :max="10" :placeholder="`请输入${inOrOut()}数量`" />
+          </a-form-item>
+        </a-col>
+      </a-row>
+    </a-form>
+  </a-modal>
 </template>
 
 <script lang="ts">
@@ -75,65 +75,65 @@ import { ermcpInOutStockApplyReq } from '@/services/proto/warehouse';
 import { ERMCPAreaInOutStockApplyReq } from '@/services/proto/warehouse/interface';
 
 export default defineComponent({
-    name: 'add-spot-contract',
-    emits: ['cancel', 'update'],
-    components: {},
-    props: {
-        selectedRow: {
-            type: Object as PropType<Ermcp3ContractRsp>,
-            default: {},
-        },
+  name: 'add-spot-contract',
+  emits: ['cancel', 'update'],
+  components: {},
+  props: {
+    selectedRow: {
+      type: Object as PropType<Ermcp3ContractRsp>,
+      default: {},
     },
-    setup(props, context) {
-        const { visible, cancel } = _closeModal(context);
-        const { rules, formState, formRef, initFormData } = handleFormState();
-        const { warehouseType, inOrOut } = handleWarehouseType(formState);
-        const { wareHouseList, getWarehouseList } = handleWarehouseList();
-        const { deliveryGoodsList, gblist, gmlist, numberUnit, WrStandardChange, getDeliveryGoods, deliveryGoodsChange } = handleDeliveryGoods(formState);
-        const loading = ref<boolean>(false);
-        function submit() {
-            validateAction<FormState>(formRef, formState).then((param) => {
-                let reqParam: ERMCPAreaInOutStockApplyReq = {
-                    InOutType: param.InOutType, // int32 出入库类型 - 1:采购入库 2:销售出库 3:生产入库 4:生产出库
-                    WRStandardID: param.WRStandardID as number, // uint64 现货商品ID
-                    // SpotGoodsModelID: param.S; // uint64 现货型号ID
-                    SpotGoodsBrandID: param.SpotGoodsBrandID as number, // uint64 现货品牌ID
-                    DeliveryGoodsID: param.DeliveryGoodsID as number, // uint64 现货品种ID
-                    // SpotContractID: param.SpotContractID, // uint64 关联现货合同ID [1:采购入库 2:销售出库 ](1,2状态必填)
-                    WarehouseInfo: param.WarehouseInfo as number, // uint64 现货仓库ID
-                    Qty: Number(param.Qty), // double 数量
-                    ApplyRemark: '', // string 申请备注
-                };
-                requestResultLoadingAndInfo(ermcpInOutStockApplyReq, reqParam, loading, ['出入库登记成功', '出入库登记失败:']).then(() => {
-                    Object.assign(formState, initFormData());
-                    cancel(true);
-                });
-            });
-        }
-        initData(() => {
-            getWarehouseList();
-            getDeliveryGoods();
-        });
-        return {
-            visible,
-            cancel,
-            submit,
-            loading,
-            maskClosableFlag: false,
-            rules,
-            formState,
-            formRef,
-            warehouseType,
-            inOrOut,
-            wareHouseList,
-            deliveryGoodsList,
-            gblist,
-            gmlist,
-            numberUnit,
-            WrStandardChange,
-            getDeliveryGoods,
-            deliveryGoodsChange,
+  },
+  setup(props, context) {
+    const { visible, cancel } = _closeModal(context);
+    const { rules, formState, formRef, initFormData } = handleFormState();
+    const { warehouseType, inOrOut } = handleWarehouseType(formState);
+    const { wareHouseList, getWarehouseList } = handleWarehouseList();
+    const { deliveryGoodsList, gblist, gmlist, numberUnit, WrStandardChange, getDeliveryGoods, deliveryGoodsChange } = handleDeliveryGoods(formState);
+    const loading = ref<boolean>(false);
+    function submit() {
+      validateAction<FormState>(formRef, formState).then((param) => {
+        let reqParam: ERMCPAreaInOutStockApplyReq = {
+          InOutType: param.InOutType, // int32 出入库类型 - 1:采购入库 2:销售出库 3:生产入库 4:生产出库
+          WRStandardID: param.WRStandardID as number, // uint64 现货商品ID
+          // SpotGoodsModelID: param.S; // uint64 现货型号ID
+          SpotGoodsBrandID: param.SpotGoodsBrandID as number, // uint64 现货品牌ID
+          DeliveryGoodsID: param.DeliveryGoodsID as number, // uint64 现货品种ID
+          // SpotContractID: param.SpotContractID, // uint64 关联现货合同ID [1:采购入库 2:销售出库 ](1,2状态必填)
+          WarehouseInfo: param.WarehouseInfo as number, // uint64 现货仓库ID
+          Qty: Number(param.Qty), // double 数量
+          ApplyRemark: '', // string 申请备注
         };
-    },
+        requestResultLoadingAndInfo(ermcpInOutStockApplyReq, reqParam, loading, ['出入库登记成功', '出入库登记失败:']).then(() => {
+          Object.assign(formState, initFormData());
+          cancel(true);
+        });
+      });
+    }
+    initData(() => {
+      getWarehouseList();
+      getDeliveryGoods();
+    });
+    return {
+      visible,
+      cancel,
+      submit,
+      loading,
+      maskClosableFlag: false,
+      rules,
+      formState,
+      formRef,
+      warehouseType,
+      inOrOut,
+      wareHouseList,
+      deliveryGoodsList,
+      gblist,
+      gmlist,
+      numberUnit,
+      WrStandardChange,
+      getDeliveryGoods,
+      deliveryGoodsChange,
+    };
+  },
 });
 </script>