update

src/common/components/commonDes/commonDes.vue

@@ -1,48 +1,48 @@
 <template>
-    <a-descriptions :column="column" :bordered="bordered" class="commom-des">
-        <a-descriptions-item v-for="(item, i) in list" :key="i + 'des'" :label="item.label">
-            <span :class="item.className ? item.className : 'white'" @click="onClick(item)">{{ item.value }}</span>
-        </a-descriptions-item>
-        <a-descriptions-item v-if="slotDesName" :label="slotDesName">
-            <slot></slot>
-        </a-descriptions-item>
-    </a-descriptions>
+  <a-descriptions :column="column" :bordered="bordered" class="commom-des">
+    <a-descriptions-item v-for="(item, i) in list" :key="i + 'des'" :label="item.label">
+      <span :class="item.className ? item.className : 'white'" @click="onClick(item)">{{ item.value }}</span>
+    </a-descriptions-item>
+    <a-descriptions-item v-if="slotDesName" :label="slotDesName">
+      <slot></slot>
+    </a-descriptions-item>
+  </a-descriptions>
 </template>
 <script lang="ts">
 import { defineComponent, PropType } from 'vue';
 import { DescriptionsList } from './interface';
 
 export default defineComponent({
-    name: 'des-list',
-    emits: ['onClick'],
-    components: {},
-    props: {
-        column: {
-            // 一行的 DescriptionItems 数量
-            type: Number,
-            default: 2,
-        },
-        bordered: {
-            // 是否展示边框
-            type: Boolean,
-            default: false,
-        },
-        slotDesName: {
-            // 使用插槽的时候，DescriptionItems 的内容描述
-            type: String,
-            default: '',
-        },
-        list: {
-            type: Array as PropType<DescriptionsList[]>,
-            default: [],
-        },
+  name: 'des-list',
+  emits: ['onClick'],
+  components: {},
+  props: {
+    column: {
+      // 一行的 DescriptionItems 数量
+      type: Number,
+      default: 2,
     },
-    setup(props, context) {
-        function onClick(value: DescriptionsList) {
-            context.emit('onClick', value);
-        }
-        return { onClick };
+    bordered: {
+      // 是否展示边框
+      type: Boolean,
+      default: false,
+    },
+    slotDesName: {
+      // 使用插槽的时候，DescriptionItems 的内容描述
+      type: String,
+      default: '',
     },
+    list: {
+      type: Array as PropType<DescriptionsList[]>,
+      default: [],
+    },
+  },
+  setup(props, context) {
+    function onClick(value: DescriptionsList) {
+      context.emit('onClick', value);
+    }
+    return { onClick };
+  },
 });
 </script>
 
@@ -59,6 +59,7 @@ export default defineComponent({
         }
     }
     .ant-descriptions-item-content {
+        align-items: center;
         width: calc(100% - 146px);
         color: @m-grey1;
     }

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

@@ -19,9 +19,6 @@
         <template #unsureqty="{ text, record }">
           <span>{{ handleEnumdic(text, record) }}</span>
         </template>
-        <template #goodsid="{ text }">
-          <span>{{ text > 0 ? '期货' : '现货' }}</span>
-        </template>
         <template #qty="{ text, record }">
           <span>{{ handleEnumdic(text, record) }}</span>
         </template>
@@ -40,6 +37,18 @@
         <template #startdate,enddate="{ record }">
           <span>{{ formatValue(formatTime(record.startdate, 'd') + '--' + formatTime(record.enddate, 'd')) }}</span>
         </template>
+        <!-- 业务类型 -->
+        <template #biztype="{ text }">
+          <a>{{ getBizTypeName(text) }}</a>
+        </template>
+        <!-- 点价类型 -->
+        <template #goodsid="{ text }">
+          <span>{{ text > 0 ? '期货' : '现货' }}</span>
+        </template>
+        <!-- 定价类型 -->
+        <template #pricetype="{ text }">
+          <a>{{ getPriceTypeName(text) }}</a>
+        </template>
       </a-table>
     </template>
   </mtp-table-scroll>
@@ -59,6 +68,7 @@ import { handleEnumdic } from '../setup';
 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';
 
 export default defineComponent({
   name: EnumRouterName.purchase_pending,
@@ -139,6 +149,8 @@ export default defineComponent({
       formatValue,
       buttons,
       handleBtnList,
+      getBizTypeName,
+      getPriceTypeName,
     };
   },
 });

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

@@ -16,6 +16,9 @@
         <template #unsureqty="{ text, record }">
           <span>{{ handleEnumdic(text, record) }}</span>
         </template>
+        <template #goodsid="{ text }">
+          <span>{{ text > 0 ? '期货' : '现货' }}</span>
+        </template>
         <template #qty="{ text, record }">
           <span>{{ handleEnumdic(text, record) }}</span>
         </template>

src/views/information/spot-contract/components/check/index.vue

@@ -1,70 +1,63 @@
 <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" class="cancelBtn" :loading="loading" :disabled="loading" @click="refuse">审核拒绝</a-button>
-            <a-button key="submit" type="primary" :loading="loading" :disabled="loading" @click="submit">审核通过</a-button>
-        </template>
-        <Detail :selectedRow="selectedRow">
-            <a-form ref="formRef" :model="formState" :rules="rules">
-                <fieldset class="formFieldSet formFieldSet_form">
-                    <legend>其他信息</legend>
-                    <a-row :gutter="24">
-                        <a-col :span="12">
-                            <a-form-item label="保证金">
-                                <span class="white">{{ formatValue(selectedRow.contractmargin) }}</span>
-                            </a-form-item>
-                        </a-col>
-                        <a-col :span="12">
-                            <a-form-item label="业务员" name="SaleUserID">
-                                <a-select class="inlineFormSelect" v-model:value="formState.SaleUserID" style="width: 200px" placeholder="请选择业务员">
-                                    <a-select-option v-for="item in businesserList" :key="item.userid" :value="item.userid"> {{ item.accountname }}-{{ item.logincode }} </a-select-option>
-                                </a-select>
-                            </a-form-item>
-                        </a-col>
-                    </a-row>
-                    <a-row :gutter="24">
-                        <a-col :span="12">
-                            <a-form-item label="跟单员" name="MerUserID">
-                                <a-select class="inlineFormSelect" v-model:value="formState.MerUserID" style="width: 200px" placeholder="请选择跟单员">
-                                    <a-select-option v-for="item in merchandiserList" :key="item.userid" :value="item.userid"> {{ item.accountname }}-{{ item.logincode }} </a-select-option>
-                                </a-select>
-                            </a-form-item>
-                        </a-col>
-                        <a-col :span="12">
-                            <a-form-item label="交易用户" name="TradeUserID">
-                                <a-select class="inlineFormSelect" style="width: 200px" v-model:value="formState.TradeUserID" placeholder="请选择交易用户">
-                                    <a-select-option v-for="item in traderList" :key="item.roleid" :value="item.roleid">
-                                        {{ item.rolename }}
-                                    </a-select-option>
-                                </a-select>
-                            </a-form-item>
-                        </a-col>
-                    </a-row>
-                    <a-row :gutter="24">
-                        <a-col :span="24">
-                            <a-form-item label="备注">
-                                <span class="white">{{ formatValue(selectedRow.remark) }}</span>
-                            </a-form-item>
-                        </a-col>
-                    </a-row>
-                </fieldset>
-                <fieldset class="formFieldSet">
-                    <legend>审核信息</legend>
-                    <a-row :gutter="24">
-                        <a-col :span="24">
-                            <a-form-item label="审核意见" name="Remark">
-                                <a-input class="dialogInput" v-model:value="formState.Remark" style="width: 620px" placeholder="请输入审核意见" />
-                            </a-form-item>
-                        </a-col>
-                    </a-row>
-                </fieldset>
-            </a-form>
-        </Detail>
-        <a-modal :visible="previewVisible" :footer="null" @cancel="cancelImg">
-            <img alt="预览附件" style="width: 100%" :src="previewImage" />
-        </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" class="cancelBtn" :loading="loading" :disabled="loading" @click="refuse">审核拒绝</a-button>
+      <a-button key="submit" type="primary" :loading="loading" :disabled="loading" @click="submit">审核通过</a-button>
+    </template>
+    <Detail :selectedRow="selectedRow">
+      <a-form ref="formRef" :model="formState" :rules="rules">
+        <fieldset class="formFieldSet formFieldSet_form">
+          <legend>其他信息</legend>
+          <a-row :gutter="24">
+            <a-col :span="12">
+              <a-form-item label="保证金">
+                <span class="white">{{ formatValue(selectedRow.contractmargin) }}</span>
+              </a-form-item>
+            </a-col>
+            <a-col :span="12">
+              <a-form-item label="业务员" name="SaleUserID">
+                <a-select class="inlineFormSelect" v-model:value="formState.SaleUserID" style="width: 200px" placeholder="请选择业务员">
+                  <a-select-option v-for="item in businesserList" :key="item.userid" :value="item.userid"> {{ item.accountname }}-{{ item.logincode }} </a-select-option>
+                </a-select>
+              </a-form-item>
+            </a-col>
+          </a-row>
+          <a-row :gutter="24">
+            <a-col :span="12">
+              <a-form-item label="跟单员" name="MerUserID">
+                <a-select class="inlineFormSelect" v-model:value="formState.MerUserID" style="width: 200px" placeholder="请选择跟单员">
+                  <a-select-option v-for="item in merchandiserList" :key="item.userid" :value="item.userid"> {{ item.accountname }}-{{ item.logincode }} </a-select-option>
+                </a-select>
+              </a-form-item>
+            </a-col>
+            <a-col :span="12">
+              <a-form-item label="交易用户" name="TradeUserID">
+                <a-select class="inlineFormSelect" style="width: 200px" v-model:value="formState.TradeUserID" placeholder="请选择交易用户">
+                  <a-select-option v-for="item in traderList" :key="item.roleid" :value="item.roleid">
+                    {{ item.rolename }}
+                  </a-select-option>
+                </a-select>
+              </a-form-item>
+            </a-col>
+          </a-row>
+        </fieldset>
+        <fieldset class="formFieldSet">
+          <legend>审核信息</legend>
+          <a-row :gutter="24">
+            <a-col :span="24">
+              <a-form-item label="审核意见" name="Remark">
+                <a-input class="dialogInput" v-model:value="formState.Remark" style="width: 620px" placeholder="请输入审核意见" />
+              </a-form-item>
+            </a-col>
+          </a-row>
+        </fieldset>
+      </a-form>
+    </Detail>
+    <a-modal :visible="previewVisible" :footer="null" @cancel="cancelImg">
+      <img alt="预览附件" style="width: 100%" :src="previewImage" />
     </a-modal>
+  </a-modal>
 </template>
 
 <script lang="ts">
@@ -87,137 +80,137 @@ import Detail from '../common-detail/index.vue';
 import { _closeModal } from '@/common/setup/modal/modal';
 
 export default defineComponent({
-    name: 'spot-contract-detail',
-    components: { Detail },
-    emits: ['cancel', 'update'],
-    props: {
-        selectedRow: {
-            type: Object as PropType<Ermcp3ContractRsp>,
-            default: {},
-        },
+  name: 'spot-contract-detail',
+  components: { Detail },
+  emits: ['cancel', 'update'],
+  props: {
+    selectedRow: {
+      type: Object as PropType<Ermcp3ContractRsp>,
+      default: {},
     },
-    setup(props, context) {
-        const loading = ref<boolean>(false);
-        const { visible, cancel } = _closeModal(context);
-        // 获取 业务账户
-        const { queryTable: queryBusinessManager, getBusinesserOrMerchandiser } = handlerManagerList(loading, 1);
-        const { tableList: traderList, queryTable: queryTradeManager } = handlerManagerList(loading, 2, true);
-        // 业务员
-        const businesserList = ref<ErmcpLoginUser[]>([]);
-        // 跟单员
-        const merchandiserList = ref<ErmcpLoginUser[]>([]);
-        // 表单
-        const { rules, formState, formRef } = handleForm();
-        // 预览附件
-        const { previewVisible, previewImage, cancelImg, previewImg, getImgName } = handlePreviewImg();
-        function submit() {
-            validateAction<FormState>(formRef, formState).then((param) => {
-                Modal.confirm({
-                    title: '是否确认审核通过',
-                    okText: '审核通过',
-                    cancelText: '取消',
-                    onOk() {
-                        // 为什么不删 因为以后可能又改回来
-                        // const reqParam: SpotContractOperateReq = {
-                        //     SpotContractID: props.selectedRow.spotcontractid,
-                        //     OperateType: 3,
-                        //     Remark: param.Remark,
-                        //     Info: {
-                        //         BizType: props.selectedRow.biztype,
-                        //         MerUserID: param.MerUserID as number, //    跟单员ID
-                        //         SaleUserID: param.SaleUserID as number, //   业务员ID
-                        //         TradeUserID: param.TradeUserID as number, //  交易员ID
-                        //         Remark: param.Remark,
-                        //         UserID: getUserId(),
-                        //     },
-                        // };
+  },
+  setup(props, context) {
+    const loading = ref<boolean>(false);
+    const { visible, cancel } = _closeModal(context);
+    // 获取 业务账户
+    const { queryTable: queryBusinessManager, getBusinesserOrMerchandiser } = handlerManagerList(loading, 1);
+    const { tableList: traderList, queryTable: queryTradeManager } = handlerManagerList(loading, 2, true);
+    // 业务员
+    const businesserList = ref<ErmcpLoginUser[]>([]);
+    // 跟单员
+    const merchandiserList = ref<ErmcpLoginUser[]>([]);
+    // 表单
+    const { rules, formState, formRef } = handleForm();
+    // 预览附件
+    const { previewVisible, previewImage, cancelImg, previewImg, getImgName } = handlePreviewImg();
+    function submit() {
+      validateAction<FormState>(formRef, formState).then((param) => {
+        Modal.confirm({
+          title: '是否确认审核通过',
+          okText: '审核通过',
+          cancelText: '取消',
+          onOk() {
+            // 为什么不删 因为以后可能又改回来
+            // const reqParam: SpotContractOperateReq = {
+            //     SpotContractID: props.selectedRow.spotcontractid,
+            //     OperateType: 3,
+            //     Remark: param.Remark,
+            //     Info: {
+            //         BizType: props.selectedRow.biztype,
+            //         MerUserID: param.MerUserID as number, //    跟单员ID
+            //         SaleUserID: param.SaleUserID as number, //   业务员ID
+            //         TradeUserID: param.TradeUserID as number, //  交易员ID
+            //         Remark: param.Remark,
+            //         UserID: getUserId(),
+            //     },
+            // };
 
-                        const reqParam: GldErmcpSpotContractOperateReq = {
-                            SpotContractID: props.selectedRow.spotcontractid,
-                            OperateType: 4,
-                            Remark: param.Remark,
-                            Info: {
-                                BizType: props.selectedRow.biztype,
-                                MerUserID: param.MerUserID as number, //    跟单员ID
-                                SaleUserID: param.SaleUserID as number, //   业务员ID
-                                TradeUserID: param.TradeUserID as number, //  交易员ID
-                                Remark: param.Remark,
-                                UserID: getUserId(),
-                                CurrencyID: props.selectedRow.currencyid, // 币种id
-                            },
-                        };
-                        // Fixme 6/4 代码修改
-                        // 审核通过 SpotContractOperateReq operateType 操作类型-1:保存草稿(作废)2:提交申请(作废)3:审核通过4:审核拒绝(作废)5:撤回(作废)6:正常完结7:异常终止
-                        // Fixme 6/9 代码修改
-                        // 审核通过 GldErmcpSpotContractOperateReq 操作类型-1:保存草稿2:提交申请3:审核通过4:审核拒绝5:撤回6:正常完结7:异常终止
-                        requestResultLoadingAndInfo(orderContract, reqParam, loading, ['审核通过成功', '审核失败:']).then(() => {
-                            cancel(true);
-                        });
-                    },
-                    onCancel() {},
-                });
-            });
-        }
-        function refuse() {
-            Modal.confirm({
-                title: '是否确认审核拒绝',
-                okText: '审核拒绝',
-                cancelText: '取消',
-                onOk() {
-                    const param = toRaw(formState);
-                    const reqParam: GldErmcpSpotContractOperateReq = {
-                        SpotContractID: props.selectedRow.spotcontractid,
-                        OperateType: 5,
-                        Remark: param.Remark,
-                    };
-                    // Fixme 6/4 代码修改
-                    // 审核拒绝  操作类型-1:保存草稿2:提交申请3:删除4:审核通过5:审核拒绝6:撤销
-                    requestResultLoadingAndInfo(orderContract, reqParam, loading, ['审核拒绝成功', '审核失败:']).then(() => {
-                        cancel(true);
-                    });
-                },
-                onCancel() {},
+            const reqParam: GldErmcpSpotContractOperateReq = {
+              SpotContractID: props.selectedRow.spotcontractid,
+              OperateType: 4,
+              Remark: param.Remark,
+              Info: {
+                BizType: props.selectedRow.biztype,
+                MerUserID: param.MerUserID as number, //    跟单员ID
+                SaleUserID: param.SaleUserID as number, //   业务员ID
+                TradeUserID: param.TradeUserID as number, //  交易员ID
+                Remark: param.Remark,
+                UserID: getUserId(),
+                CurrencyID: props.selectedRow.currencyid, // 币种id
+              },
+            };
+            // Fixme 6/4 代码修改
+            // 审核通过 SpotContractOperateReq operateType 操作类型-1:保存草稿(作废)2:提交申请(作废)3:审核通过4:审核拒绝(作废)5:撤回(作废)6:正常完结7:异常终止
+            // Fixme 6/9 代码修改
+            // 审核通过 GldErmcpSpotContractOperateReq 操作类型-1:保存草稿2:提交申请3:审核通过4:审核拒绝5:撤回6:正常完结7:异常终止
+            requestResultLoadingAndInfo(orderContract, reqParam, loading, ['审核通过成功', '审核失败:']).then(() => {
+              cancel(true);
             });
-        }
-
-        queryBusinessManager().then(() => {
-            businesserList.value = getBusinesserOrMerchandiser('22');
-            merchandiserList.value = getBusinesserOrMerchandiser('23');
+          },
+          onCancel() { },
         });
-        queryTradeManager();
-        const { saleuserid, tradeuserid, meruserid, remark } = props.selectedRow;
+      });
+    }
+    function refuse() {
+      Modal.confirm({
+        title: '是否确认审核拒绝',
+        okText: '审核拒绝',
+        cancelText: '取消',
+        onOk() {
+          const param = toRaw(formState);
+          const reqParam: GldErmcpSpotContractOperateReq = {
+            SpotContractID: props.selectedRow.spotcontractid,
+            OperateType: 5,
+            Remark: param.Remark,
+          };
+          // Fixme 6/4 代码修改
+          // 审核拒绝  操作类型-1:保存草稿2:提交申请3:删除4:审核通过5:审核拒绝6:撤销
+          requestResultLoadingAndInfo(orderContract, reqParam, loading, ['审核拒绝成功', '审核失败:']).then(() => {
+            cancel(true);
+          });
+        },
+        onCancel() { },
+      });
+    }
 
-        saleuserid && (formState.SaleUserID = saleuserid);
-        tradeuserid && (formState.TradeUserID = tradeuserid);
-        meruserid && (formState.MerUserID = meruserid);
+    queryBusinessManager().then(() => {
+      businesserList.value = getBusinesserOrMerchandiser('22');
+      merchandiserList.value = getBusinesserOrMerchandiser('23');
+    });
+    queryTradeManager();
+    const { saleuserid, tradeuserid, meruserid, remark } = props.selectedRow;
 
-        formState.Remark = remark;
-        return {
-            visible,
-            cancel,
-            submit,
-            maskClosableFlag: false,
-            getContractTypeName,
-            getBizTypeName,
-            formatValue,
-            getContractStatusName,
-            formatTime,
-            getPriceTypeName,
-            refuse,
-            traderList,
-            merchandiserList,
-            businesserList,
-            loading,
-            formState,
-            rules,
-            formRef,
-            previewVisible,
-            previewImage,
-            cancelImg,
-            previewImg,
-            getImgName,
-        };
-    },
+    saleuserid && (formState.SaleUserID = saleuserid);
+    tradeuserid && (formState.TradeUserID = tradeuserid);
+    meruserid && (formState.MerUserID = meruserid);
+
+    formState.Remark = remark;
+    return {
+      visible,
+      cancel,
+      submit,
+      maskClosableFlag: false,
+      getContractTypeName,
+      getBizTypeName,
+      formatValue,
+      getContractStatusName,
+      formatTime,
+      getPriceTypeName,
+      refuse,
+      traderList,
+      merchandiserList,
+      businesserList,
+      loading,
+      formState,
+      rules,
+      formRef,
+      previewVisible,
+      previewImage,
+      cancelImg,
+      previewImg,
+      getImgName,
+    };
+  },
 });
 </script>
 

src/views/information/spot-contract/components/check/interface.ts

@@ -7,5 +7,6 @@ export interface FormState {
     MerUserID: number | undefined// uint64 跟单员ID
     TradeUserID: number | undefined// uint64 交易员ID
     SaleUserID: number | undefined // uint64 业务员ID
-    Remark: string
+    Remark: string // 点价说明
+    Auditremark: string // 审核意见
 }

src/views/information/spot-contract/components/check/setup.ts

@@ -10,7 +10,8 @@ export function handleForm() {
         MerUserID: undefined,// uint64 跟单员ID
         TradeUserID: undefined,// uint64 交易员ID
         SaleUserID: undefined, // uint64 业务员ID
-        Remark: ''
+        Remark: '',
+        Auditremark: ''
     })
     // 验证交易员
     async function v_TradeUser(rule: RuleObject, value: number) {

src/views/information/spot-contract/components/common-detail/index.vue

@@ -81,14 +81,18 @@ export default defineComponent({
         ];
         getSpotInfo(spot);
         // 价格信息
-        const price = [
+        const price: { label: string, value: string | number }[] = [
           { label: '定价类型', value: getPriceTypeName(data.pricetype) },
           { label: '数量', value: formatValue(data.qty) + data.enumdicname },
-          { label: data.pricetype === 2 ? '点价合约' : '价格', value: data.pricetype === 2 ? '期货 ' + formatValue(data.goodscode) : formatValue(data.price) },
         ];
+
         if (data.pricetype > 1 && data.goodsid) {
+          price.push({ label: '点价合约', value: data.goodsid > 0 ? '期货 ' + formatValue(data.goodscode) : '现货' })
           price.push({ label: '点价说明', value: formatValue(data.remark) })
+        } else {
+          price.push({ label: '价格', value: formatValue(data.price) })
         }
+
         price.push(...[
           { label: '升贴水', value: formatValue(data.pricemove) },
           { label: '点价期', value: formatValue(formatTime(data.startdate, 'd') + '--' + formatTime(data.enddate, 'd')) },

src/views/information/warehouse-info/list/normal-use/index.vue

@@ -21,8 +21,9 @@
         <template #warehousestatus="{ text }">
           <span>{{ gerWareHouseStatusName(text) }}</span>
         </template>
-        <template #address="{ record }">
-          <span>{{ getProvinceName(record.provinceid) + getCityName(record.cityid) + getDistrictName(record.districtid) + record.address }}</span>
+        <!-- 所在地区 -->
+        <template #provinceid="{ record }">
+          <span>{{ getProvinceName(record.provinceid) + getCityName(record.cityid) + getDistrictName(record.districtid) }}</span>
         </template>
       </a-table>
     </template>