完善字段

src/i18n/zh/tariffManagement.js

@@ -5,12 +5,12 @@ export default {
     userId: "客户",
     source: "供应商名称",
     trafficType: "流量类型",
-    billingType: "计费分类",//计费方式
+    billingType: "计费分类", //计费方式
     billingCycle: "计费周期",
     bagSize: "资费包大小",
     pricing: "结算价格",
-    settlementCycle: "周期限制",// 结算周期
-    settlementCycleLabel: "周期限制(月)",// 结算周期
+    settlementCycle: "周期限制", // 结算周期
+    settlementCycleLabel: "周期限制(月)", // 结算周期
 
     billingMethod: "计费方式",
     sourcePrice: "来源价格",
@@ -21,7 +21,7 @@ export default {
     feeCode: '资费编码',
     feeStatus: "状态",
 
-    cycleBuy: "订购周期",
+    cycleBuy: "有效期(月)",
     priceplan: "超套价格",
 
     // 按钮
@@ -30,10 +30,10 @@ export default {
     // 资费管理搜索
     soundName: '供应商名称',
     FlowType: '流量类型',
-    BillingType:'计费分类',
-    ChargingCycle:'计费周期',
-    userName:'客户名称',
-    MRCName:'MRC费(月租)',
-    networkName:'网络接入费',
-    ActivatedNames:'流量大小'
-}
+    BillingType: '计费分类',
+    ChargingCycle: '计费周期',
+    userName: '客户名称',
+    MRCName: 'MRC费(月租)',
+    networkName: '网络接入费',
+    ActivatedNames: '流量大小'
+}

src/views/flowPool/components/forewarning.vue

@@ -147,7 +147,7 @@ onMounted(() => {
   <a-modal title="预警池" v-model:visible="modelValue" @cancel="resetForm" centered :maskClosable="false" :footer="null"
     width="55%">
     <a-tabs>
-      <a-tab-pane key="1" :title="$t('flowPool.warnTabs')">
+      <a-tab-pane key="1" title="池预警">
         <a-form :model="formWarning" direction="inline" ref="formRef" :rules="rules">
           <div class="form-pool-tit">
             <div class="pool-icon"></div>
@@ -243,6 +243,9 @@ onMounted(() => {
           </a-form-item>
         </a-form>
       </a-tab-pane>
+      <a-tab-pane key="2" title="卡预警">
+        
+      </a-tab-pane>
     </a-tabs>
   </a-modal>
 </template>

src/views/order/BuyCard/index.vue

@@ -46,7 +46,7 @@
             <a-button type="text" @click="adminCancel(record)"
               v-if="record.moderationStatus == 2 && userType !== 1">退订</a-button>
           </div>
-          <a-button @click="openPriceing(record)" type="text" v-if="record.moderationStatus==2">上传金额</a-button>
+          <a-button @click="openPriceing(record)" type="text" v-if="record.moderationStatus==2 && userType == 1">上传金额</a-button>
           <a-button @click="openDetail(record)" type="text">查看</a-button>
         </div>
       </template>

src/views/order/ReturnCard/index.vue

@@ -29,8 +29,7 @@
       <template #operate="{ record }">
         <div class="setting">
           <div v-if="userType == 1">
-            <a-button type="text" v-if="record.moderationStatus == 1 && record.status == 1"
-              @click="statusOrder(record)">审核</a-button>
+            <a-button type="text" v-if="record.moderationStatus == 1" @click="statusOrder(record)">审核</a-button>
           </div>
           <a-button @click="openPriceing(record)" type="text" v-if="record.moderationStatus == 2">上传金额</a-button>
         </div>
@@ -46,7 +45,7 @@
       </a-form>
     </a-modal>
 
-
+    <Status v-model:modelValue="showStatus" @submit="intData()" :FormDataList="FormDataList" />
   </div>
 </template>
 
@@ -57,6 +56,7 @@ import { cancelOrderList } from '@/api/path/purchase';
 import { SettingPricing } from '@/api/path/order'
 import { Getdictionary } from '@/mixins/index.js'
 import Search from '@/components/Search/index.vue'
+import Status from './status.vue'
 // 数据层
 const state = ref({
   userName: localStorage.getItem('user_login_information')?.username,
@@ -73,7 +73,7 @@ const state = ref({
   formPreing: {
     id: '',
     returnAmount: ''
-  }
+  },
 });
 
 const {

src/views/order/ReturnCard/status.vue

@@ -0,0 +1,81 @@
+<template>
+    <a-modal v-model:visible="modelValue" width="800px" title="审核" @cancel="cancel" @ok="submitStatus"
+        okText="确认" cancelText="取消">
+        <a-form :model="formStatus" :style="{ width: '600px' }">
+            <a-form-item label="客户名称">
+                {{ FormDataList.userName }}
+            </a-form-item>
+            <a-form-item label="订单编号">
+                {{ FormDataList.id }}
+            </a-form-item>
+            <a-form-item label="资费名称">
+                {{ FormDataList.trafficName }}
+            </a-form-item>
+            <a-form-item label="审核意见">
+                <a-radio-group v-model="formStatus.moderationStatus" :options="optionsStatus">
+                    <template #label="{ data }">
+                        <a-tag>{{ data.label }}</a-tag>
+                    </template>
+                </a-radio-group>
+            </a-form-item>
+            <a-form-item label="备注">
+                <a-textarea placeholder="请输入备注" v-model:model-value="formStatus.moderationNotes" allow-clear />
+            </a-form-item>
+        </a-form>
+    </a-modal>
+</template>
+
+<script setup>
+import { ref, onMounted, toRefs, defineProps, toRef, defineEmits } from 'vue';
+import { OrderCardStatus } from '@/api/path/order'
+import { Message } from '@arco-design/web-vue';
+const props = defineProps({
+    modelValue: {
+        type: Boolean,
+        default: false
+    },
+    FormDataList: {
+        type: Object,
+        default: () => ({})
+    }
+})
+const modelValue = toRef(props, 'modelValue')
+const FormDataList = toRef(props, 'FormDataList')
+const emit = defineEmits(['update:modelValue', 'submit'])
+
+const state = ref({
+    formStatus: {
+        id: null,
+        moderationStatus: '', // 审核状态
+        moderationNotes: '', // 审核备注
+    },
+    optionsStatus: [
+        { label: '审核通过', value: '2' },
+        { label: '驳回', value: '3' },
+    ],
+})
+
+const { formStatus ,optionsStatus} = toRefs(state.value)
+
+// 订单审核
+const submitStatus = async () => {
+    new Promise((resolve, reject) => {
+        formStatus.value.id = FormDataList.value.id
+        OrderCardStatus(formStatus.value).then(res => {
+            Message.success(res.message)
+            emit('update:modelValue', false)
+            emit('submit', true)
+        }).catch(error => [
+            reject(error)
+        ])
+    })
+}
+
+const cancel = ()=>{
+    emit('update:modelValue', false)
+    Object.keys(formStatus.value).forEach(key => {
+        formStatus.value[key] = ''
+    })
+}
+</script>
+<style scoped></style>

src/views/tariffManagement/Management/add.vue

@@ -1,7 +1,7 @@
 <template>
     <!--资费 弹框 -->
     <a-modal :title="typeIndex == 1 ? $t('form.Add') : $t('form.Edit')" v-model:visible="modelValue"
-        @onCancel="resetForm" centered :maskClosable="false" :footer="null" width="700px">
+        @onCancel="resetForm" centered :maskClosable="false" :footer="null" width="700px" :closable="false">
         <a-form ref="formRef" :rules="rules" :model="formState" @submit="handleSubmit">
             <div class="formTitle">基本信息</div>
             <a-form-item :label="$t('tariffManagement.source')" field="source">
@@ -63,9 +63,7 @@
                 <a-input v-model="formState.trafficBilling" v-if="formState.billingMethod == 1"></a-input>
                 <a-select v-model="formState.trafficBillingType" style="width: 80px; margin:0 8px;"
                     v-if="formState.billingMethod == 1">
-                    <a-option value="KB">KB</a-option>
                     <a-option value="MB">MB</a-option>
-                    <a-option value="GB">GB</a-option>
                 </a-select>
                 <a-input v-model="formState.trafficBillingAmount" v-if="formState.billingMethod == 1">
                     <template #append>
@@ -74,18 +72,7 @@
                 </a-input>
             </a-form-item>
             <a-form-item field="settlementCycle" :label="$t('tariffManagement.cycleBuy')">
-                <a-input v-model="formState.settlementCycleMap.starTime">
-                    <template #prepend>
-                        最短
-                    </template>
-                    <template #append>
-                        个月，最长
-                    </template>
-                </a-input>
                 <a-input v-model="formState.settlementCycleMap.endTime" style="width: 50%;">
-                    <template #append>
-                        个月
-                    </template>
                 </a-input>
             </a-form-item>
             <a-form-item :label="$t('tariffManagement.MRCName')" field="mrcAmount">